summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--po/af.po583
-rw-r--r--po/ar.po575
-rw-r--r--po/az.po575
-rw-r--r--po/bg.po581
-rw-r--r--po/bn.po575
-rw-r--r--po/br.po573
-rw-r--r--po/bs.po575
-rw-r--r--po/ca.po576
-rw-r--r--po/cs.po716
-rw-r--r--po/cy.po828
-rw-r--r--po/da.po695
-rw-r--r--po/de.po740
-rw-r--r--po/el.po1820
-rw-r--r--po/eo.po575
-rw-r--r--po/es.po576
-rw-r--r--po/et.po576
-rw-r--r--po/eu.po718
-rw-r--r--po/fa.po575
-rw-r--r--po/fi.po573
-rw-r--r--po/fr.po580
-rw-r--r--po/fur.po577
-rw-r--r--po/ga.po563
-rw-r--r--po/gl.po570
-rw-r--r--po/he.po573
-rw-r--r--po/hi.po575
-rw-r--r--po/hr.po568
-rw-r--r--po/hu.po1411
-rw-r--r--po/id.po574
-rw-r--r--po/is.po574
-rw-r--r--po/it.po725
-rw-r--r--po/ja.po576
-rw-r--r--po/ka.po567
-rw-r--r--po/ko.po567
-rw-r--r--po/ky.po575
-rw-r--r--po/lt.po575
-rw-r--r--po/lv.po567
-rw-r--r--po/mk.po575
-rw-r--r--po/mn.po567
-rw-r--r--po/ms.po583
-rw-r--r--po/mt.po575
-rw-r--r--po/nb.po574
-rw-r--r--po/nl.po599
-rw-r--r--po/nn.po707
-rw-r--r--po/pa_IN.po575
-rw-r--r--po/pl.po1365
-rw-r--r--po/pt.po727
-rw-r--r--po/pt_BR.po728
-rw-r--r--po/ro.po576
-rw-r--r--po/ru.po692
-rw-r--r--po/sc.po575
-rw-r--r--po/sk.po575
-rw-r--r--po/sl.po765
-rw-r--r--po/sq.po575
-rw-r--r--po/sr.po575
-rw-r--r--po/sr@Latn.po575
-rw-r--r--po/sv.po726
-rw-r--r--po/tg.po579
-rw-r--r--po/th.po567
-rw-r--r--po/tl.po576
-rw-r--r--po/tr.po776
-rw-r--r--po/uk.po963
-rw-r--r--po/urpmi.pot523
-rw-r--r--po/uz.po574
-rw-r--r--po/uz@cyrillic.po574
-rw-r--r--po/vi.po575
-rw-r--r--po/wa.po576
-rw-r--r--po/zh_CN.po798
-rw-r--r--po/zh_TW.po574
68 files changed, 23077 insertions, 21509 deletions
diff --git a/po/af.po b/po/af.po
index 372be6cd..279e3165 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+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"
@@ -29,7 +29,7 @@ msgstr "Stelsel-installasie"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -77,7 +77,7 @@ msgstr "_Installeer"
msgid "_Save"
msgstr "_Stoor"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "Kanselleer"
@@ -109,9 +109,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - druk hierdie help boodskap.\n"
@@ -142,17 +141,17 @@ msgid ""
" (--no-verify-rpm disables it, default is enabled).\n"
msgstr ""
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
@@ -190,7 +189,22 @@ msgstr "Asseblief wag..."
msgid "Must be root"
msgstr "Muispoort"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "Begin %s:"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Installasievoorbereiding..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Installasievoorbereiding..."
+
+#: ../gurpmi2:111
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -203,37 +217,37 @@ msgstr "Sommige pakkette kan nie geïnstalleer word nie"
msgid "Warning"
msgstr "Waarskuwing"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "OK"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "Opgradeer"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, fuzzy, c-format
msgid " (to install)"
msgstr "Verlaat installasie"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Slegs een van die volgende pakkette word benodig:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "Staak"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -244,7 +258,7 @@ msgstr ""
"%s\n"
"Kan ons voort gaan?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
@@ -253,7 +267,7 @@ msgstr ""
"geïnstalleer word:\n"
"\n"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -262,49 +276,44 @@ msgstr ""
"geïnstalleer word:\n"
"\n"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d pakket, %d MB)"
msgstr[1] "(%d pakkette, %d MB)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Installasievoorbereiding..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, fuzzy, c-format
msgid "unable to get source packages, aborting"
msgstr "Kan nie die bronpakette bekom nie."
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, fuzzy, c-format
msgid "Preparing..."
msgstr "Herlaaistelsel word voorberei..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Installeer tans pakket %s (%s/%s)...."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Plaas asseblief die media bekend as \"%s\" in aandrywer [%s]"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, fuzzy, c-format
msgid "Downloading package `%s'..."
msgstr "Laai tans pakket '%s' (%s/%s) af ..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Klaar"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -315,28 +324,28 @@ msgstr ""
"%s\n"
"Probeer u media se databasis opdateer."
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Installasie het misluk"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Alles is alreeds installeer"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Geïnstalleer"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "verwyder %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, fuzzy, c-format
msgid "restarting urpmi"
msgstr "Begin slurpd: "
@@ -375,7 +384,7 @@ msgstr ""
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -v - woordryke modus.\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, fuzzy, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Daar was 'n fout met die installasie van die pakkette:"
@@ -385,134 +394,143 @@ msgstr "Daar was 'n fout met die installasie van die pakkette:"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "Probleme met skep van media."
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "Laai tans pakket '%s' (%s/%s) af ..."
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr ""
+
+#: ../urpm.pm:305
#, fuzzy, c-format
msgid "unable to open rpmdb"
msgstr "Kan nie lêer %s oopmaak nie\n"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, fuzzy, c-format
msgid "invalid rpm file name [%s]"
msgstr "in lêername"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr ""
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr ""
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, fuzzy, c-format
msgid "...retrieving failed: %s"
msgstr "FAT-grootteverandering het gefaal: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, fuzzy, c-format
msgid "unable to access rpm file [%s]"
msgstr "Kan nie lêer %s oopmaak nie\n"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "Kan nie lêer %s oopmaak nie\n"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, fuzzy, c-format
msgid "unable to register rpm file"
msgstr "Laat \"%s\" toe om die lêer te skryf"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, fuzzy, c-format
msgid "error registering local packages"
msgstr "Daar was 'n fout met pakkette:"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr ""
-#: ../urpm/args.pm:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Ontbrekende velde"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, fuzzy, c-format
msgid "Copying failed"
msgstr "Aanteken gevaal"
@@ -559,122 +577,122 @@ msgstr ""
msgid "unable to write config file [%s]"
msgstr "Kan nie lêer %s oopmaak nie\n"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr ""
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr ""
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Gebruiker naam:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Wagwoord:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr ""
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr ""
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, fuzzy, c-format
msgid "copy failed"
msgstr "Aanteken gevaal"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, fuzzy, c-format
msgid "wget is missing\n"
msgstr "deur %s wat soek is"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, fuzzy, c-format
msgid "curl is missing\n"
msgstr "deur %s wat soek is"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr ""
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr ""
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr ""
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr ""
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr ""
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "deur %s wat soek is"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr ""
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, fuzzy, c-format
msgid "retrieving %s"
msgstr "Verwyder %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "FAT-grootteverandering het gefaal: %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr ""
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr ""
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr ""
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, fuzzy, c-format
msgid "unable to handle protocol: %s"
msgstr "Aktiveer Network Time Protocol"
@@ -694,58 +712,58 @@ msgstr "%s is nie gevind nie...\n"
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "Ondersoek die afgeleë medialêer '%s'..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, fuzzy, c-format
msgid "unable to create transaction"
msgstr "Probleme met die skep van 'n ssh identiteit"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "Kan nie die bronpakette bekom nie."
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, fuzzy, c-format
msgid "unable to install package %s"
msgstr "Probleme met Installasue van pakket %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "%s word installeer\n"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "FAT-grootteverandering het gefaal: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "Verwyder pakkette..."
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, fuzzy, c-format
msgid "removing package %s"
msgstr "Verwyder pakkette..."
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "%s word installeer\n"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, fuzzy, c-format
msgid "More information on package %s"
msgstr "Meer inligting rakende pakket..."
@@ -790,90 +808,80 @@ msgstr "Waarskuwing"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Installasie het misluk"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Installasie het misluk"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Die volgende pakkette geïnstalleer word:\n"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, fuzzy, c-format
msgid "The following packages have bad signatures"
msgstr "Die volgende pakkette geïnstalleer word:\n"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "Do you want to continue installation ?"
msgstr "Wil u op hierdie knoppie klik?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "%s word installeer\n"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, fuzzy, c-format
msgid "distributing %s"
msgstr "Begin %s:"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "%s word installeer\n"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, fuzzy, c-format
msgid "installing %s"
msgstr "%s word installeer\n"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Moet ons 'n installasie sonder afhanklikheidstoetsing probeer? (j/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Moet ons die installasie afdwing (--force) ? (j/N) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, fuzzy, c-format
msgid "Installation is possible"
msgstr "Installasie probleem"
#: ../urpm/md5sum.pm:26
-#, fuzzy, c-format
-msgid "examining %s file"
-msgstr "Ondersoek medialêer '%s'....."
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr ""
@@ -945,228 +953,228 @@ msgstr "Probleme met Installasue van pakket %s"
msgid "medium \"%s\" already exists"
msgstr "Rekening bestaan reeds\n"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "%s from media %s"
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "Redigeer media \"%s\":"
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr ""
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "Kan nie lêer %s oopmaak nie\n"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "Probleme met skep van media."
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "Maak /etc/hosts ...\n"
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, fuzzy, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "Kopieer die lêer vir media '%s'..."
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, fuzzy, c-format
msgid "selecting multiple media: %s"
msgstr "%s word installeer\n"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, fuzzy, c-format
msgid "removing medium \"%s\""
msgstr "Redigeer media \"%s\":"
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "Konfigureer drukker \"%s\" ..."
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "Konfigurasie-lêer"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "Bedienerkonfigurasie"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr ""
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, fuzzy, c-format
msgid "examining synthesis file [%s]"
msgstr "Kan nie lêer: %s skep nie"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, fuzzy, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "%s from media %s"
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "Kopieer die lêer vir media '%s'..."
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, fuzzy, c-format
msgid "...copying failed"
msgstr "Aanteken gevaal"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, fuzzy, c-format
msgid "copying description file of \"%s\"..."
msgstr "in beskrywings"
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, fuzzy, c-format
msgid "...copying done"
msgstr "Aanteken gevaal"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "Installasie het misluk"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr ""
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "Installasie het misluk"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "Kan nie lêer: %s skep nie"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "%s word installeer\n"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "Kopieer die lêer vir media '%s'..."
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "in beskrywings"
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "in lêername"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "Ondersoek die afgeleë medialêer '%s'..."
-
-#: ../urpm/media.pm:1478
-#, c-format
-msgid "found probed synthesis as %s"
-msgstr ""
+msgid "no metadata found for medium \"%s\""
+msgstr "Kopieer die lêer vir media '%s'..."
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "Kopieer die lêer vir media '%s'..."
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "Ondersoek die afgeleë medialêer '%s'..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, fuzzy, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "Ondersoek medialêer '%s'....."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, fuzzy, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, fuzzy, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "Kan nie lêer %s oopmaak nie\n"
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "Kopieer die lêer vir media '%s'..."
+
+#: ../urpm/media.pm:1612
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "Voeg media by"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "Fout met die lees van lêer %s"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1237,7 +1245,7 @@ msgstr ""
msgid "TB"
msgstr ""
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1595,11 +1603,6 @@ msgstr " -v - woordryke modus.\n"
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr ""
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1615,118 +1618,142 @@ msgstr "Kopieer die lêer vir media '%s'..."
msgid "no xml-info available for medium \"%s\""
msgstr "Kopieer die lêer vir media '%s'..."
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, fuzzy, c-format
msgid "No package named %s"
msgstr "Teruglus lêernaam: %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, fuzzy, c-format
msgid "The following packages contain %s: %s"
msgstr "Die volgende pakkette geïnstalleer word:\n"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Alles is alreeds installeer"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Alles is alreeds installeer"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Alles is alreeds installeer"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "deur %s wat soek is"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "Alles is alreeds installeer"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "deur problematiese %s"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "probeer promosie van %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "om %s te kan behou"
#: ../urpm/select.pm:607
#, fuzzy, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Die volgende pakkette moet verwyder word om die ander te kan opgradeer:\n"
+"\n"
+"%s\n"
+"\n"
+"Kan ons voort gaan?"
+
+#: ../urpm/select.pm:608
+#, fuzzy, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Die volgende pakkette moet verwyder word om die ander te kan opgradeer:\n"
+"\n"
+"%s\n"
+"\n"
+"Kan ons voort gaan?"
+
+#: ../urpm/select.pm:635
+#, fuzzy, c-format
msgid "in order to install %s"
msgstr "om %s te kan behou"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "deur %s wat soek is"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, fuzzy, c-format
msgid "Invalid signature (%s)"
msgstr "Ontbrekende velde"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr ""
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, fuzzy, c-format
msgid "Missing signature (%s)"
msgstr "Ontbrekende velde"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "Kan nie lêer %s oopmaak nie\n"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "Aanteken gevaal"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "Aanteken gevaal"
@@ -1768,7 +1795,7 @@ msgstr ""
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --help - druk hierdie help boodskap.\n"
@@ -1795,7 +1822,7 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " -v - woordryke modus.\n"
@@ -1869,7 +1896,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "Verwyder pakkette..."
msgstr[1] "Verwyder pakkette..."
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, fuzzy, c-format
msgid " (y/N) "
msgstr " (J/n) "
@@ -2103,140 +2130,140 @@ msgstr " --help - druk hierdie help boodskap.\n"
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr ""
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " -v - woordryke modus.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr ""
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr ""
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, fuzzy, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -v - woordryke modus.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -v - woordryke modus.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --verbose - woordryke modus.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, fuzzy, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr "Groep bestaan alreeds, Gebruik asb. 'n ander Groepnaam"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr ""
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "Opgradeer"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "Opgradeer"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "Verlaat installasie"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "Verlaat installasie"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2246,12 +2273,12 @@ msgstr ""
"geïnstalleer word:\n"
"\n"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Wat is u keuse (1-%d)"
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2259,7 +2286,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2267,40 +2294,40 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Wil u in elk geval voortgaan?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (J/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
"%s"
msgstr "Sommige pakkette kan nie geïnstalleer word nie"
-#: ../urpmi:525
+#: ../urpmi:513
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s"
msgstr "Sommige pakkette kan nie geïnstalleer word nie"
-#: ../urpmi:542
+#: ../urpmi:530
#, fuzzy, c-format
msgid "removing package %s will break your system"
msgstr ""
"Jammer maat, nou wil jy jou Linux rekenaar vernietig:\n"
"\n"
-#: ../urpmi:551
+#: ../urpmi:538
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2313,7 +2340,7 @@ msgstr ""
"\n"
"Kan ons voort gaan?"
-#: ../urpmi:553
+#: ../urpmi:540
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2326,36 +2353,12 @@ msgstr ""
"\n"
"Kan ons voort gaan?"
-#: ../urpmi:560
-#, fuzzy, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Die volgende pakkette moet verwyder word om die ander te kan opgradeer:\n"
-"\n"
-"%s\n"
-"\n"
-"Kan ons voort gaan?"
-
-#: ../urpmi:561
-#, fuzzy, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Die volgende pakkette moet verwyder word om die ander te kan opgradeer:\n"
-"\n"
-"%s\n"
-"\n"
-"Kan ons voort gaan?"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2363,7 +2366,7 @@ msgid ""
"%s\n"
msgstr "Jy moet stam wees om hierdie opdrag te gebruik !\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
@@ -2376,39 +2379,39 @@ msgstr[1] ""
"geïnstalleer word:\n"
"\n"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Kanselleer"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Druk ENTER wanneer u reg is..."
@@ -3103,6 +3106,10 @@ msgid "No changelog found\n"
msgstr "Geen beeld gevind nie"
#, fuzzy
+#~ msgid "examining %s file"
+#~ msgstr "Ondersoek medialêer '%s'....."
+
+#, fuzzy
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --help - druk hierdie help boodskap.\n"
diff --git a/po/ar.po b/po/ar.po
index 67ba2204..59122986 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ar\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2005-09-05 17:40+0300\n"
"Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
"Language-Team: Arabic <support@arabeyes.org>\n"
@@ -32,7 +32,7 @@ msgstr "تثبيت RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_موافق"
@@ -98,7 +98,7 @@ msgstr "_تثبيت"
msgid "_Save"
msgstr "_حفظ"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "ال_غاء"
@@ -129,9 +129,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - تطبع رسالة المساعدة هذه.\n"
@@ -165,17 +164,17 @@ msgstr ""
" (--no-verify-rpm يعطّل هذا الخيار، وهو ممكّن بشكل "
"افتراضي.)\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - استخدم فقط الوسيط المحدّد، مفصولة بفواصل.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - السماح بالبحث في المعطيات ليجاد حزمة.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - لا تبحث في المعطيات لإيجاد حزمة.\n"
@@ -215,7 +214,22 @@ msgstr "انتظر من فضلك..."
msgid "Must be root"
msgstr "يجب أن تكون جذراً"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "جاري توزيع %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "تثبيت الحزم..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "تثبيت الحزم..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -231,37 +245,37 @@ msgstr ""
msgid "Warning"
msgstr "تحذير"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "موافق"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (للترقية)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (للتثبيت)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "خيارات الحزم"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "أحد الحزم التالية يُحتاج اليه:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "إ_جهاض"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -272,19 +286,19 @@ msgstr ""
"%s\n"
"هل من الممكن المتابعة؟"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "لإرضاء المُعتمدات، سيتمّ تثبيت الحزمة التّالية (%d ميغابايت)"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "لإرضاء المُعتمدات، سيتمّ تثبيت الحزمة التّالية (%d ميغابايت)"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, fuzzy, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
@@ -293,42 +307,37 @@ msgstr[1] "(%d حزم، %d م.ب.)"
msgstr[2] "(%d حزم، %d م.ب.)"
msgstr[3] "(%d حزم، %d م.ب.)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "تثبيت الحزم..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "لم يمكن الحصول على الحزمة المصدرية، جاري الإنهاء"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "جاري التحضير..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "جاري تثبيت الحزمة `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "يرجى ادخال الوسيط \"%s\" في الجهاز [%s]"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "جاري تنزيل الحزمة `%s'..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "ا_نتهى"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -339,28 +348,28 @@ msgstr ""
"%s\n"
"ربما تريد تحديث فاعدة بيانات urpmi الخاصة بك"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "فشل التثبيت"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "كل شئ مثبت مسبقا"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "انتهى التثبيت"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "جاري إزالة %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "إعادة تشغيل urpmi"
@@ -399,7 +408,7 @@ msgstr " الافتراضات هي %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -g - تطبع المجموعات أيضا مع الأسماء أيضاً.\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "المستخدم الجذر فقط مسموح له بتثبيت الحزم"
@@ -409,134 +418,143 @@ msgstr "المستخدم الجذر فقط مسموح له بتثبيت الحز
msgid "Running urpmi in restricted mode..."
msgstr "تشغيل urpmi في الوضع المحظور..."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "تعذر انشاء الدليل [%s] لتقرير العيوب"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "جاري تنزيل الحزمة `%s'..."
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "جاري استخدام بيئة محددة على %s\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "تعذر فتح rpmdb"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "اسم ملف rpm غير موجود [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "جاري استرجاع ملف rpm [%s]..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...تم الاسترجاع"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...فشل الإسترجاع: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "لم يمكن الوصول الى ملف rpm [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "تعذر تحليل \"%s\" في الملف [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "تعذر تسجيل ملف rpm"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "خطأ في تسجيل الحزم المحلية"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "هذه العملية محظورة أثناء العمل في الوضع المحظور"
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "تعريف بروكسي خاطئ في سطر الأوامر\n"
-#: ../urpm/args.pm:298
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: لم يمكن ايجاد ملف rpm \"%s\"\n"
-#: ../urpm/args.pm:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "توقيع مفقود (%s)"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "فشل النّسخ"
@@ -583,122 +601,122 @@ msgstr ""
msgid "unable to write config file [%s]"
msgstr "غير قادر على كتابة ملف الإعدادات [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr ""
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr ""
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr ""
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "كلمة المرور:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr ""
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr ""
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, fuzzy, c-format
msgid "copy failed"
msgstr "فشل النّسخ"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, fuzzy, c-format
msgid "wget is missing\n"
msgstr "بسبب فقدان %s"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, fuzzy, c-format
msgid "curl is missing\n"
msgstr "بسبب فقدان %s"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr ""
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr ""
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr ""
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr ""
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr ""
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "بسبب فقدان %s"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr ""
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, fuzzy, c-format
msgid "retrieving %s"
msgstr "جاري إزالة %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...فشل الإسترجاع: %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "بروتكول غير معرّف لـ%s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr ""
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "لم يعثر على أي وسيلة تنزيل، وسائل التنزيل المدعومة هي: %s\n"
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "تعذر التعامل مع البروتوكول: %s"
@@ -718,58 +736,58 @@ msgstr "لم يمكن ايجاد الحزمة %s"
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "جاري استرجاع ملفات rpm للوسيط \"%s\"..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr "جاري انشاء معاملة للتثبيت على %s (حذف=%d، تثبيت=%d، ترقية=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "تعذر انشاء المعاملة"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "تعذر استخراج rpm من حزمة delta-rpm %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "تعذر تثبيث الحزمة %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "جاري تثبيت %s من %s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "...فشل الإسترجاع: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "جاري حذف الحزمة %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "جاري حذف الحزمة %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "جاري تثبيت %s من %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "معلومات إضافية حول الحزمة %s"
@@ -814,90 +832,80 @@ msgstr "تحذير"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "فشل التثبيت"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "فشل التثبيت"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "الحزم التالية تحتوي على توقيعات فاسدة"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "الحزم التالية تحتوي على توقيعات فاسدة"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "هل تريد متابعة التثبيت؟"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "جاري تثبيت %s من %s"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "جاري توزيع %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "جاري تثبيت %s من %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "جاري تثبيت %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "محاولة التثبيت دون التأكد من الاعتمادات؟ (y[نعم]/N[لا])"
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "حاول التثبيت بشكل أقوى (--force)؟ (y[نعم]/N[لا])."
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "التثبيت ممكن"
#: ../urpm/md5sum.pm:26
-#, fuzzy, c-format
-msgid "examining %s file"
-msgstr "جاري اختبار ملف MD5SUM"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "تحذير: md5sum لـ%s غير متوفر في ملف MD5SUM"
@@ -971,228 +979,228 @@ msgstr "سيتم التثبيت بدلاً من ترقية الحزمة %s"
msgid "medium \"%s\" already exists"
msgstr "الوسيط \"%s\" موجود مسبقا"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "جاري قراءة الترويسة من الوسيط \"%s\""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "جاري ازالة الوسيط \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr ""
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "تعذر فتح rpmdb"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "لم أستطع التّوصّل إلى وسيط التّثبيت الأوّل (ملفّ hdlists غير موجود)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "جاري استرجاع ملف hdlists..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "جاري محاولة اختيار الوسيط غير موجود \"%s\""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "جاري اختيار الوسيط المتعدد: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "جاري ازالة الوسيط \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "تجري إعادة تهيئة urpmi للوسيط \"%s\""
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...فشلت إعادة التّهيئة"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "تمّت إعادة التّهيئة"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "الوسيط \"%s\" غير مختار"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "جاري اختبار ملف التخليق [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "مشكلة في قراءة ملف التخليق للوسيط \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "جاري كتابة ملف القوائم للوسيط \"%s\""
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...فشل النسخ"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "جاري نسخ وصف الملف لـ\"%s\"..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...تم النسخ"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "فشل نسخ [%s] (الملفّ صغير بشكل مثيل للشّكّ)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "جاري حساب md5sum لـhdlist المصدر المستحضر (أو التخليق)"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "فشل نسخ [%s] (md5sum غير متطابقة)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "جاري اختبار ملف hdlist [%s]"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "جاري تثبيت %s من %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "لم يمكن ايجاد ملف hdlist للوسيط \"%s\""
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "جاري نسخ وصف الملف لـ\"%s\"..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "اسم ملف rpm غير موجود [%s]"
-#: ../urpm/media.pm:1461
-#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "جاري استرجاع hdlist (أو ملف تخليق) \"%s\"..."
-
-#: ../urpm/media.pm:1478
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "تم ايجاد hdlist (أو ملف تخليق) كـ %s..."
+msgid "no metadata found for medium \"%s\""
+msgstr "لم يمكن ايجاد ملف hdlist للوسيط \"%s\""
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "لم يمكن ايجاد ملف hdlist للوسيط \"%s\""
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "جاري استرجاع hdlist (أو ملف تخليق) \"%s\"..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "جاري اختبار ملف pubkey لـ\"%s\"..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...تم استيراد المفتاح %s من ملف pubkey \"%s\""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "لم يمكن استيراد ملف pubkey الخاص بـ\"%s\""
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "لم يمكن ايجاد ملف hdlist للوسيط \"%s\""
+
+#: ../urpm/media.pm:1612
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "تمت اضافة الوسيط %s"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "جاري قراءة ملفات rpm من [%s]"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "لاNn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1263,7 +1271,7 @@ msgstr ""
msgid "TB"
msgstr ""
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1620,11 +1628,6 @@ msgstr " -f - اطبع النّسخة، الإصدار وarch مع
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "جاري استخدام بيئة محددة على %s\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1640,118 +1643,136 @@ msgstr "تم بناء ملف تخليق hdlist للوسيط \"%s\""
msgid "no xml-info available for medium \"%s\""
msgstr "جاري كتابة ملف القوائم للوسيط \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "لا توجد حزمة بالإسم %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "الحزم التالية تحتوي على %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "كل شئ مثبت مسبقا"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "كل شئ مثبت مسبقا"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "كل شئ مثبت مسبقا"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "بسبب فقدان %s"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "كل شئ مثبت مسبقا"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "بسبب عدم ارضاء %s"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "جاري محاولة ترقية %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "كي يتم الحفاظ على %s"
#: ../urpm/select.pm:607
+#, fuzzy, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"يجب حذف الحزم التالية لترقية الحزم الأخرى:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"يجب حذف الحزم التالية لترقية الحزم الأخرى:\n"
+"%s"
+
+#: ../urpm/select.pm:635
#, c-format
msgid "in order to install %s"
msgstr "كي يتم تثبيث %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "بسبب التعارض مع %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "توقيع غير صالح (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "مفتاح هوية غير صالح (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "توقيع مفقود (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "لا يمكن إنشاء ملف التهيئة [%s]"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "فشل النّسخ"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "فشل النّسخ"
@@ -1792,7 +1813,7 @@ msgstr " --test - تحقق إن كان بالإمكان الإزالة
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - urpmi موزّع على الأجهزة الخاصّة بالاسم البديل.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - اطبع الصّفة المُغلّف : المغلّف.\n"
@@ -1821,7 +1842,7 @@ msgstr ""
" --use-distrib - هيّئ urpmi بشكل سريع من شجرة توزيع، مفيد\n"
" لتثبيت/إزالة chroot باستخدام خيار --root.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - وضع التفصيل.\n"
@@ -1893,7 +1914,7 @@ msgstr[1] "جاري حذف الحزمة %s"
msgstr[2] "جاري حذف الحزمة %s"
msgstr[3] "جاري حذف الحزمة %s"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (ن/ل)"
@@ -2147,17 +2168,22 @@ msgstr " --url - اطبع الصّفة عنوان url: عنوان url.
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - اطبع وصف الصّفة : الوصف.\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - اطبع الصّفة يعارض : كل التعارضات.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - الحزم اللّازم تخطّي إعداداها\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, fuzzy, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --skip - الحزم اللّازم تخطّي إعداداها\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2166,87 +2192,82 @@ msgstr ""
" --more-choices - في حالة العثور على عدّة حزم، إقترح عددا أكبر من الخيارات\n"
" عن العدد الافتراضي.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - عدم إخلاء حزم rpms من المخزن.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - ترقية الحزم ذات البُنية ذاتها فقط.\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - اختر كل التطابقات على سطر الأوامر.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - وضع هادئ.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --verbose - وضع التفصيل.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " الأسماء أو ملفات rpm المعطاة على سطر الأوامر سيتم تثبيتها.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "ماذا يمكن فعله مع ملف rpm تنفيذي عند استخدام المعامل --install-src"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr "الدّليل [%s] موجود مسبقاً، رجاء استخدم دليلاً آخر لتقرير المشكلة أو حذفها"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "تعذر انشاء الدليل [%s] لتقرير العيوب"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2255,48 +2276,48 @@ msgstr ""
"خطأ: يبدو أن %s مركّب بوضع القراءة فقط.\n"
"استخدم --allow-force لإجبار العملية."
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (للترقية)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (للترقية)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (للتثبيت)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (للتثبيت)"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "لإرضاء المُعتمدات، ستتم ازالة %d حزمة"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "ما هو اختيارك؟ (1-%d)"
-#: ../urpmi:507
+#: ../urpmi:495
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2307,7 +2328,7 @@ msgstr ""
"أقدم من المثبتة:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2318,19 +2339,19 @@ msgstr ""
"أقدم من المثبتة:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "استمرار على أي حال؟"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (ن/ل)"
-#: ../urpmi:524
+#: ../urpmi:512
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2339,7 +2360,7 @@ msgstr ""
"لا يمكن تثبيت بعض الحزم المطلوبة:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2348,12 +2369,12 @@ msgstr ""
"لا يمكن تثبيت بعض الحزم المطلوبة:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "إزالة الحزمة %s ستتسبب في تعطيل نظامك"
-#: ../urpmi:551
+#: ../urpmi:538
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2364,7 +2385,7 @@ msgstr ""
"لكي تتم ترقية الحزم الأخرى:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2375,30 +2396,12 @@ msgstr ""
"لكي تتم ترقية الحزم الأخرى:\n"
"%s\n"
-#: ../urpmi:560
-#, fuzzy, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"يجب حذف الحزم التالية لترقية الحزم الأخرى:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"يجب حذف الحزم التالية لترقية الحزم الأخرى:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2408,7 +2411,7 @@ msgstr ""
"يجب أن تكون مستخدم جذر لكي تقوم بتثبيت الإعتمادات التالية:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
@@ -2417,27 +2420,27 @@ msgstr[1] "لإرضاء المُعتمدات، ستتم ازالة %d حزمة"
msgstr[2] "لإرضاء المُعتمدات، ستتم ازالة %d حزمة"
msgstr[3] "لإرضاء المُعتمدات، ستتم ازالة %d حزمة"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2446,12 +2449,12 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "إلغاء"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "اضغط Enter عند الاستعداد..."
@@ -3188,6 +3191,14 @@ msgstr ""
msgid "No changelog found\n"
msgstr "لم يُعثر على سجلّ تغييرات\n"
+#, fuzzy
+#~ msgid "examining %s file"
+#~ msgstr "جاري اختبار ملف MD5SUM"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "تم ايجاد hdlist (أو ملف تخليق) كـ %s..."
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - اعمل وسيط تحديث.\n"
diff --git a/po/az.po b/po/az.po
index ba82ae52..53464e9a 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+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"
@@ -32,7 +32,7 @@ msgstr "Sistem qurulumu"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Oldu"
@@ -100,7 +100,7 @@ msgstr "_Qur"
msgid "_Save"
msgstr "_Qeyd Et"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Ləğv Et"
@@ -132,9 +132,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - bu kömək ismarışını çap edər.\n"
@@ -168,20 +167,20 @@ msgstr ""
" (--no-verify-rpm bunu qeyri-fəallaşdırır, əsasən "
"fəaldır).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - ancaq vergüllə ayrılmış verilən mediya(lar)nı işlət.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - paketi tapmaq üçün verilənlər arasında axtarmaya icazə "
"ver.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - paketi tapmaq üçün verilənlər arasında axtarma.\n"
@@ -220,7 +219,22 @@ msgstr "Xahiş edirik gözləyin..."
msgid "Must be root"
msgstr "Siçan Qapısı"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "%s paylanır"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Paket qurulumu..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Paket qurulumu..."
+
+#: ../gurpmi2:111
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -235,37 +249,37 @@ msgstr ""
msgid "Warning"
msgstr "Xəbərdarlıq"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Oldu"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "Yeniləmə"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, fuzzy, c-format
msgid " (to install)"
msgstr "Qurulumun sonu"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Aşağıdakı paketlərin bir dənəsinə ehtiyac var:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Ləğv Et"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -275,62 +289,57 @@ msgstr ""
"Paketlərin yenilənməsi üçün aşağıdakı paketlərin çıxardılması lazımdır:\n"
"%s"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
"Asılıqları ortadan qaldırmaq üçün, aşağıdakılar da qurulmalıdır (%d Mb)"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
"Asılıqları ortadan qaldırmaq üçün, aşağıdakılar da qurulmalıdır (%d Mb)"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d paket, %d MB)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Paket qurulumu..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "qaynaq paketi alına bilmir, çıxılır"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Hazırlanır..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "`%s' paketi qurulur (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Lütfən \"%s\" medyasını [%s] avadanlığına yerləşdirin"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "`%s' paketi endirilir..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, fuzzy, c-format
msgid "_Done"
msgstr "Qurtardı"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -341,28 +350,28 @@ msgstr ""
"%s\n"
"Sizə, urpmi databeyzinizi yeniləməyi məsləhət görürük."
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Qurulum iflas etdi"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "hər şey onsuzda quruludur"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Qurulum bitdi"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "%s silinir"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "urpmi yenidən başladılır"
@@ -399,7 +408,7 @@ msgstr " ön qurğulusu %s-dir.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -g - adla birlikdə qrupları da göstər.\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Paketləri qurma icazəsi ancaq ali istifadəçi verilib"
@@ -409,134 +418,143 @@ msgstr "Paketləri qurma icazəsi ancaq ali istifadəçi verilib"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "Xəta raportu üçün [%s] cərgəsi yaradıla bilmədi"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "`%s' paketi endirilir..."
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "%s üstündə xüsusi mühit istifadə edilir\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "rpmb açıla bilmir"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "hökmsüz rpm fayı adı [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "[%s] rpm faylı alınır ..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...alınma bitdi"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...alış bacarılmadı: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "rpm faylı [%s] çatıla bilmir"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "[%s] faylındakı \"%s\" oxuna bilmədi"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "rpm faylı qeydiyyatdan keçirilə bilmədi"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "yerli paket qeydiyyat xətası"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, 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:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Əksik imza (%s)"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Köçütrmə bacarılmadı"
@@ -583,122 +601,122 @@ msgstr ""
msgid "unable to write config file [%s]"
msgstr "[%s] quraşdırma faylı yazıla bilmir"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr ""
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr ""
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "İstifadəçi adı:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Şifrə:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr ""
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr ""
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, fuzzy, c-format
msgid "copy failed"
msgstr "Köçütrmə bacarılmadı"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, fuzzy, c-format
msgid "wget is missing\n"
msgstr "%s əksik olduğuna görə"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, fuzzy, c-format
msgid "curl is missing\n"
msgstr "%s əksik olduğuna görə"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr ""
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr ""
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr ""
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr ""
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr ""
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "%s əksik olduğuna görə"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr ""
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, fuzzy, c-format
msgid "retrieving %s"
msgstr "%s silinir"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...alış bacarılmadı: %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "%s üçün müəyyən edilən protokol namə'lumdur"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr ""
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, 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:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "protokol istifadə edilə bilmir: %s"
@@ -718,58 +736,58 @@ msgstr "%s paketi tapılmadı."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "\"%s\" mediyumundan rpm faylları alınır..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr "%s üstündə qurma üçün keçiş bitdi (sil=%d, qul=%d, yenilə=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "keçiş yaradıla bilmir"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "%s paketi çıxardıla bilmədi"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "%s paketi qurula bilmədi"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "%s qurulur"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "...alış bacarılmadı: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "%s peketi silinir"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "%s peketi silinir"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "%s qurulur"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "%s peketi haqqında daha çox məlumat"
@@ -814,90 +832,80 @@ msgstr "Xəbərdarlıq"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Qurulum iflas etdi"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Qurulum iflas etdi"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, 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:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Aşağıdakı paketlər hökmsüz imzaya sahibdir"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Quruluma davam etmək istəyirsiniz ?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "%s qurulur"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "%s paylanır"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "%s qurulur"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "%s qurulur"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Paket asılılıqlarına fikir vermədən qurmağı sınayım? (b/X) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Quruluşu zorlayaraq sınayım (--force)? (b/X)"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Qurulum mümkündür"
#: ../urpm/md5sum.pm:26
-#, fuzzy, c-format
-msgid "examining %s file"
-msgstr "MD5SUM faylı sınanır"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr ""
@@ -971,229 +979,229 @@ msgstr "%s yeniləmə paketi yerinə qurula bilər"
msgid "medium \"%s\" already exists"
msgstr "\"%s\" medyası onsuz da vardır"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "\"%s\" medyasından üst mə'lumatlar oxunur"
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "\"%s\" medyumu çıxardılır"
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr ""
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "rpmb açıla bilmir"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"birinci qurulum mediyasına yetişə bilmədim (hdlists faylı tapıla bilmədi)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "hdlists faylı alınır..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "mövcud olmayan \"%s\" medyumu seçilməyə çalışılır"
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "birdən çox medya seçilir: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "\"%s\" medyumu çıxardılır"
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "\"%s\" mediyumundan rpm faylları alınır..."
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...yenidən quraşdırma bacarılmadı"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "yenidən quraşdırma tamamlandı"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "\"%s\" medyası seçili deyil"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "[%s] synthesis faylı sınanır "
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "\"%s\" medyasının synthesis faylı oxuna bilmədi"
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "\"%s\" medyası üçün siyahı faylı yazılır"
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...köçütrmə bacarılmadı"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "\"%s\" faylının izahat faylı köçürdülür..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...köçürtmə bitdi"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "[%s] faylının köçürülməsi bacarılmadı (fayl şüphəli dərəcədə kiçikdir)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "alınan mənbə hdlist (ya da synthesis) faylının md5sum'ları hesablanır"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "[%s] köçürülmə əməliyyatı bacarılmadı (md5sum uyğunsuzluğu)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "[%s] hdlist faylı yoxlanır"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "%s qurulur"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "\"%s\" medyası hdlist faylı tapılmadı"
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "\"%s\" faylının izahat faylı köçürdülür..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "hökmsüz rpm fayı adı [%s]"
-#: ../urpm/media.pm:1461
-#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "\"%s\"in mənbə hdlist (ya da synthesis) faylı alınır..."
-
-#: ../urpm/media.pm:1478
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "%s adında sınanmış hdlist (ya da synthesis) tapıldı"
+msgid "no metadata found for medium \"%s\""
+msgstr "\"%s\" medyası hdlist faylı tapılmadı"
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "\"%s\" medyası hdlist faylı tapılmadı"
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "\"%s\"in mənbə hdlist (ya da synthesis) faylı alınır..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "\"%s\" faylının pubkey'si yoxlanır..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...\"%s\"nın pubkey faylından %s açarı idxal edildi"
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "\"%s\" faylının pubkey'si idxal edilə bilmədi"
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "\"%s\" medyası hdlist faylı tapılmadı"
+
+#: ../urpm/media.pm:1612
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "%s medyası əlavə edildi"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "rpm faylları [%s] üstündən oxunur"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "XxJjNn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1264,7 +1272,7 @@ msgstr ""
msgid "TB"
msgstr ""
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1623,11 +1631,6 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "%s üstündə xüsusi mühit istifadə edilir\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1643,118 +1646,136 @@ msgstr "\"%s\" medyası hdlist sintezi inşa edilid"
msgid "no xml-info available for medium \"%s\""
msgstr "\"%s\" medyası üçün siyahı faylı yazılır"
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, fuzzy, c-format
msgid "No package named %s"
msgstr "%s adlı paket yoxdur"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Aşağıdakı paketlər %s daxıl edir: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "hər şey onsuzda quruludur"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "hər şey onsuzda quruludur"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "hər şey onsuzda quruludur"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "%s əksik olduğuna görə"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "hər şey onsuzda quruludur"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "razı qalmayan %s olduğuna görə"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "%s irəliləndirməyə çalışılır"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "%s'ı saxlamaq üçün"
#: ../urpm/select.pm:607
+#, fuzzy, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Paketlərin yenilənməsi üçün aşağıdakı paketlərin çıxardılması lazımdır:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Paketlərin yenilənməsi üçün aşağıdakı paketlərin çıxardılması lazımdır:\n"
+"%s"
+
+#: ../urpm/select.pm:635
#, c-format
msgid "in order to install %s"
msgstr "%s paket(lər)ini qurmaq üçün"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "%s ilə yaranan toqquşma səbəbiylə"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Hökmsüz imza (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Hökmsüz Qiymət ID (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Əksik imza (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "[%s] quraşdırma faylı yazıla bilmir"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "Köçütrmə bacarılmadı"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "Köçütrmə bacarılmadı"
@@ -1796,7 +1817,7 @@ msgstr " --test - qurulumun düzgün edilə biləcəyini yoxla.\n"
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - alias sistemləri arasında paylaşılmış urpmi.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - taq paketləyicisini göstərr: paketləyici.\n"
@@ -1823,7 +1844,7 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr " --use-distrib - urpmi-ni birbaşa distrib ağacından quraşdır.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - təfsilatlı mod.\n"
@@ -1884,7 +1905,7 @@ msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "%s peketi silinir"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (b/X) "
@@ -2140,87 +2161,92 @@ msgstr " --url - taq url'sini göstər: url.\n"
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - taq izahatını göstər: izahat.\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - taq toqquşmalarını göstər: bütün toqquşmalar.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - qurulması keçilə bilən paketlər\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, fuzzy, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --skip - qurulması keçilə bilən paketlər\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:146
+#: ../urpmi:147
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - rpm'ləri ara yaddaşda işlətmə.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - əmr sətirindəki bütün uyğun gələnləri seç.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - səssiz mod.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --verbose - təfsilatlı mod.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " əmr sətirində verilən adlar ya da rpm faylları qurulacaq.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "--install-src istifadə edildiyində rpm faylları ilə nə edilə biləcəyi"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2229,53 +2255,48 @@ msgstr ""
"[%s] qovluğu onsuz da mövcuddur, xahiş edirik xəta raportu üçün başqa qovluq "
"işlədin"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Xəta raportu üçün [%s] cərgəsi yaradıla bilmədi"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "Yeniləmə"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "Yeniləmə"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "Qurulumun sonu"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "Qurulumun sonu"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2283,12 +2304,12 @@ msgid ""
msgstr ""
"Asılıqları ortadan qaldırmaq üçün, aşağıdakı paketlər silinəcəkdir (%d MB)"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Seçiminiz? (1-%d)"
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2296,7 +2317,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2304,19 +2325,19 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Davam edilsin?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (B/x) "
-#: ../urpmi:524
+#: ../urpmi:512
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2325,7 +2346,7 @@ msgstr ""
"Bəzi istənən paketlər qurula bilmir:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2334,12 +2355,12 @@ msgstr ""
"Bəzi istənən paketlər qurula bilmir:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "%s paketini silmək sisteminizi pozacaq"
-#: ../urpmi:551
+#: ../urpmi:538
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2350,7 +2371,7 @@ msgstr ""
"aşağıdakı paketlərin çıxardılması lazımdır:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2361,30 +2382,12 @@ msgstr ""
"aşağıdakı paketlərin çıxardılması lazımdır:\n"
"%s\n"
-#: ../urpmi:560
-#, fuzzy, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Paketlərin yenilənməsi üçün aşağıdakı paketlərin çıxardılması lazımdır:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Paketlərin yenilənməsi üçün aşağıdakı paketlərin çıxardılması lazımdır:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2394,45 +2397,45 @@ msgstr ""
"Aşağıdakı asıllılıqları qurmaq üçün ali istifadəçi olmalısınız:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] ""
"Asılıqları ortadan qaldırmaq üçün, aşağıdakı paketlər silinəcəkdir (%d MB)"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Ləğv et"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Hazır olanda Enter düyməsinə basın..."
@@ -3162,6 +3165,14 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Rəsm tapıla bilmədi"
+#, fuzzy
+#~ msgid "examining %s file"
+#~ msgstr "MD5SUM faylı sınanır"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "%s adında sınanmış hdlist (ya da synthesis) tapıldı"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - yeniləmə mediyumu yarat.\n"
diff --git a/po/bg.po b/po/bg.po
index 57fdc5df..cd7f444d 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+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"
@@ -31,7 +31,7 @@ msgstr "RPM Инсталация"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Добре"
@@ -97,7 +97,7 @@ msgstr "_Инсталиране"
msgid "_Save"
msgstr "_Запазване"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr " Отказ"
@@ -129,9 +129,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - показва това помощно съобщение.\n"
@@ -163,17 +162,17 @@ msgid ""
" (--no-verify-rpm disables it, default is enabled).\n"
msgstr ""
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, fuzzy, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --update - обновява само източници на обновяване.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, fuzzy, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -a - избиране на всички съвпадения на командния ред.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, fuzzy, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -r - отпечатай версия и също така реализация с име.\n"
@@ -214,7 +213,22 @@ msgstr "Моля, изчакайте..."
msgid "Must be root"
msgstr "Трябва да бъдете root/админ"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "Стартирам %s:"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Инсталиране на пакети..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Инсталиране на пакети..."
+
+#: ../gurpmi2:111
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -230,37 +244,37 @@ msgstr ""
msgid "Warning"
msgstr "Предупреждение"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Добре"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr "(за обновяване)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr "(към инсталация)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Необходим е един от следните пакети:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Прекъсване"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -272,14 +286,14 @@ msgstr ""
"%s\n"
"Продължение"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
"За да се запазят зависимостите,тези пакети ще бъдат деинсталирани (%d МБ)"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -288,49 +302,44 @@ msgstr ""
"бъдат инсталирани:\n"
"%s\n"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, fuzzy, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "%d пакета"
msgstr[1] "%d пакета"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Инсталиране на пакети..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "не мога да получа сорс пакетите, прекратявам"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Подготовка..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Инсталиране на пакет `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Моля, поставете източник с име \"%s\" в устройство [%s]"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Сваляне на пакет `%s'..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Готово"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -341,28 +350,28 @@ msgstr ""
"%s\n"
"Вие вероятно трябва да обновите вашата urpmi база данни."
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Инсталацията провалена"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Пакета(тите) вече са инсталирани"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Инсталацията приключи"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "изтриване на %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, fuzzy, c-format
msgid "restarting urpmi"
msgstr "Стартира slurpd: "
@@ -402,7 +411,7 @@ msgstr " по подразбиране е %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -g - отпечатай също групите с имена.\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, fuzzy, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Появи се грешка при инсталиране на пакетите:"
@@ -412,134 +421,143 @@ msgstr "Появи се грешка при инсталиране на паке
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "Грешка при създаване на директория %s"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "Сваляне на пакет `%s'..."
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr ""
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "не мога да отворя rpmdb"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "грешно rpm име на файла [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "получавам rpm файла [%s] ... "
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...получаването завършено"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...грешка при получаване: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "rpm файлът [%s] е недостъпен"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "невъзможно да се обработи/парсва \"%s\" в файл [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "невъзможно регистрирането на rpm файл"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "грешка при регистрация на локалните пакети"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "грешна прокси декларация на командния ред\n"
-#: ../urpm/args.pm:298
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: не може да се прочете rpm файл \"%s\"\n"
-#: ../urpm/args.pm:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Липсващ подпис (%s)"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, fuzzy, c-format
msgid "Copying failed"
msgstr "Неуспешно влизане"
@@ -586,122 +604,122 @@ msgstr ""
msgid "unable to write config file [%s]"
msgstr "невъзможно да се запише конфигурационен файл [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr ""
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr ""
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Потребител:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Парола:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr ""
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr ""
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, fuzzy, c-format
msgid "copy failed"
msgstr "Неуспешно влизане"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, fuzzy, c-format
msgid "wget is missing\n"
msgstr "поради липсващ %s"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, fuzzy, c-format
msgid "curl is missing\n"
msgstr "поради липсващ %s"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr ""
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr ""
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr ""
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr ""
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr ""
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "поради липсващ %s"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr ""
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, fuzzy, c-format
msgid "retrieving %s"
msgstr "изтриване на %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...грешка при получаване: %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "Зададен е неизвестен протокол за %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr ""
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "не е намерен webfetch, поддържаните webfetch са: %s\n"
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "не мога да обработя протокол %s"
@@ -721,12 +739,12 @@ msgstr "пакет %s не е намерен."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "получаване на rpm файлове от източник \"%s\"... "
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -734,47 +752,47 @@ msgstr ""
"създадена е транзакция за инсталиране върху %s (премахни=%d, инсталирай=%d, "
"обнови=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, fuzzy, c-format
msgid "unable to create transaction"
msgstr "не може да се създаде/започне транзакция"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "невъзможно е премахването на пакет %s "
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "невъзможно инсталирането на пакет %s "
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "инсталиране %s\n"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "...грешка при получаване: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "изтриване на пакет %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "изтриване на пакет %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "инсталиране %s\n"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, fuzzy, c-format
msgid "More information on package %s"
msgstr "Повече информация от пакет..."
@@ -819,90 +837,80 @@ msgstr "Предупреждение"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Инсталацията провалена"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Инсталацията провалена"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Следните пакети ще трябва да се инсталират:\n"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, fuzzy, c-format
msgid "The following packages have bad signatures"
msgstr "Следните пакети ще трябва да се инсталират:\n"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "Do you want to continue installation ?"
msgstr "Искате ли да цъкнете на този бутон?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "инсталиране %s\n"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, fuzzy, c-format
msgid "distributing %s"
msgstr "Стартирам %s:"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "инсталиране %s\n"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, fuzzy, c-format
msgid "installing %s"
msgstr "инсталиране %s\n"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Опит за инсталиране без проверка на зависимости? (д/Н) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Опит за инсталиране даже по-силно (--force)? (д/Н) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Инсталацията е възможна"
#: ../urpm/md5sum.pm:26
-#, fuzzy, c-format
-msgid "examining %s file"
-msgstr "проверка на MD5SUM файл"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "предупреждение: md5sum за %s липсва в MD5SUM файла"
@@ -979,234 +987,234 @@ msgstr "ще инсталирам, вместо да обновя пакет %s"
msgid "medium \"%s\" already exists"
msgstr "източникът \"%s\" вече съществува"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "четене на headers от източник \"%s\""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "премахване на източник \"%s\":"
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr ""
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "не мога да отворя rpmdb"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"невъзможен достъпа до източника за първоначална инсталация (не е намерен "
"файла hdlists)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "получаване на hdlists файла..."
# Another meaning of the word is in the sense "The iron is good medium for the eletricity"
# in this case must be "проводник"
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, fuzzy, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "опит за избор на несъществуващ източник \"%s\""
# Another meaning of the word is in the sense "The iron is good medium for the eletricity"
# in this case must be "проводник"
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "избор на множество източници: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "премахване на източник \"%s\":"
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "пренастройка на urpmi за източник \"%s\"..."
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "...пренастройката неуспешна"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "пренастройката завършена"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "източникът \"%s\" не е избран"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, fuzzy, c-format
msgid "examining synthesis file [%s]"
msgstr "проверявам синтезис файл [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "проблем при четенето на синтез файл за източник \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "записване на лист файл за източник \"%s\""
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...неуспешно копиране"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "копиране на описателен файл за \"%s\"..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...копирането завършено"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "грешка при копиране на [%s] (файла е подозрително малък)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "изчисляване на md5 сумата на копирания hdlist (или synthesis)"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "грешко копие на [%s] (грешна md5sum)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "проверка на hdlists файла [%s]"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "инсталиране %s\n"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "не е намерен hdlist файл за източник \"%s\""
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "копиране на описателен файл за \"%s\"..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "грешно rpm име на файла [%s]"
-#: ../urpm/media.pm:1461
-#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "четене на source hdlist (или synthesis) от \"%s\""
-
-#: ../urpm/media.pm:1478
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "намерен тестван hdlist (или synthesis) като %s"
+msgid "no metadata found for medium \"%s\""
+msgstr "не е намерен hdlist файл за източник \"%s\""
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "не е намерен hdlist файл за източник \"%s\""
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "четене на source hdlist (или synthesis) от \"%s\""
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "проверявам публичен ключ от \"%s\"..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, fuzzy, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...импортиран ключ %s от файл с публични ключове за \"%s\""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, fuzzy, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "невъзможен импорт на файл с публични ключове от \"%s\""
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "не е намерен hdlist файл за източник \"%s\""
+
+#: ../urpm/media.pm:1612
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "добавен източник %s"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "четене на rpm файлове от [%s]"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "НнNn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1277,7 +1285,7 @@ msgstr ""
msgid "TB"
msgstr ""
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1646,11 +1654,6 @@ msgstr " -r - отпечатай версия и също така
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr ""
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1666,120 +1669,140 @@ msgstr "създаден е hdlist синтезис файл за източни
msgid "no xml-info available for medium \"%s\""
msgstr "записване на лист файл за източник \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "няма пакет наречен %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Следните пакети съдържат %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Пакета(тите) вече са инсталирани"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Пакета(тите) вече са инсталирани"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Пакета(тите) вече са инсталирани"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "поради липсващ %s"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "Пакета(тите) вече са инсталирани"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "поради неопределен %s"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, fuzzy, c-format
msgid "trying to promote %s"
msgstr "опит за избор на %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, fuzzy, c-format
msgid "in order to keep %s"
msgstr "за да се запази %s"
#: ../urpm/select.pm:607
+#, fuzzy, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Следните пакети трябва да бъдат премахнати,за да могат други да бъдат "
+"обновени:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Следните пакети трябва да бъдат премахнати,за да могат други да бъдат "
+"обновени:\n"
+"%s"
+
+#: ../urpm/select.pm:635
#, c-format
msgid "in order to install %s"
msgstr "за да се инсталира %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "поради конфликт с %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Невалиден подпис (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Невалиден идентификатор на ключ (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Липсващ подпис (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
# Another meaning of the word is in the sense "The iron is good medium for the eletricity"
# in this case must be "проводник"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "невъзможно е да се запише файл [%s]"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "Неуспешно влизане"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "Неуспешно влизане"
@@ -1822,7 +1845,7 @@ msgstr ""
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --summary - отпечатва резюме за тага: summary.\n"
@@ -1851,7 +1874,7 @@ msgstr ""
" --use-distrib - автоматична конфигурация на urpmi от дървото, полезна\n"
" за (де)инсталация на chroot при --root опция.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - показва всички съобщения\n"
@@ -1921,7 +1944,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "изтриване на пакет %s"
msgstr[1] "изтриване на пакет %s"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (Д/н) "
@@ -2160,140 +2183,142 @@ msgstr " --url - отпечатва url тага: url.\n"
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - отпечатва описание на тага: description."
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr ""
+" --conflicts - отпечатва конфликтите на тага: всички конфликти "
+"(множество редове)."
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr ""
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr ""
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - избиране на всички съвпадения на командния ред.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -v - показва всички съобщения\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --verbose - показва всички съобщения\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, fuzzy, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr "Групата вече съществува,моля изберете друго име"
-#: ../urpmi:253
+#: ../urpmi:254
#, fuzzy, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Грешка при създаване на директория %s"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "(за обновяване)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "(за обновяване)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "(към инсталация)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "(към инсталация)"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2301,12 +2326,12 @@ msgid ""
msgstr ""
"За да се запазят зависимостите,тези пакети ще бъдат деинсталирани (%d МБ)"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Какъв е вашият избор? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2314,7 +2339,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2322,19 +2347,19 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Продължение въпреки всичко ?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (Д/н) "
-#: ../urpmi:524
+#: ../urpmi:512
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2344,7 +2369,7 @@ msgstr ""
"%s\n"
"Продължение?"
-#: ../urpmi:525
+#: ../urpmi:513
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2354,14 +2379,14 @@ msgstr ""
"%s\n"
"Продължение?"
-#: ../urpmi:542
+#: ../urpmi:530
#, fuzzy, c-format
msgid "removing package %s will break your system"
msgstr ""
"Премахването на тези пакети би разбило системата ви, съжалявам:\n"
"\n"
-#: ../urpmi:551
+#: ../urpmi:538
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2372,7 +2397,7 @@ msgstr ""
"трябва да бъдат премахнати за да бъдат обновени други\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2383,32 +2408,12 @@ msgstr ""
"трябва да бъдат премахнати за да бъдат обновени други\n"
"%s\n"
-#: ../urpmi:560
-#, fuzzy, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Следните пакети трябва да бъдат премахнати,за да могат други да бъдат "
-"обновени:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Следните пакети трябва да бъдат премахнати,за да могат други да бъдат "
-"обновени:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2416,7 +2421,7 @@ msgid ""
"%s\n"
msgstr "Трябва да сте root за да ползвате тази команда ! \n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
@@ -2425,39 +2430,39 @@ msgstr[0] ""
msgstr[1] ""
"За да се запазят зависимостите,тези пакети ще бъдат деинсталирани (%d МБ)"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Отказ"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Натиснете Enter,когато сте готови..."
@@ -3185,6 +3190,14 @@ msgid "No changelog found\n"
msgstr "Не е намерен changelog\n"
#, fuzzy
+#~ msgid "examining %s file"
+#~ msgstr "проверка на MD5SUM файл"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "намерен тестван hdlist (или synthesis) като %s"
+
+#, fuzzy
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - обновява само източници на обновяване.\n"
diff --git a/po/bn.po b/po/bn.po
index 516015c3..f9ab0449 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+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"
@@ -44,7 +44,7 @@ msgstr "আরপিএম ইনস্টলেশন"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "ঠিক আছে (_ঠ)"
@@ -110,7 +110,7 @@ msgstr "_ইনস্টল"
msgid "_Save"
msgstr "_সংরক্ষণ"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "বাতিল (_ত)"
@@ -141,9 +141,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - এই সাহায্যকারী বার্তাটি ছাপাও।\n"
@@ -177,17 +176,17 @@ msgstr ""
" --verify-rpm - ইনস্টলের আগে rpm স্বাক্ষর যাচাই করো\n"
" (--no-verify-rpm অকার্যকর করবে, স্বাভাবিকভাবে কার্যকর).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - শুধুমাত্র প্রদত্ত মাধ্যম ব্যবহার করো, কমা দিয়ে ভাগ করা।\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - প্যাকেজ খোঁজ করতে অনুমতি দাও।\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - প্যাকেজ খোঁজার জন্য প্রদত্তের মধ্যে খোঁজ করবে না।\n"
@@ -227,7 +226,22 @@ msgstr "অনুগ্রহ করে অপেক্ষা করুন..."
msgid "Must be root"
msgstr "অবশ্যই root হতে হবে"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "বিতরণ করা হচ্ছে %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "প্যাকেজ ইনস্টলেশন..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "প্যাকেজ ইনস্টলেশন..."
+
+#: ../gurpmi2:111
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -243,37 +257,37 @@ msgstr ""
msgid "Warning"
msgstr "নোটিশ"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "ঠিক আছে"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (আপগ্রেডের জন্য)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (ইনস্টলের জন্য)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "নিম্নলিখিত প্যাকেজসমুহের মধ্যে একটির প্রয়োজন আছে:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_বাতিল"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -284,14 +298,14 @@ msgstr ""
"%s\n"
"এগিয়ে যাবো?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
"নিম্নলিখিত প্যাকেজগুলি ইনস্টল হতে যাচ্ছে, ডিপেন্ডেন্সিদের সন্তুষ্ট করতে (%d এমবি)"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -299,49 +313,44 @@ msgstr ""
"ডিপেন্ডেন্সি সন্তুষ্ট করতে নিম্নলিখিত %d প্যাকেজগুলো ইনস্টল হতে যাচ্ছে:\n"
"%s\n"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, fuzzy, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "%d প্যাকেজ সমূহ"
msgstr[1] "%d প্যাকেজ সমূহ"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "প্যাকেজ ইনস্টলেশন..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "সোর্স প্যাকেজ গুলি পাওয়া যায়নি, থামানো হচ্ছে"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "প্রস্তুত করা হচ্ছে..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "`%s' প্যাকেজ ইনস্টল করা হচ্ছে (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "অনুগ্রহ করে \"%s\" নামের মাধ্যম [%s] নামের ডিভাইসে প্রবেশ করান"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "`%s' প্যাকেজ ডাউনলোড করা হচ্ছে..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_সম্পন্ন"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -352,28 +361,28 @@ msgstr ""
"%s\n"
"আপনি হয়তো আপনার urpmi ডাটাবেস আপডেট করতে চাইবেন"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "ইনস্টলেশন ব্যর্থ"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "সবকিছু আগে থেকেই ইনস্টল করা আছে"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "ইনস্টলেশন প্রক্রিয়া সম্পূর্ণ হয়েছে"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "%s সরানো হচ্ছে"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "urpmi আবার শুরু করা হচ্ছে"
@@ -412,7 +421,7 @@ msgstr " %s ডিফল্ট।\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -g - নাম সহ গ্রুপ প্রিন্ট করো।\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "শুধুমাত্র superuser-এর প্যাকেজ ইনস্টল করার ক্ষমতা আছে"
@@ -422,134 +431,143 @@ msgstr "শুধুমাত্র superuser-এর প্যাকেজ ই
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "ত্রুটি রিপোর্টের জন্য [%s] ডিরেক্টরি তৈরি করতে অক্ষম"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "`%s' প্যাকেজ ডাউনলোড করা হচ্ছে..."
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "%s-এর ওপর সুনির্দিষ্ট পরিবেশ ব্যবহার করো\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "rpmdb খুলতে অক্ষম"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "অবৈধ rpm ফাইল নাম [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "rpm ফাইল [%s] আনা হচ্ছে..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...আনা হয়ে গেছে"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...আনতে ব্যর্থ হয়েছি: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "rpm ফাইল [%s] ব্যবহার করা যাচ্ছে না"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "\"%s\"-এর পরিচয় [%s] ফাইলে দেয়া সম্ভব হয়নি"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "আরপিএম ফাইল রেজিস্টার করতে অক্ষম"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "স্থানীয় প্যাকেজসমূহ রেজিস্টার করতে সমস্যা হয়েছে"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "কমান্ড লাইনের ওপর বাজে প্রক্সি ঘোষণা\n"
-#: ../urpm/args.pm:298
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: \"%s\" rpm ফাইল পড়া যাচ্ছেনা\n"
-#: ../urpm/args.pm:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "(%s) স্বাক্ষর পাওয়া যাচ্ছে না"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "কপি করতে ব্যর্থ"
@@ -596,122 +614,122 @@ msgstr ""
msgid "unable to write config file [%s]"
msgstr "কনফিগ ফাইল [%s]-এ লেখা সম্ভব হয়নি"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr ""
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr ""
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "ব্যবহারকারীর নাম:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "পাসওয়ার্ড:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr ""
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr ""
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, fuzzy, c-format
msgid "copy failed"
msgstr "কপি করতে ব্যর্থ"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, fuzzy, c-format
msgid "wget is missing\n"
msgstr "%s অনুপস্থিতির কারনে"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, fuzzy, c-format
msgid "curl is missing\n"
msgstr "%s অনুপস্থিতির কারনে"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr ""
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr ""
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr ""
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr ""
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr ""
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "%s অনুপস্থিতির কারনে"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr ""
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, fuzzy, c-format
msgid "retrieving %s"
msgstr "%s সরানো হচ্ছে"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...আনতে ব্যর্থ হয়েছি: %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "অজানা প্রোটোকল নির্ধারনের জন্য %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr ""
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "কোন webfetch পাওয়া যায়নি, সমর্থিত webfetch সমূহ হচ্ছে: %s\n"
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "%s প্রোটকল নিয়ন্ত্রন করা সম্ভব হয়নি"
@@ -731,59 +749,59 @@ msgstr "প্যাকেজ %s পাওয়া যায়নি।"
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "rpm ফাইল আনা হচ্ছে \"%s\" মাধ্যম থেকে..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
"%s-এ ইনস্টল করার জন্য লেনদেন প্রস্তুত করা হচ্ছে (সরাও=%d, ইনস্টল=%d, আপগ্রেড=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "লেনদেন তৈরিতে অক্ষম"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "%s প্যাকেজ সরানো গেলনা"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "%s প্যাকেজ ইনস্টল করা যায়নি"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "%s ইনস্টল করা হচ্ছে %s থেকে"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "...আনতে ব্যর্থ হয়েছি: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "%s প্যকেজ সরানো হচ্ছে"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "%s প্যকেজ সরানো হচ্ছে"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "%s ইনস্টল করা হচ্ছে %s থেকে"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "%s প্যাকেজের আরও তথ্য"
@@ -828,90 +846,80 @@ msgstr "নোটিশ"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "ইনস্টলেশন ব্যর্থ"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "ইনস্টলেশন ব্যর্থ"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "নিম্নের প্যাকেজগুলিতে বাজে স্বাক্ষর রয়েছে"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "নিম্নের প্যাকেজগুলিতে বাজে স্বাক্ষর রয়েছে"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "আপনি কি ইনস্টলেশন চলিয়ে যেতে চাচ্ছেন ?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "%s ইনস্টল করা হচ্ছে %s থেকে"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "বিতরণ করা হচ্ছে %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "%s ইনস্টল করা হচ্ছে %s থেকে"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "%s ইনস্টল করা হচ্ছে"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "ডিপেন্ডেন্সিসমুহ পরীক্ষা না করে ইনস্টলেশনের চেষ্টা করবো? (y/N)"
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "আরও জোরালোভাবে ইনস্টলের চেষ্টার করবো (--force)? (y/N)"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "ইনস্টলেশন সম্ভব"
#: ../urpm/md5sum.pm:26
-#, fuzzy, c-format
-msgid "examining %s file"
-msgstr "MD5SUM ফাইল পরীক্ষা করা হচ্ছে"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "সাবধান বাণী: MD5SUM ফাইলে %s এর md5sum অনুপস্হিত"
@@ -986,229 +994,229 @@ msgstr "%s প্যাকেজ আপগ্রেড করার বদলে
msgid "medium \"%s\" already exists"
msgstr "মাধ্যম \"%s\" আগে থেকেই আছে"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "\"%s\" মাধ্যম থেকে হেডার পড়া হচ্ছে"
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "\"%s\" মাধ্যম সরানো হচ্ছে"
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr ""
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "rpmdb খুলতে অক্ষম"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"প্রথম ইনস্টলেশন মাধ্যম ব্যবহার করা যাচ্ছে নাহ্ (কোন hdlists ফাইল পাওয়া যায়নি)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "hdlists ফাইল আনা হচ্ছে..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "অনুপস্হিত মাধ্যম \"%s\" নির্বাচন করার চেষ্টা করছি"
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "একাধিক মিডিয়া নির্বাচন করা হচ্ছে: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "\"%s\" মাধ্যম সরানো হচ্ছে"
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "\"%s\" মাধ্যমকে urpmi এর জন্য পুনরায় কনফিগার করা হচ্ছে"
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...পুনরায় কনফিগারেশন করতে ব্যর্থ"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "পুনরায় কনফিগারেশন সমপন্ন"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "মাধ্যম \"%s\" নির্বাচিত হয়নি"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "synthesis ফাইল [%s] পরীক্ষা করা হচ্ছে"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "\"%s\" মাধ্যমের synthesis ফাইল পড়তে সমস্যা হয়েছে"
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "\"%s\"-এর তালিকা ফাইল লিখছি..."
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...কপি করতে ব্যর্থ"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "\"%s\"-এর বিবরণ ফাইল কপি করা হচ্ছে..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...কপি করা সম্পন্ন"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "[%s]-এর কপি ব্যর্থ হয়েছে (ফাইলটি অস্বাভাবিক ছোট)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "উদ্ধারকৃত সোর্স hdlist (অথবা synthesis)-এর md5sum হিসেব করা হচ্ছে"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "[%s]-এর কপি ব্যর্থ হয়েছে (md5sum মেলেনি)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "hdlist ফাইল [%s] পরীক্ষা করা হচ্ছে"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "%s ইনস্টল করা হচ্ছে %s থেকে"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "\"%s\" মাধ্যমের জন্য কোন hdlist ফাইল পাওয়া যায়নি"
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "\"%s\"-এর বিবরণ ফাইল কপি করা হচ্ছে..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "অবৈধ rpm ফাইল নাম [%s]"
-#: ../urpm/media.pm:1461
-#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "\"%s\"-এর hdlist (বা synthesis) সোর্স আনা হচ্ছে..."
-
-#: ../urpm/media.pm:1478
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "আরম্ভ করা hdlist (বা synthesis) %s রূপে পাওয়া গিয়েছে"
+msgid "no metadata found for medium \"%s\""
+msgstr "\"%s\" মাধ্যমের জন্য কোন hdlist ফাইল পাওয়া যায়নি"
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "\"%s\" মাধ্যমের জন্য কোন hdlist ফাইল পাওয়া যায়নি"
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "\"%s\"-এর hdlist (বা synthesis) সোর্স আনা হচ্ছে..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "\"%s\"-এর pubkey পরীক্ষা করছি..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...\"%s\"-এর pubkey থেকে %s কী ইমপোর্ট করা হয়েছে"
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "\"%s\"-এর pubkey ইমপোর্ট করা যায়নি"
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "\"%s\" মাধ্যমের জন্য কোন hdlist ফাইল পাওয়া যায়নি"
+
+#: ../urpm/media.pm:1612
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "মাধ্যম %s যোগ করা হয়েছে"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "[%s] থেকে আর-পি-এম ফাইল পড়া হচ্ছে"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nnন"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1279,7 +1287,7 @@ msgstr ""
msgid "TB"
msgstr ""
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1635,11 +1643,6 @@ msgstr " -f - ভার্সন, প্রকাশ এবং আ
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "%s-এর ওপর সুনির্দিষ্ট পরিবেশ ব্যবহার করো\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1655,118 +1658,136 @@ msgstr "\"%s\" মাধ্যমের জন্য hdlist synthesis ফাই
msgid "no xml-info available for medium \"%s\""
msgstr "\"%s\"-এর তালিকা ফাইল লিখছি..."
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "%s নামের কোন প্যাকেজ নেই"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "এই প্যাকেজগুলিতে রয়েছে %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "সবকিছু আগে থেকেই ইনস্টল করা আছে"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "সবকিছু আগে থেকেই ইনস্টল করা আছে"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "সবকিছু আগে থেকেই ইনস্টল করা আছে"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "%s অনুপস্থিতির কারনে"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "সবকিছু আগে থেকেই ইনস্টল করা আছে"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "%s অসন্তুষ্টির কারনে"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "%s প্রোমট করার চেষ্টা করছি"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "%s রাখার জন্য"
#: ../urpm/select.pm:607
+#, fuzzy, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"নিম্নলিখিত প্যাকেজগুলি অবশ্যই সরাতে হবে অন্যগুলি আপগ্রেড করার জন্য:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"নিম্নলিখিত প্যাকেজগুলি অবশ্যই সরাতে হবে অন্যগুলি আপগ্রেড করার জন্য:\n"
+"%s"
+
+#: ../urpm/select.pm:635
#, c-format
msgid "in order to install %s"
msgstr "%s ইনস্টলের জন্য"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "%s-এর সাথে সংঘাতের কারনে"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "অবৈধ স্বাক্ষর (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "অবৈধ কী পরিচয় (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "(%s) স্বাক্ষর পাওয়া যাচ্ছে না"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "ফাইল [%s]-এ লেখা সম্ভব হয়নি"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "কপি করতে ব্যর্থ"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "কপি করতে ব্যর্থ"
@@ -1807,7 +1828,7 @@ msgstr " --test - সরানোটি সঠিকভাবে সম
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - এলিয়াসের মেশিনসমূহের মধ্যে বিতরণকৃত urpmi\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - packager: packager ট্যাগ ছাপাও।\n"
@@ -1836,7 +1857,7 @@ msgstr ""
" --use-distrib - distrib ট্রি থেকে চলন্ত অবস্থায় urpmi কনফিগার করো, --root\n"
" অপশনের সাথে croot (আন)ইনস্টলে কার্যকর।\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - verbose মোড।\n"
@@ -1900,7 +1921,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "%s প্যকেজ সরানো হচ্ছে"
msgstr[1] "%s প্যকেজ সরানো হচ্ছে"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr "(y/N) "
@@ -2160,17 +2181,22 @@ msgstr " --url - url: url ট্যাগ ছাপাও।\n"
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --epoch - description: description ট্যাগ ছাপাও।\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - all conflicts: conflicts ট্যাগ ছাপাও।\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - যেসব প্যাকেজসমুহ ইনস্টলেশনের বাদ দেয়া উচিত\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, fuzzy, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --skip - যেসব প্যাকেজসমুহ ইনস্টলেশনের বাদ দেয়া উচিত\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2179,70 +2205,70 @@ msgstr ""
" --more-choices - যখন কয়েকটি প্যাকেজ পাওয়া যাবে, ডিফল্টের\n"
" অধিক প্রস্তাব করবে\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - ক্যাশ এ ব্যবহৃত নয় এমন আর-পি-এম রাখো।\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - শুধুমাত্র একই আরকিটেক্চারের প্যাকেজসমুহকে আপগ্রেড করো।\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - কমান্ড লাইনের সমস্ত মিল নির্বাচন করো।\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - নির্বিকার ভাবে।\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --verbose - verbose মোড।\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " ইনস্টলের জন্য কমান্ডলাইনে প্রদত্ত নাম অথবা আরপিএম।\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "--install-src ব্যবহারের সময় বায়নারি rpm ফাইলগুলির সাথে কি করা যেতে পারে"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2251,17 +2277,12 @@ msgstr ""
"ডিরেক্টরি [%s] আগে থেকেই উপস্থিত, ত্রুটি রিপোর্টের জন্য অনুগ্রহ করে অন্য ডিরেক্টরি "
"ব্যবহার করুন বা এটা মুছে ফেলুন"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "ত্রুটি রিপোর্টের জন্য [%s] ডিরেক্টরি তৈরি করতে অক্ষম"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2270,48 +2291,48 @@ msgstr ""
"সমস্যা: %s শুধুমাত্র পড়ার জন্য মাউন্ট করা মনে হচ্ছে।\n"
"বলপুর্বক কাজের জন্য --allow-force ব্যবহার করুন।"
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (আপগ্রেডের জন্য)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (আপগ্রেডের জন্য)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (ইনস্টলের জন্য)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (ইনস্টলের জন্য)"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "ডিপেন্ডেন্সি সন্তুষ্ট করতে, নিম্নলিখিত %d প্যাকেজগুলো সরানো হবে (%d এমবি)"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "আপনার পছন্দ কি? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2322,7 +2343,7 @@ msgstr ""
"সংস্করণের উপর নির্ভরশীল যার নতুন সংস্করণ ইনস্টল করা আছে:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2333,19 +2354,19 @@ msgstr ""
"সংস্করণের উপর নির্ভরশীল যার নতুন সংস্করণ ইনস্টল করা আছে:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "অগ্রসর হবে?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr "(Y/n)"
-#: ../urpmi:524
+#: ../urpmi:512
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2354,7 +2375,7 @@ msgstr ""
"আবেদনকৃত কিছু প্যাকেজ ইনস্টল করা যায়নি:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2363,12 +2384,12 @@ msgstr ""
"আবেদনকৃত কিছু প্যাকেজ ইনস্টল করা যায়নি:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "%s প্যাকেজ সরালে আপনার সিস্টেমের সমস্যা হবে"
-#: ../urpmi:551
+#: ../urpmi:538
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2379,7 +2400,7 @@ msgstr ""
"আপগ্রেড করার জন্য:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2390,30 +2411,12 @@ msgstr ""
"আপগ্রেড করার জন্য:\n"
"%s\n"
-#: ../urpmi:560
-#, fuzzy, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"নিম্নলিখিত প্যাকেজগুলি অবশ্যই সরাতে হবে অন্যগুলি আপগ্রেড করার জন্য:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"নিম্নলিখিত প্যাকেজগুলি অবশ্যই সরাতে হবে অন্যগুলি আপগ্রেড করার জন্য:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2423,46 +2426,46 @@ msgstr ""
"নিম্নলিখিত ডিপেন্ডেন্সিসমূহ ইনস্টল করার জন্য আপনাকে রুট হতে হবে:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "ডিপেন্ডেন্সি সন্তুষ্ট করতে, নিম্নলিখিত %d প্যাকেজগুলো সরানো হবে (%d এমবি)"
msgstr[1] "ডিপেন্ডেন্সি সন্তুষ্ট করতে, নিম্নলিখিত %d প্যাকেজগুলো সরানো হবে (%d এমবি)"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "বাতিল"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "প্রস্তুত হলে Enter চাপুন..."
@@ -3197,6 +3200,14 @@ msgstr ""
msgid "No changelog found\n"
msgstr "changelog পাওয়া যায়নি\n"
+#, fuzzy
+#~ msgid "examining %s file"
+#~ msgstr "MD5SUM ফাইল পরীক্ষা করা হচ্ছে"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "আরম্ভ করা hdlist (বা synthesis) %s রূপে পাওয়া গিয়েছে"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - একটি আপডেট মাধ্যম তৈরী করো।\n"
diff --git a/po/br.po b/po/br.po
index d8d54af6..5ae0c81e 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2008-03-17 17:50+0100\n"
"Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n"
"Language-Team: Breton <LL@li.org>\n"
@@ -25,7 +25,7 @@ msgstr "Staliadur ar RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Fazi : n'hell ket bet kavet ar restr %s, nullaet vo"
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Ya"
@@ -83,7 +83,7 @@ msgstr "_Staliañ"
msgid "_Save"
msgstr "_Enrollañ"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Nullañ"
@@ -115,9 +115,8 @@ msgstr ""
msgid "Options:"
msgstr "Dibarzhoù :"
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr ""
@@ -148,17 +147,17 @@ msgid ""
" (--no-verify-rpm disables it, default is enabled).\n"
msgstr ""
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
@@ -196,7 +195,22 @@ msgstr "Gortozit mar plij ..."
msgid "Must be root"
msgstr "Red eo da bezañ root"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "o skignañ %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "O staliañ ar pakad ..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "O staliañ ar pakad ..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -212,37 +226,37 @@ msgstr ""
msgid "Warning"
msgstr "Diwallit"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Ya"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (da vremanaat)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (da staliañ)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Choazh ar pakad"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Unan eus ar pakadoù a-heul a zo war-nes bezañ staliet :"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Dilaoskel"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -254,61 +268,56 @@ msgstr ""
"%s\n"
"Kenderc'hel evelato ?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Ar pakad a-heul a zo war-nes bezañ staliet evit dalc'hen an ezhommoù :"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
"Ar pakadoù a-heul a zo war-nes bezañ staliet evit dalc'hen an ezhommoù :"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d pakad, %d Mo)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "O staliañ ar pakad ..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "n'hellan ket tigas ar pakadoù tarzh, emaon o terriñ"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "O prientiñ ..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "O staliañ ar pakad `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Enlakait ar medium a vez graet « %s » anezhañ"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "O tigas ar pakad « %s » ..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Graet"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -316,28 +325,28 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "Sac'het eo an staliadur :"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Staliet eo ar pakad(où) c'hoazh"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Echu eo ar staliadur"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "lemel %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "oc'h adloc'hañ urpmi"
@@ -374,7 +383,7 @@ msgstr ""
msgid " -f - output rpm full name (NVRA)\n"
msgstr ""
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Nemet ez-euz moien da staliañ pakadoù gant ar gourarveriad"
@@ -384,134 +393,143 @@ msgstr "Nemet ez-euz moien da staliañ pakadoù gant ar gourarveriad"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, c-format
msgid "fail to create directory %s"
msgstr "N'eus ket tu krouiñ ar renkell %s"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "N'eus ket tu skrivañ e renkell adpakadiñ [%s]\n"
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr ""
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "fazi en ur zigeriñ rpmdb"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "n'eo ket mat an ar restr rpm [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "o tigas ar restr rpm [%s] ..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "... echu eo ar resev"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "... sac'het eo ar resev : %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "n'eo ket possubl da voned ar restr rpm [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "n'hellan ket bet lennet ar restr spec %s [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "n'hell ket bet enskrivet ar restr rpm"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "fazi en ur enskrivañ ar pakadoù lec'hel"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr ""
-#: ../urpm/args.pm:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Mankout a ra ar sinadur (%s)"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "n'eo ket endeo renkell ar chroot"
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Fazi en ur eilañ"
@@ -558,122 +576,122 @@ msgstr ""
msgid "unable to write config file [%s]"
msgstr "n'hellan ket skrivañ restr ar c'hefluniadur [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr ""
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr ""
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Anv an arveriad :"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Tremenger :"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr ""
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr ""
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, c-format
msgid "copy failed"
msgstr "fazi en ur eilañ"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, c-format
msgid "wget is missing\n"
msgstr "mank a ra wget\n"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, c-format
msgid "curl is missing\n"
msgstr "mank a ra curl\n"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr ""
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr "mank a ra rsync\n"
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr "mank a ra ssh\n"
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr "mank a ra prozilla\n"
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr ""
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, c-format
msgid "aria2 is missing\n"
msgstr "mank a ra aria2\n"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr " %s%% a %s zo echu, ETA = %s, tizh = %s"
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr " %s%% echu, tizh = %s"
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, c-format
msgid "retrieving %s"
msgstr "o tegas %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, c-format
msgid "retrieved %s"
msgstr "%s resevet"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "dianav eo ar c'homenad spisaet evit %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr ""
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr ""
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, fuzzy, c-format
msgid "unable to handle protocol: %s"
msgstr "n'hellan ket staliañ ar pakad %s"
@@ -693,58 +711,58 @@ msgstr "ar pakad %s n'eo ket bet kavet."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "o tigas ar restroù rpm eus ar medium « %s » ..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr "[oc'h adpakadiñ]"
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "n'hell ket bet krouet ur gra"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "n'hell ket eztennet an rpm deus ar pakad delta-rpm %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "n'hellan ket staliañ ar pakad %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "o lemel pakad fall (%s) eus %s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, c-format
msgid "removing %s failed: %s"
msgstr "sac'het eo bet lemel %s : %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, c-format
msgid "Removing package %s"
msgstr "O lemel ar pakad %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "lemel pakad %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "o lemel pakadoù staliet (%s) eus %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Titouroù muioc'h diwwar-benn ar pakad %s"
@@ -789,18 +807,18 @@ msgstr "o nulaat"
msgid "%s database is locked (another program is already using it)"
msgstr "krouilhet eo stlennvon %s (ur program all zo oc'h implij anezhi)"
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Sac'het eo an staliadur"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -809,73 +827,63 @@ msgstr ""
"Sac'het eo an staliadur, fall eo pakadoù :\n"
"%s"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, c-format
msgid "The following package has bad signature"
msgstr "Bez eus sinadur fall gant ar pakadoù a-heul"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Bez eus sinadur fall gant ar pakadoù a-heul"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Fellout a ra deoc'h kenderc'hel staliañ ?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, c-format
msgid "removing installed rpms (%s)"
msgstr "o lemel pakadoù staliet (%s)"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "o skignañ %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "o staliañ %s eus %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "o staliañ %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Klask staliañ hep sell ouzh an ezhommoù ? (y/N)"
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr "Bremañaet eo ar pakadoù"
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Possubl eo an staliadur"
#: ../urpm/md5sum.pm:26
#, c-format
-msgid "examining %s file"
-msgstr "o sell ouzh ar restr %s"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
-#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr ""
@@ -946,228 +954,228 @@ msgstr "bez vefe staliet ar pakad %s e-lec'h bezañ bremañet"
msgid "medium \"%s\" already exists"
msgstr "endeo eo ar medium « %s »"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "oc'h ouzhpennañ ar vedium « %s » a-raok ar vedium « %s »"
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, c-format
msgid "adding medium \"%s\""
msgstr "oc'h ouzhpennañ ar vedium « %s »"
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr "n'eo ket endeo ar renkell %s"
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, c-format
msgid "unable to parse media.cfg"
msgstr "n'hell ket bet lennet ar restr media.cfg"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, c-format
msgid "retrieving media.cfg file..."
msgstr "o tigas ar restr media.cfg ..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, fuzzy, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "o skrivañ restr ar roll evit ar medium « %s »"
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "o tibab meur a media : %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "o lemel ar medium « %s »"
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "oc'h adkefluniañ urpmi evit ar media « %s »"
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "... sac'het eo an adkefluniadur"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "graet eo an adkefluniadur"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Fazi en ur sevel anvioù restr : n'hell ket bet kavet an ezhomm %d"
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "bremañ eo ar medium « %s » dija"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "o sell ouzh ar restr synthesis [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "fazi en ur lenn restr synthesis ar vedium « %s »"
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "oc'h eilañ [%s] evit ar medium « %s » ..."
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "... sac'het eo ar staliadur "
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "oc'h eilañ restr deskrivadur eus « %s » ..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "... graet eo an eil"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "sac'het eo eil [%s] (re vihan eo ar restr)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "o jediñ md5sum ar synthesis degaset"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "sac'het eo degas [%s] (ne glot ket ar md5sum)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, c-format
msgid "genhdlist2 failed on %s"
msgstr "sac'het eo bet genhdlist2 gant %s"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "o naetaat %s ha %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "siek eo restr hdlist %s evit ar vedium « %s »"
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "oc'h eilañ restr MD5SUM a « %s » ..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "n'eo ket mat an ar restr rpm [%s]"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
+#, fuzzy, c-format
+msgid "no metadata found for medium \"%s\""
+msgstr "n'eus restr synthesis kavet ebet evit ar medium « %s »"
+
+#: ../urpm/media.pm:1475
#, c-format
msgid "retrieving source synthesis of \"%s\"..."
msgstr "o resev synthesis tizh evit « %s » ..."
-#: ../urpm/media.pm:1478
-#, c-format
-msgid "found probed synthesis as %s"
-msgstr "kavet eo bet synthesis evel « %s »"
-
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
-#, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "n'eus restr synthesis kavet ebet evit ar medium « %s »"
-
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "o sell ouzh restr pubkey « %s » ..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "... bez e oa enporzhet an alc'hwezh %s eus restr pubkey « %s »"
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "n'hell ket bet enporzhet restr pubkey « %s »"
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "n'eus restr synthesis kavet ebet evit ar medium « %s »"
+
+#: ../urpm/media.pm:1612
#, c-format
msgid "updated medium \"%s\""
msgstr "bremañet eo bet ar medium « %s »"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr "sac'het eo bet degas [%s]"
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, c-format
msgid "getting mirror list from %s"
msgstr "o lenn roll ar melezourioù eus %s"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1238,7 +1246,7 @@ msgstr "Go"
msgid "TB"
msgstr "To"
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1593,11 +1601,6 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr ""
-
#: ../urpm/search.pm:290 ../urpmf:291
#, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1613,118 +1616,136 @@ msgstr "n'eus restr synthesis ebet evit ar medium « %s »"
msgid "no xml-info available for medium \"%s\""
msgstr "n'eus titour XML ebet evit ar medium « %s »"
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "N'eus pakad ebet ket a vez graet %s anezhañ"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "%s zo er pakadoù a-heul : %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "N'hell ket bet staliet ar pakadoù %s"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, c-format
msgid "Package %s is already installed"
msgstr "Staliet eo ar pakad %s c'hoazh"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, c-format
msgid "Packages %s are already installed"
msgstr "Staliet eo ar pakadoù %s c'hoazh"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "peogwir %s zo manket"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, c-format
msgid "due to already installed %s"
msgstr "peogwir eo staliet ar pakad %s c'hoazh"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "peogwir %s zo manket"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, fuzzy, c-format
msgid "trying to promote %s"
msgstr "N'eus pakad da zilemel ebet"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "evit mirout %s"
#: ../urpm/select.pm:607
#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Red eo lemel ar pakad-mañ a-raok staliañ ar re nevez all:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Red eo lemel ar pakadoù-mañ a-raok staliañ ar re nevez all:\n"
+"%s"
+
+#: ../urpm/select.pm:635
+#, c-format
msgid "in order to install %s"
msgstr "evit staliañ %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "peogwir %s zo manket"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "N'eo ket mat ar sinadur (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "N'eo ket mat ID an alc'hwezh (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Mankout a ra ar sinadur (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't write file"
msgstr "N'hell ket bet skrivet ar restr"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't open file"
msgstr "N'hell ket bet digoret ar restr"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, c-format
msgid "Can't move file %s to %s"
msgstr "N'hell ket bet fiñvet ar restr eus %s da %s"
@@ -1766,7 +1787,7 @@ msgstr ""
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --adpakadiñ - Adpakadiñ ar restroù a-raok lemel anezho\n"
@@ -1793,7 +1814,7 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr ""
@@ -1854,7 +1875,7 @@ msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "Lemel %d pakad ?"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (y/N)"
@@ -2088,140 +2109,140 @@ msgstr ""
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr ""
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --buildtime - amzer ar sevel\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr ""
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr ""
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
-#: ../urpmi:151
+#: ../urpmi:152
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --buildtime - amzer ar sevel\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, c-format
msgid " --debug - very verbose mode.\n"
msgstr ""
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr ""
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "N'hell ket bet krouer ar renkell [%s] evit reiñ da c'houzout ur gudenn"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s : %s (evit bremanaat)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (evit bremanaat)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s : %s (evit staliañ)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (evit staliañ)"
-#: ../urpmi:462
+#: ../urpmi:450
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2230,12 +2251,12 @@ msgstr ""
"Unan eus ar pakadoù a-heul a zo ret bezañ staliet evit dalc'hen an ezhomm « %"
"s » :"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Petra eo ho choazh ? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2243,7 +2264,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2251,7 +2272,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2260,12 +2281,12 @@ msgstr ""
"\n"
"Kenderc'hel evelato ?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (Y/n)"
-#: ../urpmi:524
+#: ../urpmi:512
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2274,7 +2295,7 @@ msgstr ""
"Ne m'eus ket gallet staliañ ur pakad goulennet :\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2283,12 +2304,12 @@ msgstr ""
"Ne m'eus ket gallet staliañ un darn pakad goulennet :\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "sac'het e vo ho reizhiad ma eo lemelet ar pakad %s"
-#: ../urpmi:551
+#: ../urpmi:538
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2296,7 +2317,7 @@ msgid ""
"%s\n"
msgstr "Red eo da lemel ar pakadoù-mañ"
-#: ../urpmi:553
+#: ../urpmi:540
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2304,30 +2325,12 @@ msgid ""
"%s\n"
msgstr "Red eo da lemel ar pakadoù-mañ"
-#: ../urpmi:560
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Red eo lemel ar pakad-mañ a-raok staliañ ar re nevez all:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Red eo lemel ar pakadoù-mañ a-raok staliañ ar re nevez all:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:583
+#: ../urpmi:568
#, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2335,45 +2338,45 @@ msgid ""
"%s\n"
msgstr ""
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] ""
"Ar %d pakad a-heul a zo war-nes bezañ distaliet evit dalc'hen an ezhommoù :"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr "%s egor pladenn ouzphenn a vo bet implijet."
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr "%s egor pladenn a vo bet dieubet."
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr "%s a bakad a vo bet degaset."
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
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:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Nullañ"
-#: ../urpmi:648
+#: ../urpmi:633
#, c-format
msgid "Press Enter when mounted..."
msgstr "Gwaskit « enkas » pa eo prest ar vedium ..."
@@ -3072,6 +3075,12 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Changelog kavet ebet\n"
+#~ msgid "examining %s file"
+#~ msgstr "o sell ouzh ar restr %s"
+
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "kavet eo bet synthesis evel « %s »"
+
#~ msgid "malformed URL: [%s]"
#~ msgstr "URL siek : [%s]"
diff --git a/po/bs.po b/po/bs.po
index 6aa09531..54f0043b 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+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"
@@ -32,7 +32,7 @@ msgstr "RPM instalacija"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Greška: ne mogu naći datoteku %s, prekidam operaciju"
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_U redu"
@@ -98,7 +98,7 @@ msgstr "_Instaliraj"
msgid "_Save"
msgstr "_Snimi"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Odustani"
@@ -129,9 +129,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - ispiši ovu poruku.\n"
@@ -168,18 +167,18 @@ msgstr ""
" --verify-rpm - provjeri potpis rpm-a prije instalacije\n"
" (--no-verify-rpm isključuje, normalno je uključeno).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - koristi samo navedene medije, razdvojene zarezom.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - uključi pretragu 'provides' taga radi nalaženja paketa.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - ne pretražuj 'provides' pri traženju paketa.\n"
@@ -218,7 +217,22 @@ msgstr "Molim sačekajte..."
msgid "Must be root"
msgstr "Morate biti root"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "distribuiram %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Instalacija paketa..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Instalacija paketa..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -234,37 +248,37 @@ msgstr ""
msgid "Warning"
msgstr "Upozorenje"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "U redu"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (za ažuriranje)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (za instalaciju)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Izbor paketa"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Jedan od sljedećih paketa je potreban:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Prekini"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -275,19 +289,19 @@ msgstr ""
"%s\n"
"Da nastavim?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Da bih zadovoljio ovisnosti, instaliraću sljedeći paket"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Da bih zadovoljio ovisnosti, instaliraću sljedeće pakete"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, fuzzy, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
@@ -295,42 +309,37 @@ msgstr[0] "(%d paketa, %d MB)"
msgstr[1] "(%d paketa, %d MB)"
msgstr[2] "(%d paketa, %d MB)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Instalacija paketa..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "ne mogu dobiti izvorne pakete, prekidam"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Pripremam..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Instaliram paket `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Molim ubacite medij sa imenom \"%s\" u uređaj [%s]"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Downloadujem paket `%s'..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Gotovo"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -341,28 +350,28 @@ msgstr ""
"%s\n"
"Možda ćete trebati osvježiti vašu urpmi bazu podataka"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "Instalacija nije uspjela:"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "sve je već instalirano"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Instalacija završena"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "uklanjam %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "restartujem urpmi"
@@ -401,7 +410,7 @@ msgstr " podrazumijeva se %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -g - ispiši grupe sa imenom.\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Samo administrator (root) može instalirati pakete"
@@ -411,134 +420,143 @@ msgstr "Samo administrator (root) može instalirati pakete"
msgid "Running urpmi in restricted mode..."
msgstr "Pokrećem urpmi u ograničenom režimu..."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "Ne mogu pisati u direktorij za prepakiranje [%s]\n"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, fuzzy, c-format
msgid "invalid owner for directory %s"
msgstr "Neispravan datum ili trajanje [%s]\n"
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "Ne mogu pisati u direktorij za prepakiranje [%s]\n"
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr "Direktorij okruženja %s ne postoji"
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "koristim navedenu okolinu na %s\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "ne mogu otvoriti rpmdb"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "neispravno ime rpm datoteke [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "dobavljam rpm datoteku [%s] ..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...download završen"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...dobavljanje nije uspjelo: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "ne mogu pristupiti rpm datoteci [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "ne mogu obraditi spec datoteku %s [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "ne mogu registrovati rpm datoteku"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Nekompatibilna arhitektura za paket [%s]"
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "greška pri registrovanju lokalnih paketa"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
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:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "pogrešna deklaracija proxy-ja na komandnoj liniji\n"
-#: ../urpm/args.pm:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, fuzzy, c-format
msgid "unexpected expression %s"
msgstr "Izrazi za uzorke:\n"
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Nedostaje potpis (%s)"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, fuzzy, c-format
msgid "no expression to close"
msgstr "Izrazi za uzorke:\n"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, fuzzy, c-format
msgid "chroot directory doesn't exist"
msgstr "Direktorij okruženja %s ne postoji"
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr "Previše argumenata\n"
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Kopiranje nije uspjelo"
@@ -585,122 +603,122 @@ msgstr ""
msgid "unable to write config file [%s]"
msgstr "ne mogu da zapišem konf. datoteku [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "%s nije dostupan, prelazim na %s"
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Molim unesite vaše podatke radi pristupa proxy serveru\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Korisničko ime:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Šifra:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr ""
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr ""
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, fuzzy, c-format
msgid "copy failed"
msgstr "Kopiranje nije uspjelo"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, fuzzy, c-format
msgid "wget is missing\n"
msgstr "zbog nedostajućeg %s"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, fuzzy, c-format
msgid "curl is missing\n"
msgstr "zbog nedostajućeg %s"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr ""
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr ""
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr ""
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr ""
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr ""
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "zbog nedostajućeg %s"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr ""
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, fuzzy, c-format
msgid "retrieving %s"
msgstr "uklanjam %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...dobavljanje nije uspjelo: %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "nepoznat protokol je definisan za %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "%s nije dostupan, prelazim na %s"
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, 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:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "ne mogu rukovati protokolom: %s"
@@ -720,12 +738,12 @@ msgstr "paket %s nije pronađen"
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "dobavljam rpm datoteke za medij \"%s\"..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr "[prepakujem]"
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -733,47 +751,47 @@ msgstr ""
"napravio transakciju za instaliranje na %s (ukloni=%d, instaliraj=%d, "
"unaprijedi=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "ne mogu napraviti transakciju"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "ne mogu ekstraktovati rpm iz delta-rpm paketa %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "ne mogu instalirati paket %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "instaliram %s iz %s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "...dobavljanje nije uspjelo: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "uklanjam paket %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "uklanjam paket %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "instaliram %s iz %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Više informacija o paketu %s"
@@ -818,90 +836,80 @@ msgstr "Upozorenje"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Instalacija nije uspjela"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Instalacija nije uspjela na čvoru %s"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Sljedeći paketi imaju neispravne potpise"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Sljedeći paketi imaju neispravne potpise"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Želite li nastaviti instalaciju ?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "instaliram %s iz %s"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "distribuiram %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "instaliram %s iz %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "instaliram %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Da pokušam instalaciju bez provjere ovisnosti? (d/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Pokušaj instalaciju još jače (--force opcija)? (d/N) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Instalacija nije moguća"
#: ../urpm/md5sum.pm:26
-#, fuzzy, c-format
-msgid "examining %s file"
-msgstr "ispitujem MD5SUM datoteku"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "pažnja: md5 suma za %s nije dostupna u datoteci MD5SUM"
@@ -975,230 +983,230 @@ msgstr "instaliraću umjesto unaprjeđenja paketa %s"
msgid "medium \"%s\" already exists"
msgstr "medij \"%s\" već postoji"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "dobavljam zaglavlja sa medija \"%s\""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "uklanjam medij \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, fuzzy, c-format
msgid "directory %s does not exist"
msgstr "Direktorij okruženja %s ne postoji"
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, fuzzy, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "izgleda da ovaj URL ne sadrži distrib"
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, c-format
msgid "unable to parse media.cfg"
msgstr "ne mogu obraditi media.cfg"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"ne mogu pristupiti prvom instalacionom mediju (nije pronađena hdlist "
"datoteka)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, c-format
msgid "retrieving media.cfg file..."
msgstr "skidam media.cfg datoteku..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "ne mogu izabrati nepostojeći medij \"%s\""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "biram više medija: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "uklanjam medij \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "rekonfigurišem uprmi za medij \"%s\""
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...rekonfiguracija nije uspjela"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "rekonfiguracija završena"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Greška pri pravljenju names datoteke: zavisnost %d nedostaje"
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "medij \"%s\" nije izabran"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "ispitujem synthesis datoteku [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problem pri čitanju synthesis datoteke za medij \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "ispisujem list datoteku za medij \"%s\""
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...kopiranje nije uspjelo"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopiram opisnu datoteku za \"%s\"..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...kopiranje završeno"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopiranje [%s] nije uspjelo (datoteka je sumnjivo mala)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "izračunavam md5sum za dobavljeni hdlist (ili synthesis)"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "kopiranje [%s] nije uspjelo (md5sum se ne poklapa)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "ispitujem hdlist datoteku [%s]"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "Instaliram %s na %s..."
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "kopiram opisnu datoteku za \"%s\"..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "neispravno ime rpm datoteke [%s]"
-#: ../urpm/media.pm:1461
-#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "dobavljam hdlist (ili synthesis) za \"%s\"..."
-
-#: ../urpm/media.pm:1478
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "pronašao traženi hdlist (ili synthesis) kao %s"
+msgid "no metadata found for medium \"%s\""
+msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "nije pronađena hdlist datoteka za medij \"%s\""
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "dobavljam hdlist (ili synthesis) za \"%s\"..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "istražujem pubkey datoteku za \"%s\"..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...uveo sam ključ %s iz pubkey datoteke \"%s\"-a"
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "ne mogu uvesti pubkey datoteku za \"%s\""
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "nije pronađena hdlist datoteka za medij \"%s\""
+
+#: ../urpm/media.pm:1612
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "dodao medij %s"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "čitam RPM datoteke iz [%s]"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1269,7 +1277,7 @@ msgstr ""
msgid "TB"
msgstr ""
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1630,11 +1638,6 @@ msgstr " -f - štampa verziju, izdanje i arhitekturu sa imenom.\n"
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Neispravan format: možete koristiti samo jedan viševrijednosni tag"
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "koristim navedenu okolinu na %s\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1650,118 +1653,136 @@ msgstr "izgrađena hdlist synthesis datoteka za medij \"%s\""
msgid "no xml-info available for medium \"%s\""
msgstr "ispisujem list datoteku za medij \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Nema paketa pod imenom %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Sljedeći paketi sadrže %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "sve je već instalirano"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "sve je već instalirano"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "sve je već instalirano"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "zbog nedostajućeg %s"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "sve je već instalirano"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "zbog nezadovoljenih %s"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "pokušavam promovirati %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "kako bi zadržao %s"
#: ../urpm/select.pm:607
+#, fuzzy, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Sljedeći paketi trebaju biti uklonjeni da bi drugi mogli biti nadograđeni:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Sljedeći paketi trebaju biti uklonjeni da bi drugi mogli biti nadograđeni:\n"
+"%s"
+
+#: ../urpm/select.pm:635
#, c-format
msgid "in order to install %s"
msgstr "da bih instalirao %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "zbog konflikta sa %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Neispravan potpis (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Neispravan ID ključa (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Nedostaje potpis (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "Ne mogu napraviti konf. datoteku [%s]"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "Kopiranje nije uspjelo"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "Kopiranje nije uspjelo"
@@ -1803,7 +1824,7 @@ msgstr ""
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - distribuirani urpmi preko mašina sa aliasom.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Prepakuj datoteke prije brisanja\n"
@@ -1832,7 +1853,7 @@ msgstr ""
" --use-distrib - podesi urpme u letu iz distrib stabla, korisno za\n"
" chroot de-instalacije uz korištenje --root opcije.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - rječiti mod.\n"
@@ -1900,7 +1921,7 @@ msgstr[0] "Da uklonim %d paketa?"
msgstr[1] "Da uklonim %d paketa?"
msgstr[2] "Da uklonim %d paketa?"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (d/N) "
@@ -2156,17 +2177,22 @@ msgstr " --ignorearch - dozvoli instalaciju RPMova za druge arhitekture.\n"
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - ne izvršavaj skripte u paketu\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - tagovi za konflikte\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - paketi čija instalacija treba biti preskočena\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, fuzzy, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --skip - paketi čija instalacija treba biti preskočena\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2175,43 +2201,43 @@ msgstr ""
" --more-choices - ako je pronađeno više paketa, ponudi više izbora\n"
" nego što je uobičajeno.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - ne zaključavaj RPM bazu.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - ažuriraj samo pakete sa istom arhitekturom.\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - izaberi sve pogotke na komandnoj liniji.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - tihi mod.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --verbose - rječiti mod.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
" imena ili rpm datoteke dati na komandnoj liniji će biti instalirani.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2220,28 +2246,28 @@ msgstr ""
"Greška: Da biste generisali prijavu buga, navedite uobičajene argumente i\n"
"dodajte --bug.\n"
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "Ne možete instalirati binarne RPM datoteke koristeći --install-src"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2250,17 +2276,12 @@ msgstr ""
"Direktorij [%s] već postoji, molim koristite neki drugi direktorij za "
"prijavu buga ili ga obrišite"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Ne mogu napraviti direktorij [%s] za prijavu buga"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr "Direktorij okruženja %s ne postoji"
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2269,48 +2290,48 @@ msgstr ""
"Greška: izgleda da je %s montiran samo za čitanje.\n"
"Koristite opciju --allow-force za prinudnu operaciju."
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr "Ažuriram medije...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (za ažuriranje)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (za ažuriranje)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (za instalaciju)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (za instalaciju)"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "Da bih zadovoljio ovisnosti, ukloniću sljedećih %d paketa (%d MB)"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Vaš izbor je? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2321,7 +2342,7 @@ msgstr ""
"koji su stariji od instaliranih:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2332,7 +2353,7 @@ msgstr ""
"koji su stariji od instaliranih:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2341,12 +2362,12 @@ msgstr ""
"\n"
"Svejedno nastavljate instalaciju?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (D/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2355,7 +2376,7 @@ msgstr ""
"Neki od traženih paketa se ne mogu instalirati:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2364,12 +2385,12 @@ msgstr ""
"Neki od traženih paketa se ne mogu instalirati:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "uklanjanje paketa %s će pokvariti vaš sistem"
-#: ../urpmi:551
+#: ../urpmi:538
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2380,7 +2401,7 @@ msgstr ""
"uklonjeni da bi drugi mogli biti nadograđeni:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2391,30 +2412,12 @@ msgstr ""
"uklonjeni da bi drugi mogli biti nadograđeni:\n"
"%s\n"
-#: ../urpmi:560
-#, fuzzy, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Sljedeći paketi trebaju biti uklonjeni da bi drugi mogli biti nadograđeni:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Sljedeći paketi trebaju biti uklonjeni da bi drugi mogli biti nadograđeni:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(samo testiraj, uklanjanje neće biti izvršeno)"
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2424,7 +2427,7 @@ msgstr ""
"Morate biti root da biste instalirali sljedeće ovisnosti:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
@@ -2432,27 +2435,27 @@ msgstr[0] "Da bih zadovoljio ovisnosti, ukloniću sljedećih %d paketa (%d MB)"
msgstr[1] "Da bih zadovoljio ovisnosti, ukloniću sljedećih %d paketa (%d MB)"
msgstr[2] "Da bih zadovoljio ovisnosti, ukloniću sljedećih %d paketa (%d MB)"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(samo testiraj, instalacija neće biti izvršena)"
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../urpmi:619
+#: ../urpmi:604
#, fuzzy, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2460,12 +2463,12 @@ 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:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Odustani"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Pritisnite Enter kada budete spremni..."
@@ -3213,6 +3216,14 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Nije pronađen changelog\n"
+#, fuzzy
+#~ msgid "examining %s file"
+#~ msgstr "ispitujem MD5SUM datoteku"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "pronašao traženi hdlist (ili synthesis) kao %s"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - napravi medij za unaprjeđenje.\n"
diff --git a/po/ca.po b/po/ca.po
index e007b901..9a553006 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ca\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2005-09-19 23:29+0200\n"
"Last-Translator: Albert Astals Cid <astals11@terra.es>\n"
"Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -30,7 +30,7 @@ msgstr "Instal·lació de RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_D'acord"
@@ -98,7 +98,7 @@ msgstr "_Instal·lació"
msgid "_Save"
msgstr "_Desa"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Cancel·la"
@@ -130,9 +130,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - mostra aquest missatge d'ajuda.\n"
@@ -170,21 +169,21 @@ msgstr ""
" (--no-verify-rpm la deshabilita, per defecte està "
"habilitat)\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - utilitza només les fonts donades, s'han de separar amb "
"comes.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - permet la cerca en allò que proporcionen els paquets per "
"a trobar-los.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - no busquis en 'provides' per a trobar paquets.\n"
@@ -224,7 +223,22 @@ msgstr "Si us plau, espereu..."
msgid "Must be root"
msgstr "S'ha de ser root"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "s'està distribuint %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Instal·lació de paquets..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Instal·lació de paquets..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -240,37 +254,37 @@ msgstr ""
msgid "Warning"
msgstr "Advertència"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "D'acord"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (a actualitzar)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (a instal·lar)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Cal un dels paquets següents:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Avorta"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -281,61 +295,56 @@ msgstr ""
"%s\n"
"Voleu continuar igualment?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Per complir les dependències, s'instal·lara el següent paquet:"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Per complir les dependències, s'instal·laran els paquets següents:"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d paquet, %d MB)"
msgstr[1] "(%d paquets, %d MB)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Instal·lació de paquets..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "no es poden recuperar els paquets font. S'està interrompent"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "S'està preparant..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "S'està instal·lant el paquet `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Si us plau, inseriu la font anomenada \"%s\" al dispositiu [%s]"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "S'està descarregant el paquet `%s'..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Fet"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -347,28 +356,28 @@ msgstr ""
"%s\n"
"Potser voleu actualitzar la base de dades urpmi"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "La instal·lació ha fallat:"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Ja està tot instal·lat"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Instal·lació finalitzada"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "s'està eliminant %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "s'esta reiniciant urpmi"
@@ -407,7 +416,7 @@ msgstr " el valor per defecte és %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -g - imprimeix grups amb el nom.\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "El superusuari és l'únic autoritzat per a instal·lar paquets"
@@ -417,134 +426,143 @@ msgstr "El superusuari és l'únic autoritzat per a instal·lar paquets"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "No s'ha pogut crear el directori [%s] per a l'informe d'errors"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "S'està descarregant el paquet `%s'..."
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr ""
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "no s'ha pogut obrir rpmdb"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "el nom del fitxer rpm és incorrecte [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "s'està recuperant els fitxer rpm [%s] ..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...recuperació feta"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...ha fallat la recuperació: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "no s'ha pogut accedir al fitxer rpm [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "no es pot analitzar \"%s\" en el fitxer [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "no s'ha pogut registrar el fitxer rpm"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "error registrant els paquets locals"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, 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:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Falta la signatura (%s)"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "La còpia ha fallat"
@@ -591,125 +609,125 @@ msgstr ""
msgid "unable to write config file [%s]"
msgstr "no s'ha pogut escriure el fitxer de configuració [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr ""
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr ""
"Si us plau, entreu les vostres dades per accedir al servidor intermediari\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Nom d'usuari:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Contrasenya:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr ""
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr ""
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, c-format
msgid "copy failed"
msgstr "la còpia ha fallat"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, fuzzy, c-format
msgid "wget is missing\n"
msgstr "degut a que falten %s"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, fuzzy, c-format
msgid "curl is missing\n"
msgstr "degut a que falten %s"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr ""
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr ""
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr ""
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr ""
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr ""
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "degut a que falten %s"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr ""
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, fuzzy, c-format
msgid "retrieving %s"
msgstr "s'està eliminant %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...ha fallat la recuperació: %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "el protocol definit per a %s és desconegut"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr ""
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, 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:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "incapaç de gestionar el protocol: %s"
@@ -729,12 +747,12 @@ msgstr "no s'ha trobat el paquet %s."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "s'està recuperant els fitxers rpm de la font \"%s\"..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -742,47 +760,47 @@ msgstr ""
"s'ha creat una transacció per instal·lar a %s (elimina=%d, instal·la=%d, "
"actualitza=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "no s'ha pogut crear la transacció"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "no s'ha pogut eliminar el paquet %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "no s'ha pogut instal·lar el paquet %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "s'està instal·lant %s des de %s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "...ha fallat la recuperació: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "s'està eliminant el paquet %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "s'està eliminant el paquet %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "s'està instal·lant %s des de %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Més informació en quant el paquet %s"
@@ -827,91 +845,81 @@ msgstr "Advertència"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "La instal·lació ha fallat"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "La instal·lació ha fallat:"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Els paquets següents tenen signatures incorrectes"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Els paquets següents tenen signatures incorrectes"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Voleu continuar la instal·lació ?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "s'està instal·lant %s des de %s"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "s'està distribuint %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "s'està instal·lant %s des de %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "s'està instal·lant %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr ""
"Voleu intentar la instal·lació sense comprovar les dependències? (s/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Voleu intentar la insta·lació encara amb més força (--force)? (s/N) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "La instal·lació és possible"
#: ../urpm/md5sum.pm:26
-#, fuzzy, c-format
-msgid "examining %s file"
-msgstr "s'està examinant el fitxer MD5SUM"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "atenció: l'md5sum de %s no està disponible al fitxer MD5SUM"
@@ -985,230 +993,230 @@ msgstr "instal·laria en comptes d'actualitzar el paquet %s"
msgid "medium \"%s\" already exists"
msgstr "la font \"%s\" ja existeix"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "s'estan llegint les capçaleres de la font \"%s\""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "s'està esborrant la font \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr ""
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "no s'ha pogut obrir rpmdb"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"no s'ha pogut accedir la primera font d'instal·lació (no s'ha trobat fitxer "
"hdlists)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "s'està recuperant el fitxer hdlists..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "s'ha intentant seleccionar una font inexistent \"%s\""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "s'està seleccionant múltiples fonts: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "s'està esborrant la font \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "s'està reconfigurant l'urpmi per la font \"%s\""
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "..la reconfiguració ha fallat"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "reconfiguració acabada"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "la font \"%s\" no ha estat seleccionada"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "s'està examinant el fitxer de síntesi [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "s'ha trobat un problema llegint el fitxer de síntesi de la font \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "s'està escrivint el fitxer list per la font \"%s\""
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "..la còpia ha fallat"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "s'està copiant el fitxer de descripció de \"%s\"..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...còpia feta"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "la còpia de [%s] ha fallat (el fitxer és sospitosament petit)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "s'està computant el md5sum de la font hdlist (o síntesi) recuperada"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "la còpia de [%s] ha fallat (el md5sum no concorda)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "s'està examinant el fitxer hdlist [%s]"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "s'està instal·lant %s des de %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "no s'ha trobat el fitxer hdlist per a la font \"%s\""
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "s'està copiant el fitxer de descripció de \"%s\"..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "el nom del fitxer rpm és incorrecte [%s]"
-#: ../urpm/media.pm:1461
-#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "s'està recuperant el hdlist font (o la síntesi) de \"%s\"..."
-
-#: ../urpm/media.pm:1478
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "s'ha trobat l'hdlist (o síntesi) buscat a %s"
+msgid "no metadata found for medium \"%s\""
+msgstr "no s'ha trobat el fitxer hdlist per a la font \"%s\""
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "no s'ha trobat el fitxer hdlist per a la font \"%s\""
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "s'està recuperant el hdlist font (o la síntesi) de \"%s\"..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "s'està examinant el fitxer de clau pública de \"%s\"..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...s'ha importat la clau %s del fitxer de clau pública de \"%s\""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "no s'ha pogut importat el fitxer de clau pública de \"%s\""
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "no s'ha trobat el fitxer hdlist per a la font \"%s\""
+
+#: ../urpm/media.pm:1612
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "s'ha afegit la font %s"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "s'està llegint els fitxers rpm des de [%s]"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1279,7 +1287,7 @@ msgstr ""
msgid "TB"
msgstr ""
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1650,11 +1658,6 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr ""
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1670,118 +1673,136 @@ msgstr "s'ha construït el fitxer de síntesi hdlist per a la font \"%s\""
msgid "no xml-info available for medium \"%s\""
msgstr "s'està escrivint el fitxer list per la font \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "No hi cap paquet anomenat %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Els paquets següents contenen %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Ja està tot instal·lat"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Ja està tot instal·lat"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Ja està tot instal·lat"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "degut a que falten %s"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "Ja està tot instal·lat"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "degut a %s no satisfetes"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, fuzzy, c-format
msgid "trying to promote %s"
msgstr "Res a eliminar"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "per tal de mantenir %s"
#: ../urpm/select.pm:607
#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"El paquets següent s'ha d'eliminar per poder actualitzar uns altres:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Els paquets següents s'han d'eliminar per poder actualitzar uns altres:\n"
+"%s"
+
+#: ../urpm/select.pm:635
+#, c-format
msgid "in order to install %s"
msgstr "per tal d'instal·lar %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "degut a conflictes amb %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Signatura no vàlida (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "ID de clau no vàlid (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Falta la signatura (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "no s'ha pogut escriure el fitxer [%s]"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "La còpia ha fallat"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "La còpia ha fallat"
@@ -1824,7 +1845,7 @@ msgstr " --test - verifica si l'eliminació pot ser duta a terme.\n"
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - urpmi distribuït pels ordinadors de l'àlias.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - mostra l'etiqueta packager: empaquetador.\n"
@@ -1851,7 +1872,7 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - mode detallat.\n"
@@ -1918,7 +1939,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "Elimina %d paquet?"
msgstr[1] "Elimina %d paquets?"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (s/N) "
@@ -2185,91 +2206,97 @@ msgstr " --url - mostra l'etiqueta url: url.\n"
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - mostra l'etiqueta description: descripció.\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr ""
+" --conflicts - mostra l'etiqueta conflicts: tots els conflictes.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - paquets que han de saltase en la instal·lació\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, fuzzy, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --skip - paquets que han de saltase en la instal·lació\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:146
+#: ../urpmi:147
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr ""
" --noclean - conserva els rpm que no s'utilitzen a la memòria cau.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
" -a - selecciona totes les coincidències en la línia d'ordres.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - mode silenciós.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " -verbose - mode detallat.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
" els noms o fitxers rpm subministrats en la línia d'ordres seran "
"instal·lats.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2278,65 +2305,60 @@ msgstr ""
"El directori [%s] ja existeix, si us plau usa un altre directori per "
"l'informe d'error o esborra'l"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "No s'ha pogut crear el directori [%s] per a l'informe d'errors"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (a actualitzar)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (a actualitzar)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (a instal·lar)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (a instal·lar)"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "Per a complir les dependències, s'eliminara el següent paquet"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Quina és la vostra elecció? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2344,7 +2366,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2352,19 +2374,19 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Voleu continuar igualment?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (S/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2373,7 +2395,7 @@ msgstr ""
"Alguns dels paquets demanats no es poden instal·lar:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2382,12 +2404,12 @@ msgstr ""
"Alguns dels paquets demanats no es poden instal·lar:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "eliminar el paquet %s trencarà el vostre sistema"
-#: ../urpmi:551
+#: ../urpmi:538
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2398,7 +2420,7 @@ msgstr ""
"s'ha d'eliminar per poder actualitzar uns altres:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2409,30 +2431,12 @@ msgstr ""
"s'han d'eliminar per poder actualitzar uns altres:\n"
"%s\n"
-#: ../urpmi:560
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"El paquets següent s'ha d'eliminar per poder actualitzar uns altres:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Els paquets següents s'han d'eliminar per poder actualitzar uns altres:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2442,7 +2446,7 @@ msgstr ""
"Es necessita ser 'root' per a instal·lar les següents dependències:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
@@ -2450,39 +2454,39 @@ msgstr[0] "Per a complir les dependències, s'eliminara el següent paquet"
msgstr[1] ""
"Per a complir les dependències, s'eliminaran els següents %d paquets"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../urpmi:619
+#: ../urpmi:604
#, fuzzy, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "No s'han pogut instal·lar els paquets (%s)!"
msgstr[1] "No s'han pogut instal·lar els paquets (%s)!"
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Cancel·la"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Premeu Intro quan estigui fet..."
@@ -3225,6 +3229,14 @@ msgstr ""
msgid "No changelog found\n"
msgstr "No s'ha trobat la llista de canvis\n"
+#, fuzzy
+#~ msgid "examining %s file"
+#~ msgstr "s'està examinant el fitxer MD5SUM"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "s'ha trobat l'hdlist (o síntesi) buscat a %s"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - crea una font d'actualització.\n"
diff --git a/po/cs.po b/po/cs.po
index 734b5ecc..7da17805 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: cs\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2008-09-09 00:28+0200\n"
"Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
@@ -21,7 +21,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: ../gurpmi:31 ../gurpmi2:74
#, c-format
@@ -33,7 +34,7 @@ msgstr "Instalace RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Chyba: nelze nalézt soubor %s, operace bude zrušena"
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -100,7 +101,7 @@ msgstr "_Instalovat"
msgid "_Save"
msgstr "_Uložit"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Přerušit"
@@ -132,9 +133,8 @@ msgstr ""
msgid "Options:"
msgstr "Volby:"
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - vypíše tuto nápovědu.\n"
@@ -150,13 +150,17 @@ msgstr ""
#: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - automaticky vybere balíčky pro aktualizaci systému.\n"
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - automaticky vybere balíčky pro aktualizaci systému.\n"
#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - spustí program i v případě, že některé balíčky chybí.\n"
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - spustí program i v případě, že některé balíčky chybí.\n"
#: ../gurpmi.pm:50 ../urpmi:133
#, c-format
@@ -167,17 +171,17 @@ msgstr ""
" --verify-rpm - zkontroluje před instalací podpis balíčku RPM\n"
" (volba --no-verify-rpm toto vypne, jinak povoleno).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - použít pouze uvedené zdroje, oddělené čárkou.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - pokusí se najít balíček v položkách provides.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - nehledá balíček v položkách provides.\n"
@@ -185,18 +189,21 @@ msgstr " -P - nehledá balíček v položkách provides.\n"
#: ../gurpmi.pm:55 ../urpmi:110 ../urpmq:69
#, c-format
msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - použít pro instalaci balíčků jiný kořenový adresář.\n"
+msgstr ""
+" --root - použít pro instalaci balíčků jiný kořenový adresář.\n"
#: ../gurpmi.pm:56 ../urpmi:135
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
-msgstr " --test - pouze zkontrolovat, zda lze provést instalacisprávně.\n"
+msgstr ""
+" --test - pouze zkontrolovat, zda lze provést instalacisprávně.\n"
#: ../gurpmi.pm:57 ../urpmi:76
#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
" --searchmedia - použít pouze zadané zdroje pro vyhledávání požadovaných "
"balíčků.\n"
@@ -216,7 +223,22 @@ msgstr "Čekejte prosím..."
msgid "Must be root"
msgstr "Nutný root"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "distribuuji %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Instalace balíčku..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Instalace balíčku..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -232,37 +254,37 @@ msgstr ""
msgid "Warning"
msgstr "Varování"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "OK"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (k aktualizaci)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (k instalaci)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Výběr balíčků"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Je zapotřebí jeden z následujících balíčků:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Přerušit"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -273,17 +295,19 @@ msgstr ""
"%s\n"
"Pokračovat i přesto v instalaci?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, 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 "Aby byly splněny závislosti, bude nainstalován následující balíček"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Aby byly splněny závislosti, budou nainstalovány následující balíčky"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
@@ -291,42 +315,37 @@ msgstr[0] "(%d balíček, %d MB)"
msgstr[1] "(%d balíčky, %d MB)"
msgstr[2] "(%d balíčků, %d MB)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Instalace balíčku..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "nelze získat zdrojový balíček, končím"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Připravuji..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Instaluji balíček `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Prosím vložte médium nazvané \"%s\""
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Stahuje se balíček `%s'..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Hotovo"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -337,28 +356,28 @@ msgstr ""
"%s\n"
"Možná potřebujete aktualizovat vaši databázi urpmi"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "Instalace selhala:"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "vše je již nainstalováno"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Instalace dokončena"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "odstraňuje se %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "restartuji urpmi"
@@ -397,7 +416,7 @@ msgstr " výchozí je %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - vypíše plný název balíčku rpm (NVRA)\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Instalovat balíčky může pouze uživatel root"
@@ -407,134 +426,143 @@ msgstr "Instalovat balíčky může pouze uživatel root"
msgid "Running urpmi in restricted mode..."
msgstr "Spouštím urpmi v omezeném režimu..."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, c-format
msgid "fail to create directory %s"
msgstr "selhalo vytvoření adresáře %s"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr "neplatný vlastník adresáře %s"
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, c-format
msgid "Can not download packages into %s"
msgstr "Nelze stáhnout balíčky do %s"
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr "složka prostředí %s neexistuje"
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "používá se specifické prostředí na %s\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "nelze otevřít databázi rpmdb"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "neplatný název rpm souboru [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "načítám rpm soubor [%s] ..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...načítání ukončeno"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...načítání selhalo: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "nelze zpřístupnit rpm soubor [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "nelze zpracovat soubor SPEC %s [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "nelze registrovat rpm soubor"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Nekompatibilní architektura pro rpm [%s]"
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "chyba při registraci lokálních balíčků"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
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:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "špatně zadaná proxy na příkazové řádce\n"
-#: ../urpm/args.pm:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "neočekávaný výraz %s"
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "chybí výraz před %s"
-#: ../urpm/args.pm:382
+#: ../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:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "chybí výraz pro zavření"
-#: ../urpm/args.pm:395
+#: ../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:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "adresář chroot neexistuje"
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr "Nelze použít %s bez %s"
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr "Nelze použít %s zároveň s %s"
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr "Příliš mnoho parametrů\n"
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Kopírování selhalo"
@@ -583,122 +611,122 @@ msgstr "zdroj `%s' je definovaný dvakrát, končím"
msgid "unable to write config file [%s]"
msgstr "nelze zapsat soubor s nastavením [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "%s není k dispozici, návrat k %s"
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr "nelze načíst nastavení proxy (nejsou dostatečná práva ke čtení %s)"
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Zadejte prosím své přístupové informace k proxy\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Jméno uživatele:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Heslo:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr "Neznámý stahovač `%s'!!!\n"
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr "%s selhal: skončil se signálem %d"
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr "%s selhal: skončil s výsledkem %d"
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, c-format
msgid "copy failed"
msgstr "kopírování selhalo"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, c-format
msgid "wget is missing\n"
msgstr "chybí wget\n"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, c-format
msgid "curl is missing\n"
msgstr "chybí curl\n"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr "curl selhal: stahování bylo přerušeno\n"
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr "chybí rsync\n"
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr "chybí ssh\n"
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr "chybí prozilla\n"
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr "Nelze spustit aplikaci prozilla\n"
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, c-format
msgid "aria2 is missing\n"
msgstr "chybí aria2\n"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr " %s%% z %s hotovo, ETA = %s, rychlost = %s"
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr " %s%% hotovo, rychlost = %s"
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, c-format
msgid "retrieving %s"
msgstr "přijímám %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, c-format
msgid "retrieved %s"
msgstr "přijato %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "neznámý protokol definovaný pro %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "%s není k dispozici, návrat k %s"
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, 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:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "nelze zpracovat protokol: %s"
@@ -718,59 +746,60 @@ msgstr "balíček %s nenalezen."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "načítám rpm soubory ze zdroje \"%s\"..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr "[přebaluje se]"
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
"vytvořena transakce pro instalaci na %s (odstranění=%d, instalace=%d, "
"aktualizace=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "nelze vytvořit transakci"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "nelze extrahovat rpm z delta-rpm balíčku %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "nelze nainstalovat balíček %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "odstraňují se vadné balíčky rpm (%s) z %s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, c-format
msgid "removing %s failed: %s"
msgstr "odstranění %s selhalo: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, c-format
msgid "Removing package %s"
msgstr "Odstraňuje se balíček %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "odstraňuje se balíček %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "odstraňují se instalované balíčky rpm (%s) z %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Více informací o balíčku %s"
@@ -815,18 +844,18 @@ msgstr "přerušuji"
msgid "%s database is locked (another program is already using it)"
msgstr "Databáze %s je zamčená (už ji používá jiný program)"
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Chyba při instalaci"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr "Přesto zkusit pokračovat? (a/N) "
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -835,75 +864,66 @@ msgstr ""
"Instalace selhala, vadné balíčky rpm:\n"
"%s"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, c-format
msgid "The following package has bad signature"
msgstr "Následující balíček má špatnou signaturu"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Následující balíčky mají špatné signatury"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Chcete pokračovat v instalaci?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, c-format
msgid "removing installed rpms (%s)"
msgstr "odstraňují se instalované balíčky rpm (%s)"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "distribuuji %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "instaluji %s z %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "instaluji %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Mám zkusit instalaci bez kontroly závislostí? (a/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Mám zkusit instalaci ještě razantněji (--force)? (a/N) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr "Balíčky jsou aktuální"
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Instalace je možná"
#: ../urpm/md5sum.pm:26
#, c-format
-msgid "examining %s file"
-msgstr "zkoumám soubor %s"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr "neplatný soubor MD5SUM"
-
-#: ../urpm/md5sum.pm:28
-#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
-msgstr "varování: kontrolní součet md5sum pro %s není k dispozici v souboru MD5SUM"
+msgstr ""
+"varování: kontrolní součet md5sum pro %s není k dispozici v souboru MD5SUM"
#: ../urpm/media.pm:204
#, c-format
@@ -974,228 +994,228 @@ msgstr "místo aktualizace bych instaloval balíček %s"
msgid "medium \"%s\" already exists"
msgstr "zdroj \"%s\" již existuje"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr "(implicitně ignorováno)"
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "přidávám zdroj \"%s\" před vzdálený zdroj \"%s\""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, c-format
msgid "adding medium \"%s\""
msgstr "přidávám zdroj \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr "adresář %s neexistuje"
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "toto umístění zdá se neobsahuje žádnou distribuci"
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, c-format
msgid "unable to parse media.cfg"
msgstr "nelze zpracovat media.cfg"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "nelze přistupovat k distribučnímu zdroji (chybí soubor media.cfg)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr "vynechávám nekompatibilní zdroje `%s' (pro %s)"
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, c-format
msgid "retrieving media.cfg file..."
msgstr "načítám soubor media.cfg..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "pokouším se vybrat neexistující zdroj \"%s\""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "vybírám více zdrojů: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "odebírám zdroj \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "přenastavuji urpmi pro zdroj \"%s\""
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...přenastavení selhalo"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "přenastaveno"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Chyba při generování souboru s názvy: závislost %d nebyla nalezena"
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "zdroj \"%s\" je aktuální"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "zpracovávám soubor syntézy [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problém při čtení souboru se syntézou zdroje \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "kopíruji [%s] pro zdroj \"%s\"..."
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...kopírování selhalo"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopíruji soubor s popisy pro \"%s\"..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...kopírování ukončeno"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopírování [%s] selhalo (soubor je podezřele malý)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "počítám součet md5 získaného zdrojového souboru se syntézou"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "načtení [%s] selhalo (chyba v kontrolním součtu md5sum)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, c-format
msgid "genhdlist2 failed on %s"
msgstr "genhdlist2 selhal na %s"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, c-format
msgid "comparing %s and %s"
msgstr "porovnávám %s a %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "neplatný soubor hdlist %s pro zdroj \"%s\""
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "kopíruji soubor MD5SUM z \"%s\"..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "neplatný soubor MD5SUM (stažený z %s)"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
+#, fuzzy, c-format
+msgid "no metadata found for medium \"%s\""
+msgstr "nebyl nalezen soubor se syntézou pro zdroj \"%s\""
+
+#: ../urpm/media.pm:1475
#, c-format
msgid "retrieving source synthesis of \"%s\"..."
msgstr "načítám zdrojový soubor se syntézou pro \"%s\"..."
-#: ../urpm/media.pm:1478
-#, c-format
-msgid "found probed synthesis as %s"
-msgstr "nalezen ověřený soubor se syntézou jako %s"
-
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
-#, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "nebyl nalezen soubor se syntézou pro zdroj \"%s\""
-
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "zkoumá se soubor s veřejnými klíči \"%s\"..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...importuji klíč %s ze souboru veřejných klíčů \"%s\""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "nelze importovat soubor s veřejnými klíči \"%s\""
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "nebyl nalezen soubor se syntézou pro zdroj \"%s\""
+
+#: ../urpm/media.pm:1612
#, c-format
msgid "updated medium \"%s\""
msgstr "aktualizován zdroj \"%s\""
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr "načtení [%s] selhalo"
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr "zkouším znovu se zrcadlem %s"
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr "Nelze nalézt zrcadlo ze seznamu zrcadel %s"
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr "nalezena geolokalizace %s %.2f %.2f z časové zóny %s"
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, c-format
msgid "getting mirror list from %s"
msgstr "získává se seznam zrcadel z %s"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1266,7 +1286,7 @@ msgstr "GB"
msgid "TB"
msgstr "TB"
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1383,7 +1403,8 @@ msgstr " --version - vypíše číslo verze tohoto nástroje.\n"
#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
-msgstr " --env - použij specifické prostředí (většinou hlášení o chybě).\n"
+msgstr ""
+" --env - použij specifické prostředí (většinou hlášení o chybě).\n"
#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
#, c-format
@@ -1392,7 +1413,8 @@ msgstr " --excludemedia - nepoužít zadané zdroje, oddělené čárkami.\n"
#: ../urpm/search.pm:39 ../urpmf:39
#, c-format
-msgid " --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
" --literal, -l - neporovnávat vzory, použije se parametr jako prostý "
"řetězec.\n"
@@ -1408,8 +1430,10 @@ msgstr ""
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
#, c-format
-msgid " --sortmedia - sort media according to substrings separated by comma.\n"
-msgstr " --sortmedia - třídit zdroje podle podřetězců oddělených čárkami.\n"
+msgid ""
+" --sortmedia - sort media according to substrings separated by comma.\n"
+msgstr ""
+" --sortmedia - třídit zdroje podle podřetězců oddělených čárkami.\n"
#: ../urpm/search.pm:43 ../urpmf:43
#, c-format
@@ -1419,7 +1443,8 @@ msgstr " --use-distrib - použít zadanou cestu pro přístup ke zdroji\n"
#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
-msgstr " --synthesis - použít daný soubor se syntézou místo databáze urpmi.\n"
+msgstr ""
+" --synthesis - použít daný soubor se syntézou místo databáze urpmi.\n"
#: ../urpm/search.pm:45 ../urpmf:45
#, c-format
@@ -1628,18 +1653,14 @@ msgstr " -m - zdroj, ve kterém byl balíček nalezen\n"
#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
#, c-format
msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - společně se jménem vypíše verzi, vydání a architekturu.\n"
+msgstr ""
+" -f - společně se jménem vypíše verzi, vydání a architekturu.\n"
#: ../urpm/search.pm:197 ../urpmf:198
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Nesprávný formát: můžete použít pouze jeden vícehodnotový tag"
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "používá se specifické prostředí na %s\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1655,117 +1676,137 @@ msgstr "není k dispozici žádný soubor se syntézou pro zdroj \"%s\""
msgid "no xml-info available for medium \"%s\""
msgstr "není k dispozici žádné xml-info pro zdroj \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr "urpmi bylo znovu spuštěno a seznam prioritních balíčků se nezměnil"
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "urpmi bylo znovu spuštěno a seznam prioritních balíčků se změnil: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"urpmi bylo znovu spuštěno a seznam prioritních balíčků se změnil: %s vs %s"
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Žádný balíček s názvem %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Následující balíčky obsahují: %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr "Chcete-li použít všechny, použijte volbu \"-a\""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, c-format
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:543
+#: ../urpm/select.pm:538
#, c-format
msgid "Package %s is already installed"
msgstr "Balíček %s je již nainstalován"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, c-format
msgid "Packages %s are already installed"
msgstr "Balíčky %s jsou již nainstalovány"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "z důvodu chybějícího %s"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, c-format
msgid "due to already installed %s"
msgstr "díky již nainstalovanému %s"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "z důvodu nesplněného %s"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "pokouším se postoupit %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "aby bylo možné zachovat %s"
#: ../urpm/select.pm:607
#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Následující balíček musí být odstraněn, aby bylo možné jiné aktualizovat:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Následující balíčky musí být odstraněny, aby bylo možné jiné aktualizovat:\n"
+"%s"
+
+#: ../urpm/select.pm:635
+#, c-format
msgid "in order to install %s"
msgstr "pro instalaci %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "z důvodu konfliktů s %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Neplatný podpis (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Neplatné ID klíče (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Chybí podpis (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr "systém"
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr "Měli byste restartovat %s pro %s"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't write file"
msgstr "Nelze zapisovat do souboru"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't open file"
msgstr "Nelze otevřít soubor"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, c-format
msgid "Can't move file %s to %s"
msgstr "Nelze přesunout soubor %s na %s"
@@ -1800,14 +1841,16 @@ msgstr " --auto-orphans - odstraní sirotky\n"
#: ../urpme:49
#, c-format
msgid " --test - verify if the removal can be achieved correctly.\n"
-msgstr " --test - zkontrolovat, zda lze dokončit odstranění správně.\n"
+msgstr ""
+" --test - zkontrolovat, zda lze dokončit odstranění správně.\n"
#: ../urpme:51 ../urpmi:109 ../urpmq:68
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
-msgstr " --parallel - distribuovaný program urpmi na počítačích s přezdívkou.\n"
+msgstr ""
+" --parallel - distribuovaný program urpmi na počítačích s přezdívkou.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Před smazáním znovu zabalí soubory\n"
@@ -1815,12 +1858,14 @@ msgstr " --repackage - Před smazáním znovu zabalí soubory\n"
#: ../urpme:53
#, c-format
msgid " --root - use another root for rpm removal.\n"
-msgstr " --root - použít pro odebrání balíčků jiný kořenový adresář.\n"
+msgstr ""
+" --root - použít pro odebrání balíčků jiný kořenový adresář.\n"
#: ../urpme:55 ../urpmi:101
#, c-format
msgid " --justdb - update only the rpm db, not the filesystem.\n"
-msgstr " --justdb - aktualizovat pouze databázi RPM, ne souborový systém.\n"
+msgstr ""
+" --justdb - aktualizovat pouze databázi RPM, ne souborový systém.\n"
#: ../urpme:56
#, c-format
@@ -1836,7 +1881,7 @@ msgstr ""
" --use-distrib - nastavit urpme za provozu ze stromu distribuce, užitečné\n"
" při (od)instalaci chroot s volbou --root.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - užvaněný režim.\n"
@@ -1882,7 +1927,8 @@ msgstr "Nejsou sirotci k odebrání"
#: ../urpme:149
#, 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] "Aby byly splněny závislosti, bude odebrán %d balíček"
msgstr[1] "Aby byly splněny závislosti, budou odebrány %d balíčky"
msgstr[2] "Aby byly splněny závislosti, bude odebráno %d balíčků"
@@ -1903,7 +1949,7 @@ msgstr[0] "Odstranit %d balíček?"
msgstr[1] "Odstranit %d balíčky?"
msgstr[2] "Odstranit %d balíčků?"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (a/N) "
@@ -1931,7 +1977,8 @@ msgstr "neukončený výraz (%s)"
#: ../urpmi:81
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
-msgstr " --auto-update - provede aktualizaci zdrojů a poté aktualizaci systému.\n"
+msgstr ""
+" --auto-update - provede aktualizaci zdrojů a poté aktualizaci systému.\n"
#: ../urpmi:82
#, c-format
@@ -2014,7 +2061,8 @@ msgstr ""
#: ../urpmi:99
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
-msgstr " --clean - nejprve odstraní balíčky RPM z vyrovnávací paměti.\n"
+msgstr ""
+" --clean - nejprve odstraní balíčky RPM z vyrovnávací paměti.\n"
#: ../urpmi:100
#, c-format
@@ -2023,8 +2071,10 @@ msgstr " --noclean - neodstraňovat rpm balíčky z vyrovnávací paměti.
#: ../urpmi:102
#, c-format
-msgid " --replacepkgs - force installing packages which are already installed.\n"
-msgstr " --replacepkgs - vynutit instalaci balíčků, které jsou již nainstalovány.\n"
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+" --replacepkgs - vynutit instalaci balíčků, které jsou již nainstalovány.\n"
#: ../urpmi:104
#, c-format
@@ -2163,17 +2213,22 @@ msgstr " --ignorearch - dovolí instalovat balíčky z jiných architektur.\n
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - nespustí skript(y) balíčku\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - vypíše konflikty.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - balíčky, jejichž instalace by měla být přeskočena\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --prefer - balíčky, které by měly být upřednostněny\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2182,42 +2237,44 @@ msgstr ""
" --more-choices - pokud je nalezeno více balíčků, bude se nabízet "
"více voleb než implicitně.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - nezamkne se databáze balíčků RPM.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
-msgstr " --strict-arch - aktualizovat pouze balíčky se shodnou architekturou.\n"
+msgstr ""
+" --strict-arch - aktualizovat pouze balíčky se shodnou architekturou.\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - vybere všechny vyhovující z příkazové řádky.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - režim bez výpisů.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --debug - velmi užvaněný režim.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
-msgstr " názvy nebo soubory RPM zadané na příkazové řádce budou instalovány.\n"
+msgstr ""
+" názvy nebo soubory RPM zadané na příkazové řádce budou instalovány.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr "Chyba: nelze použít --auto-select spolu se seznamem balíčků.\n"
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2226,29 +2283,30 @@ msgstr ""
"Chyba: Chcete-li vygenerovat hlášení o chybě, zadejte obvyklé parametry na\n"
"příkazovém řádku a přidejte parametr --bug.\n"
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "Při použití --install-src nelze instalovat binární balíčky RPM"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr "Nelze instalovat spec soubory"
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr "použije se --buildrequires"
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
"použijte prosím --buildrequires nebo --install-src, použije se --"
"buildrequires"
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2257,17 +2315,12 @@ msgstr ""
"Adresář [%s] již existuje, použijte prosím pro hlášení o chybě jiný adresář "
"nebo jej odstraňte"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Nelze vytvořit adresář [%s] pro uložení hlášení o chybě"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr "složka prostředí %s neexistuje"
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2276,48 +2329,49 @@ msgstr ""
"Chyba: %s vypadá, že je připojen pouze ke čtení.\n"
"Použijte --allow-force, chcete-li operaci provést."
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr "Obnovuji media...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (k aktualizaci)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (k aktualizaci)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (k instalaci)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (k instalaci)"
-#: ../urpmi:462
+#: ../urpmi:450
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
-msgstr "Aby byly splněna závislost '%s', je třeba jeden z následujících balíčků:"
+msgstr ""
+"Aby byly splněna závislost '%s', je třeba jeden z následujících balíčků:"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Jaká je vaše volba? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2328,7 +2382,7 @@ msgstr ""
"které jsou starší než instalovaná verze:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2339,7 +2393,7 @@ msgstr ""
"které jsou starší než instalovaná verze:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2348,12 +2402,12 @@ msgstr ""
"\n"
"Přesto pokračovat v instalaci?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (A/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2362,7 +2416,7 @@ msgstr ""
"Požadovaný balíček nelze nainstalovat:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2371,12 +2425,12 @@ msgstr ""
"Některé požadované balíčky nebylo možné nainstalovat:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "odebrání balíčku %s naruší funkčnost vašeho systému"
-#: ../urpmi:551
+#: ../urpmi:538
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2387,7 +2441,7 @@ msgstr ""
"být odstraněn, aby bylo možné jiné aktualizovat:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2398,30 +2452,12 @@ msgstr ""
"být odstraněny, aby bylo možné jiné aktualizovat:\n"
"%s\n"
-#: ../urpmi:560
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Následující balíček musí být odstraněn, aby bylo možné jiné aktualizovat:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Následující balíčky musí být odstraněny, aby bylo možné jiné aktualizovat:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(pouze test, k odstranění ve skutečnosti nedojde)"
-#: ../urpmi:583
+#: ../urpmi:568
#, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2432,7 +2468,7 @@ msgstr ""
"následující závislosti:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
@@ -2440,27 +2476,27 @@ msgstr[0] "Bude odstraněn následující sirotek."
msgstr[1] "Budou odstraněni následující sirotci."
msgstr[2] "Budou odstraněni následující sirotci."
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(pouze test, k instalaci ve skutečnosti nedojde)"
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr "Bude použito %s dodatečného diskového prostoru."
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr "Bude uvolněno %s diskového prostoru."
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr "Bude staženo %s balíčků."
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2468,12 +2504,12 @@ 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:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Zrušit"
-#: ../urpmi:648
+#: ../urpmi:633
#, c-format
msgid "Press Enter when mounted..."
msgstr "Stiskněte Enter po připojení..."
@@ -2549,7 +2585,8 @@ msgid ""
" or discard non-update media (when used with --distrib)\n"
msgstr ""
" --update - vytvoří zdroj pro aktualizaci \n"
-" nebo vyřadí neaktualizační zdroje (při použití s --distrib)\n"
+" nebo vyřadí neaktualizační zdroje (při použití s --"
+"distrib)\n"
#: ../urpmi.addmedia:67
#, c-format
@@ -2590,7 +2627,8 @@ msgstr ""
#: ../urpmi.addmedia:75
#, c-format
msgid " --interactive - with --distrib, ask confirmation for each media\n"
-msgstr " --interactive - spolu s --distrib se zeptá na potvrzení u každého zdroje\n"
+msgstr ""
+" --interactive - spolu s --distrib se zeptá na potvrzení u každého zdroje\n"
#: ../urpmi.addmedia:76
#, c-format
@@ -2609,7 +2647,8 @@ msgstr ""
#: ../urpmi.addmedia:79
#, c-format
msgid " --virtual - create virtual media wich are always up-to-date.\n"
-msgstr " --virtual - vytvoří virtuální zdroje, které jsou vždy aktuální.\n"
+msgstr ""
+" --virtual - vytvoří virtuální zdroje, které jsou vždy aktuální.\n"
#: ../urpmi.addmedia:80 ../urpmi.update:44
#, c-format
@@ -2724,7 +2763,8 @@ msgstr " --noclean - nečistit na kontrolním bodu sestavovací adresář\
#: ../urpmi.recover:37
#, c-format
-msgid " --list - list transactions since provided date/duration argument\n"
+msgid ""
+" --list - list transactions since provided date/duration argument\n"
msgstr " --list - vypíše transakce od daného data/doby\n"
#: ../urpmi.recover:38
@@ -3020,8 +3060,10 @@ msgstr " --list-aliases - seznam dostupných paralelních přezdívek.\n"
#: ../urpmq:63
#, c-format
-msgid " --dump-config - dump the config in form of urpmi.addmedia argument.\n"
-msgstr " --dump-config - vypíše nastavení ve formě parametru pro urpmi.addmedia.\n"
+msgid ""
+" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+" --dump-config - vypíše nastavení ve formě parametru pro urpmi.addmedia.\n"
#: ../urpmq:64
#, c-format
@@ -3030,7 +3072,8 @@ msgstr " --src - další balíček je zdrojový (stejné jako -s).\n"
#: ../urpmq:65
#, c-format
-msgid " --sources - give all source packages before downloading (root only).\n"
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
msgstr ""
" --sources - všechny zdrojové balíčky před stažením (pouze uživatel "
"root).\n"
@@ -3038,7 +3081,8 @@ msgstr ""
#: ../urpmq:67
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
-msgstr " --ignorearch - povolí dotazy na balíčky RPM pro jiné architektury.\n"
+msgstr ""
+" --ignorearch - povolí dotazy na balíčky RPM pro jiné architektury.\n"
#: ../urpmq:71
#, c-format
@@ -3135,7 +3179,8 @@ msgstr " -g - vypíše tag skupin společně se jménem.\n"
#: ../urpmq:101
#, c-format
msgid " -i - print useful information in human readable form.\n"
-msgstr " -i - tisk užitečných informací v člověkem čitelné podobě.\n"
+msgstr ""
+" -i - tisk užitečných informací v člověkem čitelné podobě.\n"
#: ../urpmq:102
#, c-format
@@ -3162,7 +3207,8 @@ msgstr " -s - další balíček je zdrojový (stejné jako --src).
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
-msgstr " -u - odebere balíček pokud je již instalována novější verze.\n"
+msgstr ""
+" -u - odebere balíček pokud je již instalována novější verze.\n"
#: ../urpmq:107
#, c-format
@@ -3177,7 +3223,8 @@ msgstr " -Y - jako -y, ale ignoruje velká a malá písmena.\n"
#: ../urpmq:109
#, c-format
msgid " names or rpm files given on command line are queried.\n"
-msgstr " jméno nebo rpm soubory zadané na příkazové řádce, které jsou dotazovány.\n"
+msgstr ""
+" jméno nebo rpm soubory zadané na příkazové řádce, které jsou dotazovány.\n"
#: ../urpmq:156
#, c-format
@@ -3197,7 +3244,8 @@ msgstr "použijte -l pro seznam souborů"
#: ../urpmq:404
#, 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"
+msgstr ""
+"pro zdroj \"%s\" neexistuje xml info, pouze částečný výsledek pro balíček %s"
#: ../urpmq:405
#, c-format
@@ -3208,14 +3256,16 @@ msgstr ""
#: ../urpmq:408
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
"pro zdroj \"%s\" neexistuje soubor xml info, nelze vrátit žádný výsledek pro "
"balíček %s"
#: ../urpmq:409
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
"pro zdroj \"%s\" neexistuje soubor xml info, nelze vrátit žádný výsledek pro "
"balíčky %s"
@@ -3225,3 +3275,11 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Nebyl nalezen záznam změn\n"
+#~ msgid "examining %s file"
+#~ msgstr "zkoumám soubor %s"
+
+#~ msgid "invalid MD5SUM file"
+#~ msgstr "neplatný soubor MD5SUM"
+
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "nalezen ověřený soubor se syntézou jako %s"
diff --git a/po/cy.po b/po/cy.po
index bc1057c9..12792a77 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: 2008-09-23 18:55+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2008-09-29 19:31-0000\n"
"Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
"Language-Team: Cymraeg\n"
@@ -30,7 +30,7 @@ msgstr "Gosod RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Gwall: methu canfod ffeil %s, diddymu'r weithred"
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Iawn"
@@ -96,7 +96,7 @@ msgstr "_Gosod"
msgid "_Save"
msgstr "_Cadw"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Dileu"
@@ -170,12 +170,12 @@ msgstr ""
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - defnyddio'r cyfrwng, wedi ei ran gan gollnod.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - caniatáu i chwilio canfod pecyn.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - peidio chwilio yn provides i ganfod pecyn.\n"
@@ -215,7 +215,22 @@ msgstr "Arhoswch..."
msgid "Must be root"
msgstr "Rhaid bod yn root"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "dosbarthu %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Gosod y pecyn..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Gosod y pecyn..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -231,37 +246,37 @@ msgstr ""
msgid "Warning"
msgstr "Rhybudd"
-#: ../gurpmi2:134 ../urpmi:624
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Iawn"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr "(uwchraddio)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr "(gosod)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Dewis pecyn"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Mae angen un o'r pecynnau canlynol:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Atal"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -272,61 +287,56 @@ msgstr ""
"%s\n"
"Parhau beth bynnag?"
-#: ../gurpmi2:241 ../urpmi:591
+#: ../gurpmi2:240 ../urpmi:592
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu gosod"
-#: ../gurpmi2:242 ../urpmi:592
+#: ../gurpmi2:241 ../urpmi:593
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "I fodloni dibyniaethau, bydd y pecyn canlynol yn cael ei osod"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d pecyn, %d MB)"
msgstr[1] "(%d pecyn, %d MB)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Gosod y pecyn..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "methu estyn pecynnau ffynhonnell, atal"
-#: ../gurpmi2:266 ../urpm/install.pm:81
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Paratoi..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Gosod pecyn `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:619
+#: ../gurpmi2:286 ../urpmi:620
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Rhowch gyfrwng \"%s\" yn y ddyfais"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Llwytho pecynnau i lawr ' %s'..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Gorffen"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:114
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -337,28 +347,28 @@ msgstr ""
"%s\n"
"Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "Methodd y gosod:"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Popeth wedi eu gosod eisoes"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Cwblhawyd y gosod"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "tynnu %s"
-#: ../gurpmi2:354 ../urpmi:686
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "ailgychwyn urpmi"
@@ -397,7 +407,7 @@ msgstr " rhagosodedig yw %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - allbynnu enw llawn rpm (NVRA)\n"
-#: ../rurpmi:11 ../urpmi:268
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
@@ -493,59 +503,59 @@ msgstr "Mae'r weithred yn waharddedig wrth redeg ym modd cyfyngedig"
msgid "bad proxy declaration on command line\n"
msgstr "datganiad dirprwy gwallus ar y llinell orchymyn\n"
-#: ../urpm/args.pm:305
+#: ../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:382
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "mynegiadau annisgwyl %s"
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "mynegiad coll cyn %s"
-#: ../urpm/args.pm:389
+#: ../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:393
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "dim mynegiad i'w gau"
-#: ../urpm/args.pm:402
+#: ../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:470
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "Nid yw cyfeiriadur chroot yn bodoli"
-#: ../urpm/args.pm:493
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr "Methu defnyddio %s heb %s"
-#: ../urpm/args.pm:496 ../urpm/args.pm:499 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr "Methu defnyddio %s gyda %s"
-#: ../urpm/args.pm:507
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr "Gormod o ymresymiadau\n"
-#: ../urpm/bug_report.pm:54 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Methodd y copïo"
@@ -734,54 +744,54 @@ msgstr "adfer ffeiliau rpm o gyfrwng [%s]"
msgid "[repackaging]"
msgstr "[ailbecynnu]"
-#: ../urpm/install.pm:168
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
"crëwyd trosglwyddiad ar gyfer gosod ar %s (tynnu=%d, gosod=%d, uwchraddio=%d)"
-#: ../urpm/install.pm:171
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "methu creu trosglwyddiad."
-#: ../urpm/install.pm:194
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "methu tynnu rpm o becyn delta-rpm %s"
-#: ../urpm/install.pm:207
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "methu gosod pecyn %s"
-#: ../urpm/install.pm:210
+#: ../urpm/install.pm:211
#, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "tynnu rpm gwallus (%s) o %s"
-#: ../urpm/install.pm:211 ../urpm/install.pm:268
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, c-format
msgid "removing %s failed: %s"
msgstr "tynnu %s methodd: %s"
-#: ../urpm/install.pm:249
+#: ../urpm/install.pm:250
#, c-format
msgid "Removing package %s"
msgstr "Tynnu pecyn %s."
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "tynnu pecyn %s."
-#: ../urpm/install.pm:266
+#: ../urpm/install.pm:267
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "tynnu rpm wedi eu gosod (%s) o %s"
-#: ../urpm/install.pm:274
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Rhagor o wybodaeth ar becyn %s"
@@ -1191,7 +1201,7 @@ msgstr "wedi canfod geolleoleiddio %s %.2f %.2f o gylchfa amser %s"
msgid "getting mirror list from %s"
msgstr "estyn rhestr drychai o %s"
-#: ../urpm/msg.pm:63 ../urpmi:501 ../urpmi:516 ../urpmi:611
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
@@ -1201,7 +1211,7 @@ msgstr "Nn"
# can hit those keys in their keyboard to reply.
# please keep the 'Yy' for compatibility reasons
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:552 ../urpmi:647 ../urpmi:653
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1361,6 +1371,306 @@ msgstr "gosod %s"
msgid "unmounting %s"
msgstr "dadosod %s"
+#: ../urpm/search.pm:29 ../urpmf:29
+#, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2006 Mandriva.\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 fersiwn %s\n"
+"Hawlfraint © 2002 - 2006 Mandriva.\n"
+"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan amodau'r GPL GNU..\n"
+"\n"
+"defnydd: urpmf [dewisiadau] pattern-expression\n"
+
+#: ../urpm/search.pm:36 ../urpmf:36
+#, c-format
+msgid " --version - print this tool's version number.\n"
+msgstr " --version - argraffu rhif fersiwn yr offeryn.\n"
+
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid " --env - use specific environment (typically a bug report).\n"
+msgstr ""
+" --env - defnyddio amgylchedd penodol (adroddiad gwall fel "
+"rheol).\n"
+
+#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid " --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+" --excludemedia - peidio defnyddio'r cyfrwng hwn, rhannwyd gyda choma.\n"
+
+#: ../urpm/search.pm:39 ../urpmf:39
+#, c-format
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+" --literal, -l - peidio cydweddu patrymau, defnyddio ymresymiad fel llinyn "
+"llythrennedd.\n"
+
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+" --urpmi-root - defnyddio root arall ar gyfer gosod urpmi db ac "
+"rpm.\n"
+
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+" --sortmedia - sort media according to substrings separated by comma.\n"
+msgstr ""
+" --sortmedia - didoli'r cyfrwng yn ôl llinynnau wedi eu rhannu gyda "
+"choma.\n"
+
+#: ../urpm/search.pm:43 ../urpmf:43
+#, c-format
+msgid " --use-distrib - use the given path to access media\n"
+msgstr ""
+" --use-distrib - defnyddio'r llwybr yma i gael mynediad ar y cyfrwng.\n"
+
+#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
+msgstr " --synthesis - defnyddio'r synthesis yn lle urpmi db.\n"
+
+#: ../urpm/search.pm:45 ../urpmf:45
+#, c-format
+msgid " --uniq - do not print identical lines twice.\n"
+msgstr " --uniq - peidio argraffu llinellau'r un fath.\n"
+
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid " --update - use only update media.\n"
+msgstr " --update - defnyddio cyfrwng diweddaru'n unig.\n"
+
+#: ../urpm/search.pm:47 ../urpmf:47
+#, c-format
+msgid " --verbose - verbose mode.\n"
+msgstr " --verbose - modd llafar.\n"
+
+#: ../urpm/search.pm:48 ../urpmf:48
+#, c-format
+msgid " -i - ignore case distinctions in patterns.\n"
+msgstr ""
+" -i - anwybyddu gwahaniaeth maint llythrennau ym mhob patrwm.\n"
+
+#: ../urpm/search.pm:49 ../urpmf:49
+#, c-format
+msgid " -I - honor case distinctions in patterns (default).\n"
+msgstr ""
+" -i - cadw gwahaniaeth maint llythrennau ym mhob patrwm "
+"(rhagosodiad).\n"
+
+#: ../urpm/search.pm:50 ../urpmf:50
+#, c-format
+msgid " -F<str> - change field separator (defaults to ':').\n"
+msgstr " -F<str> - newid ymwahanydd maes (arferol i ':').\n"
+
+#: ../urpm/search.pm:51 ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Mynegiadau patrymau:\n"
+
+#: ../urpm/search.pm:52 ../urpmf:52
+#, c-format
+msgid " text - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+" text - unrhyw destun wedi ei ddidoli fel regexp, onibai fod -l "
+"yn cael ei ddefnyddio.\n"
+
+#: ../urpm/search.pm:53 ../urpmf:53
+#, c-format
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -e - cynnwys perl cod yn union fel perl -e.\n"
+
+#: ../urpm/search.pm:54 ../urpmf:54
+#, c-format
+msgid " -a - binary AND operator.\n"
+msgstr " -a - gweithredwr deuaidd AND.\n"
+
+#: ../urpm/search.pm:55 ../urpmf:55
+#, c-format
+msgid " -o - binary OR operator.\n"
+msgstr " -o - gweithredwr deuaidd OR.\n"
+
+#: ../urpm/search.pm:56 ../urpmf:56
+#, c-format
+msgid " ! - unary NOT.\n"
+msgstr " ! - unaidd NOT.\n"
+
+#: ../urpm/search.pm:57 ../urpmf:57
+#, c-format
+msgid " ( ) - left and right parentheses.\n"
+msgstr " ( ) - parenthesis de a chwith.\n"
+
+#: ../urpm/search.pm:58 ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Rhestr tagiau:\n"
+
+#: ../urpm/search.pm:59 ../urpmf:59
+#, c-format
+msgid " --qf - specify a printf-like output format\n"
+msgstr " --qf - pennu allbwn fformat printf-aidd\n"
+
+#: ../urpm/search.pm:60 ../urpmf:60
+#, c-format
+msgid " example: '%%name:%%files'\n"
+msgstr " esiampl: '%%enw:%%ffeil'\n"
+
+#: ../urpm/search.pm:61 ../urpmf:61
+#, c-format
+msgid " --arch - architecture\n"
+msgstr " --arch - saernïaeth\n"
+
+#: ../urpm/search.pm:62 ../urpmf:62
+#, c-format
+msgid " --buildhost - build host\n"
+msgstr " --buildhost - gwestai'r adeiladedd\n"
+
+#: ../urpm/search.pm:63 ../urpmf:63
+#, c-format
+msgid " --buildtime - build time\n"
+msgstr " --buildtime - amser adeiladu\n"
+
+#: ../urpm/search.pm:64 ../urpmf:64
+#, c-format
+msgid " --conffiles - configuration files\n"
+msgstr " --conffiles - ffeiliau ffurfweddiad\n"
+
+#: ../urpm/search.pm:65 ../urpmf:65
+#, c-format
+msgid " --conflicts - conflict tags\n"
+msgstr " --conflicts - tagiau gwrthdaro\n"
+
+#: ../urpm/search.pm:66 ../urpmf:66
+#, c-format
+msgid " --description - package description\n"
+msgstr " --description - disgrifiad pecyn\n"
+
+#: ../urpm/search.pm:67 ../urpmf:67
+#, c-format
+msgid " --distribution - distribution\n"
+msgstr " --distribution - dosbarthiad\n"
+
+#: ../urpm/search.pm:68 ../urpmf:68
+#, c-format
+msgid " --epoch - epoch\n"
+msgstr " --epoch - cyfnod\n"
+
+#: ../urpm/search.pm:69 ../urpmf:69
+#, c-format
+msgid " --filename - filename of the package\n"
+msgstr " --filename - enw ffeil y pecyn\n"
+
+#: ../urpm/search.pm:70 ../urpmf:70
+#, c-format
+msgid " --files - list of files contained in the package\n"
+msgstr " --files - rhestr ffeiliau o fewn y pecyn\n"
+
+#: ../urpm/search.pm:71 ../urpmf:71
+#, c-format
+msgid " --group - group\n"
+msgstr " --group - grŵp\n"
+
+#: ../urpm/search.pm:72 ../urpmf:72
+#, c-format
+msgid " --license - license\n"
+msgstr " --license - trwydded\n"
+
+#: ../urpm/search.pm:73 ../urpmf:73
+#, c-format
+msgid " --name - package name\n"
+msgstr " --name - enw'r pecyn\n"
+
+#: ../urpm/search.pm:74 ../urpmf:74
+#, c-format
+msgid " --obsoletes - obsoletes tags\n"
+msgstr " --obsoletes - tagiau'r hen\n"
+
+#: ../urpm/search.pm:75 ../urpmf:75
+#, c-format
+msgid " --packager - packager\n"
+msgstr " --packager - pecynydd\n"
+
+#: ../urpm/search.pm:76 ../urpmf:76
+#, c-format
+msgid " --provides - provides tags\n"
+msgstr " --provides - tag darparu\n"
+
+#: ../urpm/search.pm:77 ../urpmf:77
+#, c-format
+msgid " --requires - requires tags\n"
+msgstr " --requires - tagiau angenrhaid\n"
+
+#: ../urpm/search.pm:78 ../urpmf:78
+#, c-format
+msgid " --size - installed size\n"
+msgstr " --size - maint wedi gosod\n"
+
+#: ../urpm/search.pm:79 ../urpmf:79
+#, c-format
+msgid " --sourcerpm - source rpm name\n"
+msgstr " --sourcerpm - enw rpm ffynhonnell\n"
+
+#: ../urpm/search.pm:80 ../urpmf:80
+#, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --suggests - cynnig tagiau\n"
+
+#: ../urpm/search.pm:81 ../urpmf:81
+#, c-format
+msgid " --summary - summary\n"
+msgstr " --summary - crynodeb\n"
+
+#: ../urpm/search.pm:82 ../urpmf:82
+#, c-format
+msgid " --url - url\n"
+msgstr " --url - url\n"
+
+#: ../urpm/search.pm:83 ../urpmf:83
+#, c-format
+msgid " --vendor - vendor\n"
+msgstr " --vendor - gwerthwr\n"
+
+#: ../urpm/search.pm:84 ../urpmf:84
+#, c-format
+msgid " -m - the media in which the package was found\n"
+msgstr " -m - y cyfrwng lle cafwyd y pecyn\n"
+
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
+#, c-format
+msgid " -f - print version, release and arch with name.\n"
+msgstr " -f - argraffu fersiwn a rhyddhad ac arch gydag enw.\n"
+
+#: ../urpm/search.pm:197 ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "Fformat anghywir: gallwch ddefnyddio un tag aml-werth yn unig"
+
+#: ../urpm/search.pm:290 ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "dim ffeil hdlist ar gyfer cyfrwng \"%s\""
+
+#: ../urpm/search.pm:297 ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "adeiladu ffeil synthesis file ar gyfer cyfrwng \"%s\""
+
+#: ../urpm/search.pm:304 ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "dim xml-info ar gyfer cyfrwng \"%s\""
+
#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1456,17 +1766,17 @@ msgstr "er mwyn gosod %s"
msgid "due to conflicts with %s"
msgstr "oherwydd gwrthdaro gyda %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Llofnod annilys (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Enw Allwedd Annilys (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Llofnod coll (%s)"
@@ -1533,7 +1843,7 @@ msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
" --parallel - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Ailbecynnu'r ffeiliau cyn eu dileu\n"
@@ -1543,14 +1853,6 @@ msgstr " --repackage - Ailbecynnu'r ffeiliau cyn eu dileu\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - defnyddio root arall ar gyfer tynnu rpm.\n"
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
-#, c-format
-msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-" --urpmi-root - defnyddio root arall ar gyfer gosod urpmi db ac "
-"rpm.\n"
-
#: ../urpme:55 ../urpmi:101
#, c-format
msgid " --justdb - update only the rpm db, not the filesystem.\n"
@@ -1570,7 +1872,7 @@ msgstr ""
" --use-distrib - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
" wrth (ddad)osod chroot gyda dewis --root.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - modd llafar.\n"
@@ -1634,7 +1936,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "Tynnu pecynnau %d?"
msgstr[1] "Tynnu pecynnau %d?"
-#: ../urpme:161 ../urpmi:553 ../urpmi:648 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (y/N) "
@@ -1654,302 +1956,11 @@ msgstr "Methodd y tynnu"
msgid "Removal is possible"
msgstr "Mae tynnu yn bosibl"
-#: ../urpmf:29
-#, c-format
-msgid ""
-"urpmf version %s\n"
-"Copyright (C) 2002-2006 Mandriva.\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 fersiwn %s\n"
-"Hawlfraint © 2002 - 2006 Mandriva.\n"
-"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan amodau'r GPL GNU..\n"
-"\n"
-"defnydd: urpmf [dewisiadau] pattern-expression\n"
-
-#: ../urpmf:36
-#, c-format
-msgid " --version - print this tool's version number.\n"
-msgstr " --version - argraffu rhif fersiwn yr offeryn.\n"
-
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid " --env - use specific environment (typically a bug report).\n"
-msgstr ""
-" --env - defnyddio amgylchedd penodol (adroddiad gwall fel "
-"rheol).\n"
-
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid " --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-" --excludemedia - peidio defnyddio'r cyfrwng hwn, rhannwyd gyda choma.\n"
-
-#: ../urpmf:39
-#, c-format
-msgid ""
-" --literal, -l - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-" --literal, -l - peidio cydweddu patrymau, defnyddio ymresymiad fel llinyn "
-"llythrennedd.\n"
-
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-" --sortmedia - sort media according to substrings separated by comma.\n"
-msgstr ""
-" --sortmedia - didoli'r cyfrwng yn ôl llinynnau wedi eu rhannu gyda "
-"choma.\n"
-
-#: ../urpmf:43
-#, c-format
-msgid " --use-distrib - use the given path to access media\n"
-msgstr ""
-" --use-distrib - defnyddio'r llwybr yma i gael mynediad ar y cyfrwng.\n"
-
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
-msgstr " --synthesis - defnyddio'r synthesis yn lle urpmi db.\n"
-
-#: ../urpmf:45
-#, c-format
-msgid " --uniq - do not print identical lines twice.\n"
-msgstr " --uniq - peidio argraffu llinellau'r un fath.\n"
-
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid " --update - use only update media.\n"
-msgstr " --update - defnyddio cyfrwng diweddaru'n unig.\n"
-
-#: ../urpmf:47
-#, c-format
-msgid " --verbose - verbose mode.\n"
-msgstr " --verbose - modd llafar.\n"
-
-#: ../urpmf:48
-#, c-format
-msgid " -i - ignore case distinctions in patterns.\n"
-msgstr ""
-" -i - anwybyddu gwahaniaeth maint llythrennau ym mhob patrwm.\n"
-
-#: ../urpmf:49
-#, c-format
-msgid " -I - honor case distinctions in patterns (default).\n"
-msgstr ""
-" -i - cadw gwahaniaeth maint llythrennau ym mhob patrwm "
-"(rhagosodiad).\n"
-
-#: ../urpmf:50
-#, c-format
-msgid " -F<str> - change field separator (defaults to ':').\n"
-msgstr " -F<str> - newid ymwahanydd maes (arferol i ':').\n"
-
-#: ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Mynegiadau patrymau:\n"
-
-#: ../urpmf:52
-#, c-format
-msgid " text - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-" text - unrhyw destun wedi ei ddidoli fel regexp, onibai fod -l "
-"yn cael ei ddefnyddio.\n"
-
-#: ../urpmf:53
-#, c-format
-msgid " -e - include perl code directly as perl -e.\n"
-msgstr " -e - cynnwys perl cod yn union fel perl -e.\n"
-
-#: ../urpmf:54
-#, c-format
-msgid " -a - binary AND operator.\n"
-msgstr " -a - gweithredwr deuaidd AND.\n"
-
-#: ../urpmf:55
-#, c-format
-msgid " -o - binary OR operator.\n"
-msgstr " -o - gweithredwr deuaidd OR.\n"
-
-#: ../urpmf:56
-#, c-format
-msgid " ! - unary NOT.\n"
-msgstr " ! - unaidd NOT.\n"
-
-#: ../urpmf:57
-#, c-format
-msgid " ( ) - left and right parentheses.\n"
-msgstr " ( ) - parenthesis de a chwith.\n"
-
-#: ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Rhestr tagiau:\n"
-
-#: ../urpmf:59
-#, c-format
-msgid " --qf - specify a printf-like output format\n"
-msgstr " --qf - pennu allbwn fformat printf-aidd\n"
-
-#: ../urpmf:60
-#, c-format
-msgid " example: '%%name:%%files'\n"
-msgstr " esiampl: '%%enw:%%ffeil'\n"
-
-#: ../urpmf:61
-#, c-format
-msgid " --arch - architecture\n"
-msgstr " --arch - saernïaeth\n"
-
-#: ../urpmf:62
-#, c-format
-msgid " --buildhost - build host\n"
-msgstr " --buildhost - gwestai'r adeiladedd\n"
-
-#: ../urpmf:63
-#, c-format
-msgid " --buildtime - build time\n"
-msgstr " --buildtime - amser adeiladu\n"
-
-#: ../urpmf:64
-#, c-format
-msgid " --conffiles - configuration files\n"
-msgstr " --conffiles - ffeiliau ffurfweddiad\n"
-
-#: ../urpmf:65
-#, c-format
-msgid " --conflicts - conflict tags\n"
-msgstr " --conflicts - tagiau gwrthdaro\n"
-
-#: ../urpmf:66
-#, c-format
-msgid " --description - package description\n"
-msgstr " --description - disgrifiad pecyn\n"
-
-#: ../urpmf:67
-#, c-format
-msgid " --distribution - distribution\n"
-msgstr " --distribution - dosbarthiad\n"
-
-#: ../urpmf:68
-#, c-format
-msgid " --epoch - epoch\n"
-msgstr " --epoch - cyfnod\n"
-
-#: ../urpmf:69
-#, c-format
-msgid " --filename - filename of the package\n"
-msgstr " --filename - enw ffeil y pecyn\n"
-
-#: ../urpmf:70
-#, c-format
-msgid " --files - list of files contained in the package\n"
-msgstr " --files - rhestr ffeiliau o fewn y pecyn\n"
-
-#: ../urpmf:71
-#, c-format
-msgid " --group - group\n"
-msgstr " --group - grŵp\n"
-
-#: ../urpmf:72
-#, c-format
-msgid " --license - license\n"
-msgstr " --license - trwydded\n"
-
-#: ../urpmf:73
-#, c-format
-msgid " --name - package name\n"
-msgstr " --name - enw'r pecyn\n"
-
-#: ../urpmf:74
-#, c-format
-msgid " --obsoletes - obsoletes tags\n"
-msgstr " --obsoletes - tagiau'r hen\n"
-
-#: ../urpmf:75
-#, c-format
-msgid " --packager - packager\n"
-msgstr " --packager - pecynydd\n"
-
-#: ../urpmf:76
-#, c-format
-msgid " --provides - provides tags\n"
-msgstr " --provides - tag darparu\n"
-
-#: ../urpmf:77
-#, c-format
-msgid " --requires - requires tags\n"
-msgstr " --requires - tagiau angenrhaid\n"
-
-#: ../urpmf:78
-#, c-format
-msgid " --size - installed size\n"
-msgstr " --size - maint wedi gosod\n"
-
-#: ../urpmf:79
-#, c-format
-msgid " --sourcerpm - source rpm name\n"
-msgstr " --sourcerpm - enw rpm ffynhonnell\n"
-
-#: ../urpmf:80
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests - cynnig tagiau\n"
-
-#: ../urpmf:81
-#, c-format
-msgid " --summary - summary\n"
-msgstr " --summary - crynodeb\n"
-
-#: ../urpmf:82
-#, c-format
-msgid " --url - url\n"
-msgstr " --url - url\n"
-
-#: ../urpmf:83
-#, c-format
-msgid " --vendor - vendor\n"
-msgstr " --vendor - gwerthwr\n"
-
-#: ../urpmf:84
-#, c-format
-msgid " -m - the media in which the package was found\n"
-msgstr " -m - y cyfrwng lle cafwyd y pecyn\n"
-
-#: ../urpmf:85 ../urpmq:99
-#, c-format
-msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - argraffu fersiwn a rhyddhad ac arch gydag enw.\n"
-
#: ../urpmf:153
#, c-format
msgid "unterminated expression (%s)"
msgstr "Mynegiadauheb ei derfynnu (%s)"
-#: ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Fformat anghywir: gallwch ddefnyddio un tag aml-werth yn unig"
-
-#: ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "dim ffeil hdlist ar gyfer cyfrwng \"%s\""
-
-#: ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "adeiladu ffeil synthesis file ar gyfer cyfrwng \"%s\""
-
-#: ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "dim xml-info ar gyfer cyfrwng \"%s\""
-
#: ../urpmi:81
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -2183,17 +2194,22 @@ msgstr " --ignorearch - caniatáu gosod rpm ar gyfer saernïaeth annhebyg.\n"
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - peidio gweithredu sgripledi pecyn(au)\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - gwrthdaro argraffu\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - pecynnau dylid osgoi eu gosod.\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --prefer - pecynnau angenrheidiol\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2203,45 +2219,45 @@ msgstr ""
"ddewis\n"
" na'r rhagosodiad.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - peidio cloi db rpm.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
" --strict-arch - uwchraddio dim ond pecynnau gyda'r un bensaernïaeth.\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - dewis pob cydweddiad ar y llinell gorchymyn.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - modd distaw.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, c-format
msgid " --debug - very verbose mode.\n"
msgstr " - --debug - modd llafar iawn.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
" bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael "
"eu gosod.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr "Gwall: methu defnyddio --auto-select ynghyd â'r rhestr pecynnau.\n"
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2251,29 +2267,29 @@ msgstr ""
"arferol\n"
"ynghyd a --bug.\n"
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "Methu gosod ffeiliau deuaidd rpm wrth ddefnyddio --install-src"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr "Nid oes modd gosod ffeiliau spec"
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr "rhagosod --buildrequires"
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
"defnyddiwch --buildrequires neu --install-src, yn rhagosod i --buildrequires"
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2282,12 +2298,12 @@ msgstr ""
"Mae cyfeiriadur (%s) yn bodoli eisoes, defnyddiwch gyfeiriadur arall am "
"adroddiad gwall neu ei ddileu."
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Methu creu cyfeiriadur (%s) ar gyfer adroddiad gwall"
-#: ../urpmi:274
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2296,48 +2312,48 @@ msgstr ""
"Gwall: %s i weld wedi ei osod fel darllen yn unig.\n"
"Defnydd --allow-force gorfodaeth i orfodi gweithred."
-#: ../urpmi:348
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr "Diweddaru cyfrwng...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:435
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (uwchraddio)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:437
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (uwchraddio)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:441
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (gosod)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (gosod)"
-#: ../urpmi:449
+#: ../urpmi:450
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "I fodloni '%s' dibyniaeth, bydd angen un o'r pecynnau canlynol:"
-#: ../urpmi:452
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Beth yw eich dewis? (1-%d)"
-#: ../urpmi:494
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2348,7 +2364,7 @@ msgstr ""
"sy'n hyn na'r rhai sydd wedi eu gosod:\n"
"%s"
-#: ../urpmi:496
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2359,7 +2375,7 @@ msgstr ""
"sy'n hyn na'r rhai sydd wedi eu gosod:\n"
"%s"
-#: ../urpmi:502 ../urpmi:517
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2368,12 +2384,12 @@ msgstr ""
"\n"
"Parhau i osod beth bynnag?"
-#: ../urpmi:503 ../urpmi:518 ../urpmi:612 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (Y/n) "
-#: ../urpmi:511
+#: ../urpmi:512
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2382,7 +2398,7 @@ msgstr ""
"Nid oes modd gosod pecyn gofynnwyd amdani:\n"
"%s"
-#: ../urpmi:512
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2391,12 +2407,12 @@ msgstr ""
"Nid oes modd gosod rhai pecynnau gofynnwyd amdanynt:\n"
"%s"
-#: ../urpmi:529
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "bydd tynnu pecynnau %s yn torri'r system"
-#: ../urpmi:537
+#: ../urpmi:538
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2407,7 +2423,7 @@ msgstr ""
"gael ei dynnu i eraill gael eu diweddaru.\n"
"%s\n"
-#: ../urpmi:539
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2418,12 +2434,12 @@ msgstr ""
"gael eu tynnu i eraill gael eu diweddaru.\n"
"%s\n"
-#: ../urpmi:547
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(prawf yn unig, ni fydd yn cael ei ddadosod)"
-#: ../urpmi:567
+#: ../urpmi:568
#, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2434,46 +2450,46 @@ msgstr ""
"canlynol:\n"
"%s\n"
-#: ../urpmi:578
+#: ../urpmi:579
#, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "Bydd y pecyn amddifad canlynol yn cael ei dynnu"
msgstr[1] "Bydd y pecynnau amddifad canlynol yn cael eu tynnu"
-#: ../urpmi:594
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(prawf yn unig, ni fydd yn cael ei osod)"
-#: ../urpmi:600
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr "Bydd %s o le ychwanegol ar ddisg yn cael ei ddefnyddio."
-#: ../urpmi:601
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr "Bydd %s o le ar ddisg ar gael."
-#: ../urpmi:602
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr "bydd %s o becynnau yn cael eu hadfer."
-#: ../urpmi:603
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
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:624
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Dileu"
-#: ../urpmi:632
+#: ../urpmi:633
#, c-format
msgid "Press Enter when mounted..."
msgstr "Pwyso Enter pan wedi ei arosod..."
diff --git a/po/da.po b/po/da.po
index 60fb0172..45f2c86b 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2008-09-21 01:09+0200\n"
"Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -37,7 +37,7 @@ msgstr "RPM-installering"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Fejl: kunne ikke finde fil %s, vil afbryde handling"
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_O.k."
@@ -104,7 +104,7 @@ msgstr "_Installér"
msgid "_Save"
msgstr "_Gem"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Annullér"
@@ -135,9 +135,8 @@ msgstr ""
msgid "Options:"
msgstr "Valgmuligheder:"
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - udskriv denne hjælpebesked.\n"
@@ -153,13 +152,17 @@ msgstr ""
#: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - vælg automatisk pakker for opgradering af systemet.\n"
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - vælg automatisk pakker for opgradering af systemet.\n"
#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - gennemfør kald selv om nogen pakker ikke eksisterer.\n"
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - gennemfør kald selv om nogen pakker ikke eksisterer.\n"
#: ../gurpmi.pm:50 ../urpmi:133
#, c-format
@@ -171,17 +174,17 @@ msgstr ""
" (--no-verify-rpm deaktiverer det, standard er "
"aktiveret).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - brug kun de opgivne medier, adskilt med komma.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - tillad søgning i 'provides' for at finde pakke.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - søg ikke i 'provides' for at finde pakke.\n"
@@ -200,7 +203,8 @@ msgstr " --test - afprøv kun om installationen kan udføres korrekt.\n
#: ../gurpmi.pm:57 ../urpmi:76
#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
" --searchmedia - brug kun det opgivne medie for at søge efter de ønskede "
"pakker.\n"
@@ -220,7 +224,22 @@ msgstr "Vent venligst..."
msgid "Must be root"
msgstr "Skal være root"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "distribuerer %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Pakkeinstallation..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Pakkeinstallation..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -236,37 +255,37 @@ msgstr ""
msgid "Warning"
msgstr "Advarsel"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "O.k."
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (skal opgraderes)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (skal installeres)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Pakkevalg"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Der er brug for en af de følgende pakker:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Afbryd"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -277,59 +296,58 @@ msgstr ""
"%s\n"
"Skal installationen fortsættes alligevel?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
-msgstr "For at tilfredsstille afhængigheder vil den følgende pakke blive installeret "
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
+msgstr ""
+"For at tilfredsstille afhængigheder vil den følgende pakke blive installeret "
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
-msgstr "For at tilfredsstille afhængigheder vil de følgende pakker blive installeret"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr ""
+"For at tilfredsstille afhængigheder vil de følgende pakker blive installeret"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d pakke, %d MB)"
msgstr[1] "(%d pakker, %d MB)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Pakkeinstallation..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "kan ikke hente kilde-pakker, afslutter med fejl"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Forbereder..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Installerer pakke `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Vær venlig at indsætte mediet med navnet %s"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Henter pakke %s..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Færdig"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -340,28 +358,28 @@ msgstr ""
"%s\n"
"Du ønsker måske at opdatere din urpmi-database"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "Installationen fejlede:"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "alting er allerede installeret"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Installationen færdig"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "fjerner %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "genstarter urpmi"
@@ -400,7 +418,7 @@ msgstr " standard er %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - Vis fuldt rpm-navn (NVRA).\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Kun superbrugeren har lov til at installere pakker"
@@ -410,134 +428,143 @@ msgstr "Kun superbrugeren har lov til at installere pakker"
msgid "Running urpmi in restricted mode..."
msgstr "Kører urpmi i begrænset tilstand..."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, c-format
msgid "fail to create directory %s"
msgstr "Kunne ikke oprette katalog %s"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr "Ugyldig ejer for katalog %s"
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, c-format
msgid "Can not download packages into %s"
msgstr "Kan ikke hente pakker til %s"
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr "Miljøkatalog %s eksisterer ikke"
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "bruger særligt miljø på %s\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "kunne ikke åbne rpmdb"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "ugyldigt rpm-filnavn [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "henter rpm-fil [%s]..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...hentning færdig"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...hentning mislykkedes: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "kunne ikke nå rpm fil [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "kunne ikke fortolke spec-fil '%s [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "kunne ikke registrere rpm-fil"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Inkompatibel arkitektur for rpm [%s]"
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "fejl ved registrering af lokale pakker"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
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:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "Forkert proxy-erklæring på kommandolinje\n"
-#: ../urpm/args.pm:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "Uventet udtryk %s"
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "manglende udtryk før %s"
-#: ../urpm/args.pm:382
+#: ../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:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "intet udtryk at lukke"
-#: ../urpm/args.pm:395
+#: ../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:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot-katalog eksisterer ikke"
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr "Kan ikke bruge %s uden %s."
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr "Kan ikke bruge '%s' med '%s'."
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr "For mange argumenter\n"
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Kopiering mislykkedes"
@@ -586,122 +613,123 @@ msgstr "Mediet '%s' er defineret to gange. Afbryder"
msgid "unable to write config file [%s]"
msgstr "kunne ikke skrive config-fil [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "%s er ikke tilgængelig, falder tilbage til %s"
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
-msgstr "kan ikke læse proxy-indstillinger (ikke rettigheder nok til at læse %s)"
+msgstr ""
+"kan ikke læse proxy-indstillinger (ikke rettigheder nok til at læse %s)"
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Indtast dine adgangsoplysninger for adgang til proxy\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Brugernavn:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Kodeord:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr "Ukendt nethentningsprogram '%s'.\n"
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr "%s-fejl: Afsluttede med signalet '%d'."
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr "%s-fejl: Afsluttede med '%d'."
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, c-format
msgid "copy failed"
msgstr "kopiering mislykkedes"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, c-format
msgid "wget is missing\n"
msgstr "wget mangler\n"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, c-format
msgid "curl is missing\n"
msgstr "curl mangler\n"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr "curl-fejl: hentning afbrudt.\n"
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr "rsync mangler\n"
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr "ssh mangler\n"
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr "prozilla mangler\n"
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr "Kunne ikke køre prozilla\n"
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, c-format
msgid "aria2 is missing\n"
msgstr "aria2 mangler\n"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr " %s %% af %s færdiggjort. Tid igen: %s. Hastighed: %s."
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr " %s %% færdiggjort. Hastighed: %s."
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, c-format
msgid "retrieving %s"
msgstr "henter %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, c-format
msgid "retrieved %s"
msgstr "hentede %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "ukendt protokol defineret for %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "%s er ikke tilgængelig, falder tilbage til %s"
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "Ingen webhentning fundet, understøttede webhentninger er: %s\n"
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "kunne ikke behandle protokol: %s"
@@ -721,59 +749,60 @@ msgstr "pakke %s er ikke fundet."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "henter rpm-filer fra medie '%s'..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr "[genpakning]"
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
"oprettede transaktion for installering på %s (fjern=%d, installér=%d, "
"opgradér=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "kan ikke oprette transaktion"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "kan ikke udpakke rpm fra delta-rpm pakke %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "kunne ikke installere pakke %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "fjerner dårlig rpm-pakke (%s) fra %s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, c-format
msgid "removing %s failed: %s"
msgstr "fjernelse af %s mislykkedes: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, c-format
msgid "Removing package %s"
msgstr "Fjerner pakke %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "fjerner pakke %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "fjerner installerede pakker (%s) fra %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Mere information om pakke %s"
@@ -818,18 +847,18 @@ msgstr "afbryder"
msgid "%s database is locked (another program is already using it)"
msgstr "%s-database er låst (et andet program bruger den allerede)"
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Installationen fejlede"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr "Prøv at fortsætte alligevel (j/N) "
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -838,73 +867,63 @@ msgstr ""
"Installationen fejlede, dårlige rpm-pakker:\n"
"%s"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, c-format
msgid "The following package has bad signature"
msgstr "Den følgende pakke har dårlig signatur"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "De følgende pakker har dårlige signaturer"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Ønsker du at fortsætte installationen?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, c-format
msgid "removing installed rpms (%s)"
msgstr "fjerner installerede rpm'er (%s)"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "distribuerer %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "installerer %s fra %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "installerer %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Prøv installation uden at tjekke afhængigheder? (j/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Prøv endnu hårdere at installere (--force)? (j/N) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr "Pakkerne er af nyeste version"
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Installation er mulig"
#: ../urpm/md5sum.pm:26
#, c-format
-msgid "examining %s file"
-msgstr "undersøger %s-fil"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr "ugyldig MD5SUM-fil"
-
-#: ../urpm/md5sum.pm:28
-#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "advarsel: md5sum for %s er ikke tilgængelig i MD5SUM-fil"
@@ -977,228 +996,228 @@ msgstr "ville installere i stedet for at opgradere pakke %s"
msgid "medium \"%s\" already exists"
msgstr "medie \"%s\" eksisterer allerede"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr "(oversprunget som standard)"
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "Tilføjer medie '%s' før det eksterne medie '%s'."
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, c-format
msgid "adding medium \"%s\""
msgstr "tilføjer medie \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr "katalog %s eksisterer ikke"
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "denne adresse ser ikke ud til at indeholde nogen distribution"
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, c-format
msgid "unable to parse media.cfg"
msgstr "kunne ikke læse media.cfg"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "kunne ikke få fat på distributionsmedie (ingen media.cfg fil fundet)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr "overspringer ikke-kompatibelt medie '%s' (for %s)"
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, c-format
msgid "retrieving media.cfg file..."
msgstr "modtager media.cfg-fil..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "prøver at vælge ikke-eksisterende medie \"%s\""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "vælger flere medier: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "fjerner medium \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "omkonfigurerer urpmi for medie \"%s\""
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...omkonfigurering mislykkedes"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "omkonfigurering færdig"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Fejl ved generering af navne-fil: afhængighed %d ikke fundet"
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "medie \"%s\" er tidssvarende"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "undersøger syntese-fil [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problem ved læsning af syntese-fil for medie \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "kopierer [%s] for medium '%s' ..."
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...kopiering mislykkedes"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopierer beskrivelsesfil for \"%s\"..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...kopiering færdig"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopiering af [%s] mislykkedes (filen er mistænkeligt lille)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "beregner md5sum på hentet kilde-syntese"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "hentning af [%s] mislykkedes (md5sum-uoverensstemmelse)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, c-format
msgid "genhdlist2 failed on %s"
msgstr "genhdlist2 mislykkedes på %s"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, c-format
msgid "comparing %s and %s"
msgstr "sammenligner %s og %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ugyldig hdlist-fil %s for medie \"%s\""
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "kopierer MD5SUM-fil for \"%s\"..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "ugyldig MD5SUM-fil (hentet fra %s)"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
+#, fuzzy, c-format
+msgid "no metadata found for medium \"%s\""
+msgstr "ingen syntese-fil fundet for medie \"%s\""
+
+#: ../urpm/media.pm:1475
#, c-format
msgid "retrieving source synthesis of \"%s\"..."
msgstr "henter kilde-syntese for \"%s\"..."
-#: ../urpm/media.pm:1478
-#, c-format
-msgid "found probed synthesis as %s"
-msgstr "fandt undersøgte syntese for \"%s\"..."
-
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
-#, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "ingen syntese-fil fundet for medie \"%s\""
-
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "undersøger pubkey-fil for '%s'"
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...importeret nøgle %s fra pubkey-fil for \"%s\""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "kunne ikke importere pubkey-fil for \"%s\""
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "ingen syntese-fil fundet for medie \"%s\""
+
+#: ../urpm/media.pm:1612
#, c-format
msgid "updated medium \"%s\""
msgstr "opdaterede medie %s"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr "hentning af [%s] mislykkedes"
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr "forsøger igen med spejl %s"
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr "Kunne ikke finde et spejl fra spejlliste %s"
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr "fandt geografisk sted %s %.2f %.2f fra tidszone %s"
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, c-format
msgid "getting mirror list from %s"
msgstr "får spejlliste fra %s"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1269,7 +1288,7 @@ msgstr "GB"
msgid "TB"
msgstr "TB"
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1277,8 +1296,12 @@ msgid ""
msgid_plural ""
"The following packages are now orphans, use \"urpme --auto-orphans\" to "
"remove them."
-msgstr[0] "Den følgende pakke er nu forældreløs, brug \"urpme --auto-orphans\" for at fjerne den."
-msgstr[1] "De følgende pakker er nu forældreløse, brug \"urpme --auto-orphans\" for at fjerne dem."
+msgstr[0] ""
+"Den følgende pakke er nu forældreløs, brug \"urpme --auto-orphans\" for at "
+"fjerne den."
+msgstr[1] ""
+"De følgende pakker er nu forældreløse, brug \"urpme --auto-orphans\" for at "
+"fjerne dem."
#: ../urpm/parallel.pm:14
#, c-format
@@ -1335,7 +1358,9 @@ msgstr "cp mislykkedes på vært %s (%d)"
msgid ""
"%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
"code: %d)"
-msgstr "%s mislykkedes på vært %s (måske har den ikke en god version af urpmi?) (afslutningskode: %d)"
+msgstr ""
+"%s mislykkedes på vært %s (måske har den ikke en god version af urpmi?) "
+"(afslutningskode: %d)"
#: ../urpm/removable.pm:32
#, c-format
@@ -1385,7 +1410,8 @@ msgstr " --excludemedia - brug ikke de opgivne medier, adskilt med komma.\n"
#: ../urpm/search.pm:39 ../urpmf:39
#, c-format
-msgid " --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
" --literal, -l - kontrollér ikke søgestrenge, brug argumenter som "
"bogstavelige strenge.\n"
@@ -1395,12 +1421,15 @@ msgstr ""
#: ../urpmi.update:48 ../urpmq:70
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
-msgstr " --urpmi-root - Brug anden rod for urpmi-database og rpm-installering.\n"
+msgstr ""
+" --urpmi-root - Brug anden rod for urpmi-database og rpm-installering.\n"
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
#, c-format
-msgid " --sortmedia - sort media according to substrings separated by comma.\n"
-msgstr " --sortmedia - sortér medier ifølge delstrenge, adskilt med komma.\n"
+msgid ""
+" --sortmedia - sort media according to substrings separated by comma.\n"
+msgstr ""
+" --sortmedia - sortér medier ifølge delstrenge, adskilt med komma.\n"
#: ../urpm/search.pm:43 ../urpmf:43
#, c-format
@@ -1630,11 +1659,6 @@ msgstr " -f - udskriv version, udgave og arkitektur med navn.\n"
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Ugyldigt format: du kan kun bruge flerværdi-etiketter"
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "bruger særligt miljø på %s\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1650,121 +1674,140 @@ msgstr "ingen syntese-fil tilgængelig for medie \"%s\""
msgid "no xml-info available for medium \"%s\""
msgstr "ingen xml-info-fil tilgængelig for medie \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
"Installationsprogrammet urpmi blev startet igen, og listen over prioriterede "
"pakker blev ikke ændret."
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
"Installationsprogrammet urpmi blev startet igen, og listen over prioriterede "
"pakker blev ændret: %s mod %s"
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Ingen pakke kaldet %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Følgende pakker indeholder %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr "Du bør bruge \"-a\" for at bruge dem alle"
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, c-format
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:543
+#: ../urpm/select.pm:538
#, c-format
msgid "Package %s is already installed"
msgstr "Pakke %s er allerede installeret"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, c-format
msgid "Packages %s are already installed"
msgstr "Pakkerne %s er allerede installerede"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "grundet manglende %s"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, c-format
msgid "due to already installed %s"
msgstr "pga. allerede installeret %s"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "grundet uopfyldt %s"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "prøver at fremme %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "for at kunne beholde %s"
#: ../urpm/select.pm:607
#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Den følgende pakke skal fjernes for at andre kan opgraderes:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"De følgende pakker skal fjernes for at andre kan opgraderes:\n"
+"%s"
+
+#: ../urpm/select.pm:635
+#, c-format
msgid "in order to install %s"
msgstr "for at kunne installere %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "grundet modstrid med %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Ugyldig signatur (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Ugyldig nøgle-id (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Manglende signatur (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr "system"
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr "Du bør genstarte %s for %s"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't write file"
msgstr "Kan ikke skrive fil"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't open file"
msgstr "Kan ikke åbne fil"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, c-format
msgid "Can't move file %s to %s"
msgstr "Kan ikke flytte fil %s til %s."
@@ -1805,7 +1848,7 @@ msgstr " --test - afprøv om fjernelsen kan udføres korrekt.\n"
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - distribueret urpmi over maskiner med alias.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Ompak filer før sletning\n"
@@ -1834,7 +1877,7 @@ msgstr ""
" --use-distrib - konfigurér urpme løbende fra et distrib træ, "
"nyttigt til at (af)installere en chroot med root-tilvalget.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - udførlig tilstand.\n"
@@ -1879,9 +1922,12 @@ msgstr "Ingen forældreløse at fjerne"
#: ../urpme:149
#, 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] "For at tilfredsstille afhængigheder vil den følgende pakke blive fjernet"
-msgstr[1] "For at tilfredsstille afhængigheder vil de følgende %d pakker blive fjernet"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"For at tilfredsstille afhængigheder vil den følgende pakke blive fjernet"
+msgstr[1] ""
+"For at tilfredsstille afhængigheder vil de følgende %d pakker blive fjernet"
#: ../urpme:154
#, c-format
@@ -1897,7 +1943,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "Skal %d pakke fjernes?"
msgstr[1] "Skal %d pakker fjernes?"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (j/N) "
@@ -2013,7 +2059,8 @@ msgstr " --noclean - fjern ikke rpm'er fra cache.\n"
#: ../urpmi:102
#, c-format
-msgid " --replacepkgs - force installing packages which are already installed.\n"
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
msgstr ""
" --replacepkgs - gennemtving installering af pakker som allerede er "
"installerede.\n"
@@ -2144,7 +2191,8 @@ msgstr " --excludedocs - udelader docs-filer.\n"
#: ../urpmi:138
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
-msgstr " --ignoresize - kontrollér ikke for ledig diskplads før installation.\n"
+msgstr ""
+" --ignoresize - kontrollér ikke for ledig diskplads før installation.\n"
#: ../urpmi:139
#, c-format
@@ -2158,17 +2206,22 @@ msgstr ""
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - kør ikke pakkers skript\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - udskriv konflikter.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - pakker hvis installation bør overspringes\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --prefer - Pakker som skal foretrækkes.\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2177,42 +2230,43 @@ msgstr ""
" --more-choices - når flere pakker er fundet, så foreslå flere muligheder\n"
" end normalt.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - lås ikke rpm-database.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - opgradér kun pakker med den samme arkitektur.\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - vælg alle træffere på kommandolinje.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - stille udgave.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --debug - meget udførlig tilstand.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
-msgstr " navne eller rpm-filer givne på kommandolinjen vil blive installeret.\n"
+msgstr ""
+" navne eller rpm-filer givne på kommandolinjen vil blive installeret.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr "Fejl: Kan ikke bruge 'auto-select' sammen med pakkeliste.\n"
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2221,27 +2275,28 @@ msgstr ""
"Fejl: For at generere en fejlrapport skal du specificere de almindelige "
"kommandolinjeargumenter med --bug.\n"
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "Du kan ikke installere binære rpm-filer ved brug af --install-src"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr "Du kan ikke installere spec-filer"
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr "Normalt er dette --buildrequires"
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr "brug --buildrequires eller --install-src, forvalgt er --buildrequires"
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2250,17 +2305,12 @@ msgstr ""
"Kataloget [%s] eksisterer allerede, brug venligst et andet katalog til "
"fejlrapporten, eller slet det"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "kunne ikke oprette katalog [%s] til fejlrapport"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr "Miljøkatalog %s eksisterer ikke"
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2269,36 +2319,36 @@ msgstr ""
"Fejl: %s ser ud til at være monteret kun læsbart.\n"
"Brug --allow-force for at gennemtvinge handlingen."
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr "Opdaterer medie...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (skal opgraderes)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (skal opgraderes)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (skal installeres)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (skal installeres)"
-#: ../urpmi:462
+#: ../urpmi:450
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2307,12 +2357,12 @@ msgstr ""
"For at tilfredsstille afhængigheden af %s er én af de følgende pakker "
"nødvendig:"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Hvad er dit valg? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2323,7 +2373,7 @@ msgstr ""
"som er ældre end de installerede:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2334,7 +2384,7 @@ msgstr ""
"som er ældre end de installerede:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2343,12 +2393,12 @@ msgstr ""
"\n"
"Fortsæt installationen alligevel?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (J/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2357,7 +2407,7 @@ msgstr ""
"En forespurgt pakke kan ikke installeres:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2366,12 +2416,12 @@ msgstr ""
"Nogen forespurgte pakker kan ikke installeres:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "fjernelse af pakke %s vil skade dit system"
-#: ../urpmi:551
+#: ../urpmi:538
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2382,7 +2432,7 @@ msgstr ""
"skal fjernes for at andre kan opgraderes:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2393,79 +2443,62 @@ msgstr ""
"skal fjernes for at andre kan opgraderes:\n"
"%s\n"
-#: ../urpmi:560
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Den følgende pakke skal fjernes for at andre kan opgraderes:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"De følgende pakker skal fjernes for at andre kan opgraderes:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(kun test, fjernelse vil egentlig ikke blive gennemført)"
-#: ../urpmi:583
+#: ../urpmi:568
#, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
"dependencies:\n"
"%s\n"
msgstr ""
-"Du skal først kalde urpmi med --buildrequires for at installere de følgende afhængigheder:\n"
+"Du skal først kalde urpmi med --buildrequires for at installere de følgende "
+"afhængigheder:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "Den følgende forældreløse pakke vil blive fjernet."
msgstr[1] "De følgende forældreløse pakker vil blive fjernet."
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(kun test, installation vil egentlig ikke blive gennemført)"
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr "%s mere diskplads vil blive brugt."
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr "%s diskplads vil blive frigjort."
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr "%s pakker vil blive hentet."
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Fortsæt installationen med de %d pakke?"
msgstr[1] "Fortsæt installationen med de %d pakker?"
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Annullér"
-#: ../urpmi:648
+#: ../urpmi:633
#, c-format
msgid "Press Enter when mounted..."
msgstr "Tryk Enter når det er monteret..."
@@ -2526,7 +2559,8 @@ msgstr " --curl - brug 'curl' til at hente retrieve eksterne filer.\n"
#: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
-msgstr " --prozilla - brug 'prozilla' til at hente retrieve eksterne filer.\n"
+msgstr ""
+" --prozilla - brug 'prozilla' til at hente retrieve eksterne filer.\n"
#: ../urpmi.addmedia:58 ../urpmi.update:36
#, c-format
@@ -2540,7 +2574,8 @@ msgid ""
" or discard non-update media (when used with --distrib)\n"
msgstr ""
" --update - opret et opdateringsmedie, \n"
-" eller brug ikke ikke-opdateringsmedier (når brugt med --distrib)\n"
+" eller brug ikke ikke-opdateringsmedier (når brugt med --"
+"distrib)\n"
#: ../urpmi.addmedia:67
#, c-format
@@ -2574,12 +2609,14 @@ msgstr " --no-probe - forsøg ikke at finde nogen syntese-fil.\n"
msgid ""
" --distrib - automatically create all media from an installation\n"
" medium.\n"
-msgstr " --distrib - opret automatisk alle media fra et installationsmedium.\n"
+msgstr ""
+" --distrib - opret automatisk alle media fra et installationsmedium.\n"
#: ../urpmi.addmedia:75
#, c-format
msgid " --interactive - with --distrib, ask confirmation for each media\n"
-msgstr " --interactive - med --distrib, spøger om bekræftelse for hvert medie\n"
+msgstr ""
+" --interactive - med --distrib, spøger om bekræftelse for hvert medie\n"
#: ../urpmi.addmedia:76
#, c-format
@@ -2708,12 +2745,15 @@ msgstr " --checkpoint - sæt genpakkestart nu\n"
#: ../urpmi.recover:35
#, c-format
msgid " --noclean - don't clean repackage directory on checkpoint\n"
-msgstr " --noclean - rens ikke ud i genpakningskatalog ved kontrolpunkt\n"
+msgstr ""
+" --noclean - rens ikke ud i genpakningskatalog ved kontrolpunkt\n"
#: ../urpmi.recover:37
#, c-format
-msgid " --list - list transactions since provided date/duration argument\n"
-msgstr " --list - list transaktioner siden opgivet dato/varighed-argument\n"
+msgid ""
+" --list - list transactions since provided date/duration argument\n"
+msgstr ""
+" --list - list transaktioner siden opgivet dato/varighed-argument\n"
#: ../urpmi.recover:38
#, c-format
@@ -3004,7 +3044,8 @@ msgstr " --list-aliases - list tilgængelige parallelle aliaser.\n"
#: ../urpmq:63
#, 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 - udskriv konfigurationen i form af urpmi.addmedia "
"argumenter.\n"
@@ -3016,7 +3057,8 @@ msgstr " --src - næste pakke er en kildepakke (samme som -s).\n"
#: ../urpmq:65
#, c-format
-msgid " --sources - give all source packages before downloading (root only).\n"
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
msgstr " --sources - giv alle kildepakker før hentning (kun root).\n"
#: ../urpmq:67
@@ -3193,12 +3235,15 @@ msgstr "Ingen xml-info for medie'%s', kun delvist resultat for pakkerne '%s'"
#: ../urpmq:408
#, 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"
+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:409
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
+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:473
@@ -3206,3 +3251,11 @@ msgstr "Ingen xml-info for medie '%s', kan ikke vise resultat for pakkerne %s"
msgid "No changelog found\n"
msgstr "Ingen ændringslog fundet\n"
+#~ msgid "examining %s file"
+#~ msgstr "undersøger %s-fil"
+
+#~ msgid "invalid MD5SUM file"
+#~ msgstr "ugyldig MD5SUM-fil"
+
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "fandt undersøgte syntese for \"%s\"..."
diff --git a/po/de.po b/po/de.po
index bee26ba3..d6527839 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2008-09-22 11:59+0200\n"
"Last-Translator: Oliver Burger <oliver@mandrivauser.de>\n"
"Language-Team: deutsch <cooker-i18n@mandrivalinux.org>\n"
@@ -30,7 +30,7 @@ msgstr "RPM Installation"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Fehler: kann die Datei %s nicht finden, Vorgang wird abgebrochen"
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_OK"
@@ -97,7 +97,7 @@ msgstr "_Installieren"
msgid "_Save"
msgstr "_Speichern"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Abbrechen"
@@ -129,9 +129,8 @@ msgstr ""
msgid "Options:"
msgstr "Optionen:"
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - Diese Hilfe-Botschaft anzeigen.\n"
@@ -147,14 +146,16 @@ msgstr ""
#: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\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:103 ../urpmq:66
#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
msgstr ""
" --force - Erzwinge Aufruf, sogar wenn einige Pakete nicht "
"existieren.\n"
@@ -169,36 +170,41 @@ msgstr ""
" (--no-verify-rpm deaktiviert das Verhalten,\n"
" Voreingestellt: Kontrolle der Signaturen).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - Benutze nur durch Kommata getrennte Medienliste.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
-msgstr " -p - Erlaube Suche in: Stellt zur Verfügung nach einem Paket.\n"
+msgstr ""
+" -p - Erlaube Suche in: Stellt zur Verfügung nach einem Paket.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
-msgstr " -P - nicht in \"Stellt zur Verfügung\" nach dem Paket suchen.\n"
+msgstr ""
+" -P - nicht in \"Stellt zur Verfügung\" nach dem Paket suchen.\n"
#: ../gurpmi.pm:55 ../urpmi:110 ../urpmq:69
#, c-format
msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - benutze anderes Wurzelverzeichnis zur RPM Installation.\n"
+msgstr ""
+" --root - benutze anderes Wurzelverzeichnis zur RPM Installation.\n"
#: ../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"
+msgstr ""
+" --test - Versuch, ob die Installation korrekt verlaufen wird.\n"
#: ../gurpmi.pm:57 ../urpmi:76
#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
" --searchmedia - verwende nur die gegebenen Medien um nach der "
"angeforderten Paketen zu suchen\n"
@@ -218,7 +224,22 @@ msgstr "Bitte warten..."
msgid "Must be root"
msgstr "Sie müssen root sein"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "Verteile %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Paketinstallation ..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Paketinstallation ..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -234,37 +255,37 @@ msgstr ""
msgid "Warning"
msgstr "Warnung"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (zu aktualisieren)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (zu installieren)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Paketwahl"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Eines der folgenden Pakete wird benötigt:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Abbruch"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -276,59 +297,57 @@ msgstr ""
"%s\n"
"Wollen Sie trotzdem fortfahren?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, 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:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, 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:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d Paket, %d MB)"
msgstr[1] "(%d Pakete, %d MB)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Paketinstallation ..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "Ich kann die Quellpakete nicht finden, Abbruch"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Vorbereiten ..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Installieren des Pakets `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Bitte legen Sie das Medium mit dem Namen \"%s\" ein"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Holen des Pakets `%s' ..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Fertig"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -339,28 +358,28 @@ msgstr ""
"%s\n"
"Sie sollten Ihre urpmi-Datenbank aktualisieren"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "Installation fehlgeschlagen:"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Alles bereits installiert"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Installation beendet"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "Entferne %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "starte urpmi neu"
@@ -399,7 +418,7 @@ msgstr " Voreinstellung ist %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - Voller RPM Name (NVRA)\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Nur der Systemadministrator darf Pakete installieren"
@@ -409,134 +428,145 @@ msgstr "Nur der Systemadministrator darf Pakete installieren"
msgid "Running urpmi in restricted mode..."
msgstr "Urpmi läuft im eingeschränkten Modus..."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, c-format
msgid "fail to create directory %s"
msgstr "Fehler beim erstellen des Verzeichnis %s"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr "Fehlerhafter Besitzer des Verzeichnis %s"
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, c-format
msgid "Can not download packages into %s"
msgstr "Pakete können nicht ind das Verzeichnis [%s] gespeichert werden"
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr "Das angegebene Verzeichnis %s existiert nicht"
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "nutze spezielle Umgebung für %s\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "Es kann die rpmdb nicht geöffnet werden"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "Ungültiger RPM Name [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "Holen des RPMs [%s] ..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...Holen fertig"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...Holen fehlgeschlagen: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "Ich habe keinen Zugriff auf die RPM-Datei [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "Nicht möglich spec file %s [%s] zu parsen"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "Ich kann die RPM-Datei nicht registrieren"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Nicht kompatible Architektur für RPM [%s]"
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "Fehler bei der Registrierung lokaler Pakete"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Diese Funktion ist während des eingeschränkten Modus verboten"
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "Ungültige Proxyangabe als Kommandozeilenparameter\n"
-#: ../urpm/args.pm:298
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: Ich kann das RPM \"%s\" nicht lesen.\n"
-#: ../urpm/args.pm:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "unerwarteter Ausdruck %s"
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "Fehlender Ausdruck vor (%s)"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "unerwarteter Ausdruck %s (Vorschlag: Nutzen Sie -a oder -o)"
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "Kein Ausdruck zu schließen"
-#: ../urpm/args.pm:395
+#: ../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:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot Verzeichnis existiert nicht"
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr "Es ist nicht möglich %s ohne %s zu verwenden"
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr "Es ist nicht möglich %s mit %s zu verwenden"
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr "zu viele Argumente\n"
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Kopieren fehlgeschlagen"
@@ -546,7 +576,9 @@ msgstr "Kopieren fehlgeschlagen"
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)"
+msgstr ""
+"Sie müssen die CD-ROM selbst einbinden (oder perl-Hal-Cdroms installieren, "
+"um dies automatisch durchführen zu lassen)"
#: ../urpm/cdrom.pm:68
#, c-format
@@ -583,124 +615,125 @@ msgstr "Medium `%s' ist schon vorhanden, Abbruch"
msgid "unable to write config file [%s]"
msgstr "Die Konfigurationsdatei [%s] kann nicht geschrieben werden"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "%s ist nicht verfügbar. Zurück zur %s"
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
-msgstr "kann die Proxy-Einstellungen nicht lesen (ungenügende Leserechte für %s)"
+msgstr ""
+"kann die Proxy-Einstellungen nicht lesen (ungenügende Leserechte für %s)"
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Bitte geben Sie die Zugangsdaten für den Proxy Server ein\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Benutzername:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Passwort:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr "Unbekanntes webfetch `%s' !!!\n"
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr "%s Fehler: Beendet mit Signal %d"
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr "%s Fehler: beende mit %d"
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, c-format
msgid "copy failed"
msgstr "Kopieren fehlgeschlagen"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, c-format
msgid "wget is missing\n"
msgstr "wget fehlt\n"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, c-format
msgid "curl is missing\n"
msgstr "curl fehlt\n"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr "curl fehlt: Download abgebrochen\n"
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr "rsync fehlt\n"
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr "ssh fehlt\n"
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr "prozilla fehlt\n"
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr "Prozilla kann nicht ausgeführt werden\n"
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, c-format
msgid "aria2 is missing\n"
msgstr "aria2 fehlt\n"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
" %s%% von %s abgeschlossen, verbleibende Zeit = %s, Geschwindigkeit = "
"%s"
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr " %s%% abgeschlossen, Geschwindigkeit = %s"
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, c-format
msgid "retrieving %s"
msgstr "frage %s ab"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, c-format
msgid "retrieved %s"
msgstr "rufe %s ab"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "Unbekanntes Protokoll für %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "%s ist nicht verfügbar. Zurück zur %s"
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "kein webfetch gefunden, unterstützte webfetch sind: %s\n"
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "Ich kann mit dem Prtokoll %s nicht umgehen"
@@ -720,59 +753,60 @@ msgstr "Paket %s wurde nicht gefunden."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "Holen der RPMs von Medium \"%s\"..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr "[neupacken]"
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
"Stelle Vorgang zum Installieren auf %s (entfernen=%d, installieren=%d, "
"upgraden=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "unmöglich den Vorgang einzuleiten"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "Das RPM-Paket kann nicht vom Delta-RPM %s extrahiert werden"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "Ich kann das Paket %s nicht installieren"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "entferne fehlerhaftes rpm (%s) von %s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, c-format
msgid "removing %s failed: %s"
msgstr "Entfernen von %s fehlgeschlagen: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, c-format
msgid "Removing package %s"
msgstr "Entferne das Paket %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "Entfernen des Pakets %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "entferne installierte rpms (%s) von %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Mehr Informationen über das Paket %s"
@@ -815,20 +849,22 @@ msgstr "abbrechen"
#: ../urpm/lock.pm:65
#, 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/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Die Installation schlug Fehl"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr "Trotzdem versuchen? (j/N) "
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -837,73 +873,63 @@ msgstr ""
"Installation fehlgeschlagen, fehlerhafte rpms:\n"
"%s"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, c-format
msgid "The following package has bad signature"
msgstr "Folgendes Paket hat eine inkorrekte Signatur"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Folgenden Pakete haben inkorrekte Signaturen"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Wollen Sie die Installation fortsetzen?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, c-format
msgid "removing installed rpms (%s)"
msgstr "entferne installierte rpms (%s)"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "Verteile %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "Installiere %s von %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "Installiere %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Soll ich eine Installation ohne Abhängigkeitstest versuchen? (j/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Soll ich eine Installation erzwingen (--force)? (j/N) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr "Die Pakete sind auf dem aktuellen Stand"
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Die Installation ist möglich"
#: ../urpm/md5sum.pm:26
#, c-format
-msgid "examining %s file"
-msgstr "überprüfe Datei %s"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr "Ungültige MD5SUM Datei"
-
-#: ../urpm/md5sum.pm:28
-#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "Warnung: md5sum für %s nicht verfügbar in MD5SUM Datei"
@@ -923,8 +949,8 @@ msgstr "Konnte nicht auf Listendatei von \"%s\" zugreifen, Medium ignoriert"
#, 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 daher ignoriert"
+"Es ist nicht möglich, auf die Synthesis-Datei von \"%s\" zuzugreifen, das "
+"Medium wird daher ignoriert"
#: ../urpm/media.pm:240
#, c-format
@@ -980,230 +1006,230 @@ msgstr "Anstatt des Upgrade Paketes lieber folgendes %s installieren"
msgid "medium \"%s\" already exists"
msgstr "Das Medium \"%s\" existiert bereits"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr "(standartmäßig ignorieren)"
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "Hinzufügen des Mediums \"%s\" vor dem Remotemodium \"%s\""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, c-format
msgid "adding medium \"%s\""
msgstr "hinzufügen des Mediums \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr "Das angegebene Verzeichnis %s existiert nicht"
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "Diese Ort enthält keine Distribution"
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, c-format
msgid "unable to parse media.cfg"
msgstr "Nicht möglich media.cfg zu parsen"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, 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)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr "Nicht kompatible Quellen `%s' (für %s) werden übersprungen"
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, c-format
msgid "retrieving media.cfg file..."
msgstr "Frage media.cfg Datei ..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "Versuch, das nicht existierende Medium \"%s\" auszuwählen"
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "Auswahl des Mehrfachmediums: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "Entfernen des Mediums \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "Rekonfiguriere URPMI für Medium \"%s\""
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...Rekonfiguration scheiterte"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "Rekonfiguration durchgeführt"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Fehler beim Erstellen der Namens-Datei: Abhängigkeit %d nicht gefunden"
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "Medium \"%s\" ist auf dem aktuellen Stand"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "Lesen der Synthese-Datei [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "Probleme beim Lesen der Synthese-Datei des Mediums \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "Kopiere [%s] zu Medium \"%s\" ..."
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...das Kopieren scheiterte"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "Kopiere Beschreibungs-Datei von \"%s\"..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "... das Kopieren ist beendet"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopieren von [%s] fehlgeschlagen (Datei ist verdächtig klein)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "Errechne md5sum der erhaltenen Synthese-Datei der Quelle"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "Holen von [%s] fehlgeschlagen (md5sum fehlerhaft)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, c-format
msgid "genhdlist2 failed on %s"
msgstr "Das Erstellen der HD-Liste mit genhdlist2 in [%s] schlug fehl."
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, c-format
msgid "comparing %s and %s"
msgstr "Vergleiche %s und %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "Fehlerhafte hdlist Datei %s für das Medium \"%s\""
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "Kopiere md5-Datei von \"%s\"..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "Ungültige md5sum-Datei (heruntergeladen von%s)"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
+#, fuzzy, c-format
+msgid "no metadata found for medium \"%s\""
+msgstr "Synthese-Datei für das Medium \"%s\" gefunden"
+
+#: ../urpm/media.pm:1475
#, c-format
msgid "retrieving source synthesis of \"%s\"..."
msgstr "Hole Synthese-Datei der Quelle \"%s\"..."
-#: ../urpm/media.pm:1478
-#, c-format
-msgid "found probed synthesis as %s"
-msgstr "Synthese-Datei als %s gefunden"
-
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
-#, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "Synthese-Datei für das Medium \"%s\" gefunden"
-
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "Holen der Pubkey-Datei für \"%s\" ..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...importierter Schlüssel %s von Pubkey-Datei von \"%s\""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "kann die Pubkey-Datei für \"%s\" nicht importieren"
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "Synthese-Datei für das Medium \"%s\" gefunden"
+
+#: ../urpm/media.pm:1612
#, c-format
msgid "updated medium \"%s\""
msgstr "Aktualisiere Medium \"%s\""
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr "Holen von [%s] fehlgeschlagen"
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr "versuche es erneut mit der Mirror %s"
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr "Konnte keinen Mirror der Mirrorliste %s finden"
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, c-format
msgid "getting mirror list from %s"
msgstr "Hole Mirror-Liste von%s"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1274,7 +1300,7 @@ msgstr "GB"
msgid "TB"
msgstr "TB"
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1282,7 +1308,9 @@ msgid ""
msgid_plural ""
"The following packages are now orphans, use \"urpme --auto-orphans\" to "
"remove them."
-msgstr[0] "Das folgende Paket ist nun verwaist, nutzen Sie \"urpme --auto-orphans\", um es zu entfernen."
+msgstr[0] ""
+"Das folgende Paket ist nun verwaist, nutzen Sie \"urpme --auto-orphans\", um "
+"es zu entfernen."
msgstr[1] ""
#: ../urpm/parallel.pm:14
@@ -1389,11 +1417,13 @@ msgstr ""
#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
-msgstr " --excludemedia - Benutze keine durch Kommata getrennte Medienliste.\n"
+msgstr ""
+" --excludemedia - Benutze keine durch Kommata getrennte Medienliste.\n"
#: ../urpm/search.pm:39 ../urpmf:39
#, c-format
-msgid " --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
" --literal, -l - passe die Schablone nicht an, sondern benutze es als "
"string\n"
@@ -1409,7 +1439,8 @@ msgstr ""
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../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 - sortiere Medien gemäß der Substrings getrennt durch "
"Kommata.\n"
@@ -1560,7 +1591,8 @@ msgstr " --filename - Dateiname des Pakets\n"
#: ../urpm/search.pm:70 ../urpmf:70
#, c-format
msgid " --files - list of files contained in the package\n"
-msgstr " --files - Liste der Dateien, die in dem Paket enthalten sind\n"
+msgstr ""
+" --files - Liste der Dateien, die in dem Paket enthalten sind\n"
#: ../urpm/search.pm:71 ../urpmf:71
#, c-format
@@ -1644,11 +1676,6 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Fehlerhaftes Format: Sie können nur ein mehrfach Zweig anhängen"
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "nutze spezielle Umgebung für %s\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1664,117 +1691,138 @@ msgstr "Erstellen der HD-Listen-Synthese-Datei für das Medium \"%s\""
msgid "no xml-info available for medium \"%s\""
msgstr "schreibe Dateiliste für das Medium \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Kein Paket mit dem Namen %s gefunden"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Die folgenden Pakete enthalten %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Pakete %s können nicht installiert werden"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, c-format
msgid "Package %s is already installed"
msgstr "Paket %s ist installiert"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, c-format
msgid "Packages %s are already installed"
msgstr "Pakete %s sind installiert"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "wegen fehlendem %s"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "Paket %s ist installiert"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "wegen nicht erfüllter Abhängigkeit von %s "
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "versuche %s voranzubringen"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "um %s zu behalten"
#: ../urpm/select.pm:607
#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Das folgende Paket muss entfernt werden, um die Aktualisierungen \n"
+"durchführen zu können:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Die folgenden Pakete müssen entfernt werden, um die Aktualisierungen \n"
+"durchführen zu können:\n"
+"%s"
+
+#: ../urpm/select.pm:635
+#, c-format
msgid "in order to install %s"
msgstr "um %s zu installieren"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "wegen Konflikten mit %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Falsche Signatur (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Ungültige Schlüssel ID (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Fehlende Signatur (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "Kann Konfigurationsdatei [%s] nicht erzeugen"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "Kopieren fehlgeschlagen"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "Es ist nicht möglich %s mit %s zu verwenden"
@@ -1809,7 +1857,8 @@ msgstr ""
#: ../urpme:49
#, c-format
msgid " --test - verify if the removal can be achieved correctly.\n"
-msgstr " --test - verifiziere, ob die Entfernung korrekt verlaufen wird.\n"
+msgstr ""
+" --test - verifiziere, ob die Entfernung korrekt verlaufen wird.\n"
#: ../urpme:51 ../urpmi:109 ../urpmq:68
#, c-format
@@ -1818,7 +1867,7 @@ msgstr ""
" --parallel - verteilter urpmi Aufruf auf allen teilnehmenden\n"
" Maschinen.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - neupacken vor dem Löschen\n"
@@ -1826,7 +1875,8 @@ msgstr " --repackage - neupacken vor dem Löschen\n"
#: ../urpme:53
#, c-format
msgid " --root - use another root for rpm removal.\n"
-msgstr " --root - benutze anderes Wurzelverzeichnis zur RPM Entfernung.\n"
+msgstr ""
+" --root - benutze anderes Wurzelverzeichnis zur RPM Entfernung.\n"
#: ../urpme:55 ../urpmi:101
#, fuzzy, c-format
@@ -1847,7 +1897,7 @@ msgstr ""
" --use-distrib - Konfiguriere urpme von einem distrib Baum, nützlich\n"
" um einen chroot mit --root Option zu (de)installieren.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - ausführlicher Modus.\n"
@@ -1892,9 +1942,11 @@ msgstr "Nichts zu entfernen"
#: ../urpme:149
#, 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:154
#, fuzzy, c-format
@@ -1910,7 +1962,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "Entfernen das Paket %d?"
msgstr[1] "Entfernen der Pakete %d?"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (j/N) "
@@ -2029,7 +2081,8 @@ msgstr " --noclean - belasse unverwendete RPMs im Cache.\n"
#: ../urpmi:102
#, c-format
-msgid " --replacepkgs - force installing packages which are already installed.\n"
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
msgstr ""
#: ../urpmi:104
@@ -2079,17 +2132,20 @@ msgstr ""
#: ../urpmi:118
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
-msgstr " --curl-options - zusätzliche Optionen, die an curl weitergeleitet werden\n"
+msgstr ""
+" --curl-options - zusätzliche Optionen, die an curl weitergeleitet 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 weitergeleitet werden\n"
+msgstr ""
+" --rsync-options- zusätzliche Optionen, die an rsync weitergeleitet 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 weitergeleitet werden\n"
+msgstr ""
+" --wget-options - zusätzliche Optionen, die an wget weitergeleitet werden\n"
#: ../urpmi:121
#, c-format
@@ -2161,7 +2217,8 @@ msgstr " --excludedocs - Schließe Dokumentationsdateien aus.\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
@@ -2175,17 +2232,24 @@ msgstr ""
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - Paket-Skripte nicht ausführen\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - Steht in Konflikt mit.\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:143
+#: ../urpmi:144
#, fuzzy, c-format
msgid " --prefer - packages which should be preferred\n"
-msgstr " --skip - Pakete deren Installation übersprungen werden soll\n"
+msgstr ""
+" --skip - Pakete deren Installation übersprungen werden soll\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2195,46 +2259,47 @@ msgstr ""
"Möglichkeiten vor\n"
" als die Vorgabe.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - Die RPM-Datenbank nicht sperren.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
-msgstr " --strict-arch - Updaten Pakete, welche die selbe Architektur sind.\n"
+msgstr ""
+" --strict-arch - Updaten Pakete, welche die selbe Architektur sind.\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
" -a - Wähle alle Treffer in der Kommandozeile.\n"
"\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - stiller Modus.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --verbose - ausführlicher Modus.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " Namen oder RPM-Dateien von der Kommandozeile werden installiert.\n"
-#: ../urpmi:182
+#: ../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"
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2243,29 +2308,30 @@ msgstr ""
"Fehler: Um ein Fehlermeldung zu erstellen bitte die Kommandozeile verwenden\n"
"mit --bug.\n"
-#: ../urpmi:219
+#: ../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"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2274,17 +2340,12 @@ msgstr ""
"Verzeichnis [%s] existiert bereits, bitte nutzen Sie ein anderes Verzeichnis "
"für Fehlerberichte oder löschen Sie dieses"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Konnte das Verzeichnis [%s] für die Fehlerberichte nicht anlegen"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr "Das angegebene Verzeichnis %s existiert nicht"
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2293,48 +2354,48 @@ msgstr ""
"Fehler: %s scheint nur lesbar gemountet zu sein.\n"
"Benutzen Sie --allow-force um eine Operation zu erzwingen."
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr "Aktualisiere Medien...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (zu aktualisieren)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (zu aktualisieren)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (zu installieren)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (zu installieren)"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "Um die Abhängigkeiten zu erfüllen, wird das folgende Paket entfernt"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Ihre Wahl? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2345,7 +2406,7 @@ msgstr ""
"da sie älter sind als die Installierten:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2357,7 +2418,7 @@ msgstr ""
"da sie älter sind als die Installierten:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2366,12 +2427,12 @@ msgstr ""
"\n"
"Wollen Sie trotzdem fortfahren?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (J/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2380,7 +2441,7 @@ msgstr ""
"Das gewünschte Paket kann nicht installiert werden:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2389,12 +2450,12 @@ msgstr ""
"Einige der gewünschten Pakete können nicht installiert werden:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "Das Entfernen des Pakets %s macht Ihr System unbrauchbar"
-#: ../urpmi:551
+#: ../urpmi:538
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2406,7 +2467,7 @@ msgstr ""
"durchführen zu können:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2418,32 +2479,12 @@ msgstr ""
"durchführen zu können:\n"
"%s\n"
-#: ../urpmi:560
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Das folgende Paket muss entfernt werden, um die Aktualisierungen \n"
-"durchführen zu können:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Die folgenden Pakete müssen entfernt werden, um die Aktualisierungen \n"
-"durchführen zu können:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(nur ein Test, das Entfernen wird nicht wirklich durchgeführt)"
-#: ../urpmi:583
+#: ../urpmi:568
#, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2454,46 +2495,47 @@ msgstr ""
"folgenden Abhängigkeiten zu installieren:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan 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"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(nur ein Test, es wird keine wirkliche Installation durchgeführt)"
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Fortfahren mit der Installation von einem Pakete?"
msgstr[1] "Fortfahren mit der Installation der %d Pakete?"
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Abbruch"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Betätigen Sie die Eingabetaste, sobald Sie soweit sind..."
@@ -2575,7 +2617,8 @@ msgstr " --probe-synthesis - Versuche Synthese-Datei zu nutzen.\n"
#: ../urpmi.addmedia:70
#, fuzzy, c-format
msgid " --probe-rpms - use rpm files (instead of synthesis).\n"
-msgstr " --probe-rpms - verwende rpm Dateien (anstelle von synthesis/hdlist).\n"
+msgstr ""
+" --probe-rpms - verwende rpm Dateien (anstelle von synthesis/hdlist).\n"
#: ../urpmi.addmedia:71
#, fuzzy, c-format
@@ -2630,7 +2673,8 @@ msgstr " --no-md5sum - deaktiviere MD5SUM Dateiüberprüfung.\n"
#: ../urpmi.addmedia:81
#, c-format
msgid " --nopubkey - don't import pubkey of added media\n"
-msgstr " --nopubkey - den Pubkey vom hinzugefügten Medium nicht importieren\n"
+msgstr ""
+" --nopubkey - den Pubkey vom hinzugefügten Medium nicht importieren\n"
#: ../urpmi.addmedia:82
#, c-format
@@ -2684,7 +2728,8 @@ msgstr "Kann Konfigurationsdatei [%s] nicht erzeugen"
#: ../urpmi.addmedia:136
#, fuzzy, 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:144
#, c-format
@@ -2739,13 +2784,16 @@ msgstr " --noclean - belasse unverwendete RPMs im Cache.\n"
#: ../urpmi.recover:37
#, c-format
-msgid " --list - list transactions since provided date/duration argument\n"
-msgstr " --list - führt alles Transaktionen seit dem Datum/Argument auf\n"
+msgid ""
+" --list - list transactions since provided date/duration argument\n"
+msgstr ""
+" --list - führt alles Transaktionen seit dem Datum/Argument auf\n"
#: ../urpmi.recover:38
#, c-format
msgid " --list-all - list all transactions in rpmdb (long)\n"
-msgstr " --list-all - listet alle Transaktionen in der rpmdb auf (lang).\n"
+msgstr ""
+" --list-all - listet alle Transaktionen in der rpmdb auf (lang).\n"
#: ../urpmi.recover:39
#, c-format
@@ -2918,12 +2966,14 @@ msgstr " --force-key - erzwinge Update auf gpg Schlüssel.\n"
#: ../urpmi.update:46
#, c-format
msgid " --ignore - don't update, mark the media as ignored.\n"
-msgstr " --ignore - nicht aktualisieren, markiere die Medien als ignoriert.\n"
+msgstr ""
+" --ignore - nicht aktualisieren, markiere die Medien als ignoriert.\n"
#: ../urpmi.update:47
#, c-format
msgid " --no-ignore - don't update, mark the media as enabled.\n"
-msgstr " --no-ignore - nicht aktualisieren, markiere die Medien als aktiv.\n"
+msgstr ""
+" --no-ignore - nicht aktualisieren, markiere die Medien als aktiv.\n"
#: ../urpmi.update:49
#, fuzzy, c-format
@@ -3048,7 +3098,8 @@ msgstr " --list-aliases - Alle verfügbaren Aliase auflisten.\n"
#: ../urpmq:63
#, 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 - verwerfe die Konfiguration in der Form eines urpmi."
"addmedia Argumentes.\n"
@@ -3060,7 +3111,8 @@ msgstr " --src - es folgt ein Quellpaket (identisch zu \"-s\").\n"
#: ../urpmq:65
#, c-format
-msgid " --sources - give all source packages before downloading (root only).\n"
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
msgstr ""
" --sources - Gib alle Quellpakete vor dem Runterladen an (nur root).\n"
".\n"
@@ -3165,7 +3217,8 @@ msgstr " -g - Ausgabe der Gruppe mit dem Namen.\n"
#: ../urpmq:101
#, c-format
msgid " -i - print useful information in human readable form.\n"
-msgstr " -i - Ausgabe von nützlichen Informationen in lesbarer Form.\n"
+msgstr ""
+" -i - Ausgabe von nützlichen Informationen in lesbarer Form.\n"
#: ../urpmq:102
#, c-format
@@ -3199,7 +3252,8 @@ msgstr ""
#: ../urpmq:107
#, 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:108
#, c-format
@@ -3233,23 +3287,27 @@ msgstr ""
#: ../urpmq:404
#, 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 Teilresultate für das Paket %s"
+msgstr ""
+"Keine xml info für das Medium \"%s\", nur Teilresultate für das Paket %s"
#: ../urpmq:405
#, 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 Teilresultate für die Pakete %s"
+msgstr ""
+"Keine xml info für das Medium \"%s\", nur Teilresultate für die Pakete %s"
#: ../urpmq:408
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
+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:409
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
+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"
@@ -3259,3 +3317,11 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Kein Changelog gefunden\n"
+#~ msgid "examining %s file"
+#~ msgstr "überprüfe Datei %s"
+
+#~ msgid "invalid MD5SUM file"
+#~ msgstr "Ungültige MD5SUM Datei"
+
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "Synthese-Datei als %s gefunden"
diff --git a/po/el.po b/po/el.po
index 13af9079..0bb7f9db 100644
--- a/po/el.po
+++ b/po/el.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-el\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-18 18:48+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2008-09-22 02:50+0200\n"
"Last-Translator: nikos papadopoulos <231036448@freemail.gr>\n"
"Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -30,8 +30,7 @@ msgstr ""
"X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,-1,-1,519,-1\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: ../gurpmi:31
-#: ../gurpmi2:74
+#: ../gurpmi:31 ../gurpmi2:74
#, c-format
msgid "RPM installation"
msgstr "Εγκατάσταση των RPM"
@@ -41,9 +40,7 @@ msgstr "Εγκατάσταση των RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Σφάλμα: αδυναμία εύρεσης του αρχείου %s, η διαδικασία θα ακυρωθεί"
-#: ../gurpmi:46
-#: ../gurpmi2:175
-#: ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Εντάξει"
@@ -55,7 +52,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 ""
@@ -63,12 +61,13 @@ msgstr ""
"\n"
"%s\n"
"\n"
-"Πιθανόν δεν θέλατε να το εγκαταστήσετε στον υπολογιστή σας (η εγκατάστασή του θα σας επιτρέψει να κάνετε τροποποιήσεις στον πηγαίου του κώδικα και μετά να το μεταγλωττίσετε).\n"
+"Πιθανόν δεν θέλατε να το εγκαταστήσετε στον υπολογιστή σας (η εγκατάστασή "
+"του θα σας επιτρέψει να κάνετε τροποποιήσεις στον πηγαίου του κώδικα και "
+"μετά να το μεταγλωττίσετε).\n"
"\n"
"Τι θέλετε να κάνετε;"
-#: ../gurpmi:74
-#: ../gurpmi:85
+#: ../gurpmi:74 ../gurpmi:85
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -77,7 +76,8 @@ msgid ""
"\n"
"Proceed?"
msgstr ""
-"Πρόκειται να εγκαταστήσετε τα ακόλουθα πακέτα λογισμικού στον υπολογιστή σας:\n"
+"Πρόκειται να εγκαταστήσετε τα ακόλουθα πακέτα λογισμικού στον υπολογιστή "
+"σας:\n"
"\n"
"%s\n"
" \n"
@@ -92,7 +92,8 @@ msgid ""
"\n"
"You may prefer to just save it. What is your choice?"
msgstr ""
-"Πρόκειται να να εγκαταστήσετε το ακόλουθο πακέτο λογισμικού στον υπολογιστή σας:\n"
+"Πρόκειται να να εγκαταστήσετε το ακόλουθο πακέτο λογισμικού στον υπολογιστή "
+"σας:\n"
"\n"
"%s\n"
"\n"
@@ -108,8 +109,7 @@ msgstr "_Εγκατάσταση"
msgid "_Save"
msgstr "_Αποθήκευση"
-#: ../gurpmi:100
-#: ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Ακύρωση"
@@ -119,19 +119,20 @@ msgstr "_Ακύρωση"
msgid "Choose location to save file"
msgstr "Επιλέξτε μια τοποθεσία για την αποθήκευση του αρχείου"
-#: ../gurpmi.pm:39
-#: ../urpmi:67
+#: ../gurpmi.pm:39 ../urpmi:67
#, c-format
msgid ""
"urpmi version %s\n"
"Copyright (C) 1999-2008 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 ""
"urpm έκδοση %s\n"
"Copyright (C) 1999-2008 Mandriva.\n"
-"Αυτό είναι ελεύθερο λογισμικό και μπορεί να αναδιανεμηθεί υπό τους όρους της GNU GPL.\n"
+"Αυτό είναι ελεύθερο λογισμικό και μπορεί να αναδιανεμηθεί υπό τους όρους της "
+"GNU GPL.\n"
"\n"
"χρήση:\n"
@@ -140,88 +141,90 @@ msgstr ""
msgid "Options:"
msgstr "Επιλογές:"
-#: ../gurpmi.pm:46
-#: ../urpme:46
-#: ../urpmf:35
-#: ../urpmi:72
-#: ../urpmi.addmedia:54
-#: ../urpmi.recover:33
-#: ../urpmi.removemedia:40
-#: ../urpmi.update:32
-#: ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - τύπωσε αυτό το μήνυμα βοήθειας.\n"
-#: ../gurpmi.pm:47
-#: ../urpmi:79
+#: ../gurpmi.pm:47 ../urpmi:79
#, c-format
-msgid " --auto - non-interactive mode, assume default answers to questions.\n"
-msgstr " --auto - μη αλληλεπιδραστική λειτουργία, χρήση των προεπιλεγμένων παραμέτρων.\n"
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions.\n"
+msgstr ""
+" --auto - μη αλληλεπιδραστική λειτουργία, χρήση των προεπιλεγμένων "
+"παραμέτρων.\n"
-#: ../gurpmi.pm:48
-#: ../urpmi:80
-#: ../urpmq:52
+#: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - αυτόματη επιλογή των πακέτων για την αναβάθμιση του συστήματος.\n"
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - αυτόματη επιλογή των πακέτων για την αναβάθμιση του "
+"συστήματος.\n"
-#: ../gurpmi.pm:49
-#: ../urpme:50
-#: ../urpmi:103
-#: ../urpmq:66
+#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - εξαναγκασμός επίκλησης ακόμα και εάν μερικά πακέτα δεν υπάρχουν.\n"
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - εξαναγκασμός επίκλησης ακόμα και εάν μερικά πακέτα δεν "
+"υπάρχουν.\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 - έλεγχος της υπογραφής του rpm πριν την εγκατάσταση\n"
-" (--no-verify-rpm για απενεργοποίηση, ενεργοποιημένο από προεπιλογή).\n"
+" (--no-verify-rpm για απενεργοποίηση, ενεργοποιημένο από "
+"προεπιλογή).\n"
-#: ../gurpmi.pm:52
-#: ../urpmf:41
-#: ../urpmi:73
-#: ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
-msgstr " --media - χρήση μόνο των μέσων που δόθηκαν, διαχωρισμένα με το κόμμα.\n"
+msgstr ""
+" --media - χρήση μόνο των μέσων που δόθηκαν, διαχωρισμένα με το "
+"κόμμα.\n"
-#: ../gurpmi.pm:53
-#: ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
-msgstr " -p - να επιτρέπεται η αναζήτηση εντός των πακέτων, για να βρεθεί το κατάλληλο πακέτο.\n"
+msgstr ""
+" -p - να επιτρέπεται η αναζήτηση εντός των πακέτων, για να "
+"βρεθεί το κατάλληλο πακέτο.\n"
-#: ../gurpmi.pm:54
-#: ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
-msgstr " -P - να μην επιτρέπεται η αναζήτηση εντός των πακέτων, για να βρεθεί το κατάλληλο πακέτο.\n"
+msgstr ""
+" -P - να μην επιτρέπεται η αναζήτηση εντός των πακέτων, για να "
+"βρεθεί το κατάλληλο πακέτο.\n"
-#: ../gurpmi.pm:55
-#: ../urpmi:110
-#: ../urpmq:69
+#: ../gurpmi.pm:55 ../urpmi:110 ../urpmq:69
#, c-format
msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - χρησιμοποίησε μία άλλη διαδρομή root για την εγκατάσταση του rpm.\n"
+msgstr ""
+" --root - χρησιμοποίησε μία άλλη διαδρομή root για την εγκατάσταση "
+"του 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 - έλεγξε μόνο αν η εγκατάσταση μπορεί να γίνει σωστά.\n"
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - έλεγξε μόνο αν η εγκατάσταση μπορεί να γίνει σωστά.\n"
-#: ../gurpmi.pm:57
-#: ../urpmi:76
+#: ../gurpmi.pm:57 ../urpmi:76
#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
-msgstr " --searchmedia - χρήση μόνο των δοσμένων μέσων για την αναζήτηση των ζητούμενων πακέτων.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - χρήση μόνο των δοσμένων μέσων για την αναζήτηση των "
+"ζητούμενων πακέτων.\n"
#: ../gurpmi.pm:100
#, c-format
@@ -238,7 +241,22 @@ msgstr "Παρακαλώ περιμένετε..."
msgid "Must be root"
msgstr "Πρέπει να είστε διαχειριστής"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "κατανομή %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Εγκατάσταση του πακέτου..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Εγκατάσταση του πακέτου..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -254,38 +272,37 @@ msgstr ""
msgid "Warning"
msgstr "Προσοχή"
-#: ../gurpmi2:134
-#: ../urpmi:624
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Εντάξει"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (προς αναβάθμιση)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (προς εγκατάσταση)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Επιλογή πακέτων"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Ένα εκ των παρακάτω πακέτων απαιτείται:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Ματαίωση"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -296,65 +313,58 @@ msgstr ""
"%s\n"
"Συνέχεια εγκατάστασης;"
-#: ../gurpmi2:241
-#: ../urpmi:591
+#: ../gurpmi2:240 ../urpmi:592
#, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
-msgstr "Για να ικανοποιηθούν οι εξαρτήσεις, θα εγκατασταθεί το παρακάτω πακέτο:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
+msgstr ""
+"Για να ικανοποιηθούν οι εξαρτήσεις, θα εγκατασταθεί το παρακάτω πακέτο:"
-#: ../gurpmi2:242
-#: ../urpmi:592
+#: ../gurpmi2:241 ../urpmi:593
#, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
-msgstr "Για να ικανοποιηθούν οι εξαρτήσεις, θα εγκατασταθούν τα ακόλουθα πακέτα:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr ""
+"Για να ικανοποιηθούν οι εξαρτήσεις, θα εγκατασταθούν τα ακόλουθα πακέτα:"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d πακέτο, %d MB)"
msgstr[1] "(%d πακέτα, %d MB)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Εγκατάσταση του πακέτου..."
-
-#: ../gurpmi2:252
-#: ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "αδυναμία λήψης των πακέτων πηγαίου κώδικα, ματαίωση"
-#: ../gurpmi2:266
-#: ../urpm/install.pm:81
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Προετοιμασία..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Εγκατάσταση του πακέτου `%s' (%s/%s)..."
-#: ../gurpmi2:287
-#: ../urpmi:619
+#: ../gurpmi2:286 ../urpmi:620
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Παρακαλώ εισήγαγε το μέσο με το όνομα «%s»"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Λήψη του πακέτου `%s'..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Ολοκληρώθηκε"
-#: ../gurpmi2:332
-#: ../urpm/main_loop.pm:114
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -365,33 +375,28 @@ msgstr ""
"%s\n"
"Ίσως θέλετε να αναβαθμίσετε τη βάση δεδομένων urpmi"
-#: ../gurpmi2:338
-#: ../urpm/main_loop.pm:226
-#: ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262
-#: ../urpm/main_loop.pm:289
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "Η εγκατάσταση απέτυχε:"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Το(α) πακέτο(α) είναι ήδη εγκατεστημένα"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Η εγκατάσταση τελείωσε"
-#: ../gurpmi2:346
-#: ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "αφαίρεση του %s"
-#: ../gurpmi2:354
-#: ../urpmi:686
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "Επανεκκίνηση urpmi"
@@ -413,7 +418,8 @@ msgstr " -h|--help - τύπωσε αυτό το μήνυμα βοήθει
#: ../rpm-find-leaves:18
#, c-format
msgid " --root <path> - use the given root instead of /\n"
-msgstr " --root <path> - χρήση της root διαδρομής που δόθηκε αντί για την /\n"
+msgstr ""
+" --root <path> - χρήση της root διαδρομής που δόθηκε αντί για την /\n"
#: ../rpm-find-leaves:19
#, c-format
@@ -430,8 +436,7 @@ msgstr " προκαθορισμένο είναι το %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - εμφανίζει το πλήρες όνομα του πακέτου (NVRA)\n"
-#: ../rurpmi:11
-#: ../urpmi:268
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Μόνο ο διαχειριστής επιτρέπεται να εγκαταστήσει πακέτα"
@@ -441,171 +446,166 @@ msgstr "Μόνο ο διαχειριστής επιτρέπεται να εγκ
msgid "Running urpmi in restricted mode..."
msgstr "Εκτέλεση του urpmi σε περιορισμένη λειτουργία..."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, c-format
msgid "fail to create directory %s"
msgstr "αδυναμία δημιουργίας του καταλόγου %s"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr "άκυρος ιδιοκτήτης του καταλόγου %s"
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, c-format
msgid "Can not download packages into %s"
msgstr "Αδυναμία λήψης του πακέτου, στο %s"
-#: ../urpm.pm:139
+#: ../urpm.pm:140
#, c-format
msgid "Environment directory %s does not exist"
msgstr "Ο κατάλογος του περιβάλλοντος %s δεν υπάρχει"
-#: ../urpm.pm:140
-#: ../urpmf:248
-#: ../urpmq:165
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
#, c-format
msgid "using specific environment on %s\n"
msgstr "χρήση συγκεκριμένου περιβάλλοντος στο %s\n"
-#: ../urpm.pm:304
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "αδυναμία ανοίγματος του rpmdb"
-#: ../urpm.pm:318
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "μη έγκυρο όνομα αρχείου rpm [%s]"
-#: ../urpm.pm:324
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "ανάκτηση αρχείου rpm [%s] ..."
-#: ../urpm.pm:326
-#: ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...η ανάκτηση ολοκληρώθηκε"
-#: ../urpm.pm:329
-#: ../urpm/download.pm:732
-#: ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836
-#: ../urpm/media.pm:1287
-#: ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "... η ανάκτηση απέτυχε: %s"
-#: ../urpm.pm:334
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "αδυναμία πρόσβασης στο αρχείο rpm [%s]"
-#: ../urpm.pm:339
+#: ../urpm.pm:340
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "αδυναμία ανάλυσης του αρχείου spec %s [%s]"
-#: ../urpm.pm:347
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "αδυναμία δήλωσης του αρχείου rpm"
-#: ../urpm.pm:349
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Ασύμβατη αρχιτεκτονική για τα rpm [%s]"
-#: ../urpm.pm:353
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "σφάλμα κατά την δήλωση των τοπικών πακέτων"
-#: ../urpm.pm:440
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
-msgstr "Αυτή η λειτουργία απαγορεύεται να εκτελεστεί, όταν ισχύει κατάσταση περιορισμένης λειτουργίας"
+msgstr ""
+"Αυτή η λειτουργία απαγορεύεται να εκτελεστεί, όταν ισχύει κατάσταση "
+"περιορισμένης λειτουργίας"
-#: ../urpm/args.pm:152
-#: ../urpm/args.pm:161
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "μη ορθή διακήρυξη proxy στην γραμμή εντολών\n"
-#: ../urpm/args.pm:305
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: αδυναμία ανάγνωσης αρχείου rpm \"%s\"\n"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "απρόσμενη έκφραση %s"
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "απουσία έκφρασης πριν το %s"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "απρόσμενη έκφραση %s (πρόταση: να χρησιμοποιήσεις -a ή -o ; )"
-#: ../urpm/args.pm:393
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "δεν υπάρχει έκφραση για να τερματιστεί"
-#: ../urpm/args.pm:402
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
-msgstr "από προεπιλογή η urpmf αναμένει μια regexp. Θα πρέπει να χρησιμοποιήσετε την επιλογή \"--literal\""
+msgstr ""
+"από προεπιλογή η urpmf αναμένει μια regexp. Θα πρέπει να χρησιμοποιήσετε την "
+"επιλογή \"--literal\""
-#: ../urpm/args.pm:470
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "ο κατάλογος chroot δεν υπάρχει"
-#: ../urpm/args.pm:493
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr "Αδύνατη η χρήση του %s χωρίς το %s"
-#: ../urpm/args.pm:496
-#: ../urpm/args.pm:499
-#: ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr "Αδύνατη η χρήση του %s με το %s"
-#: ../urpm/args.pm:507
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr "Πάρα πολλά ορίσματα\n"
-#: ../urpm/bug_report.pm:54
-#: ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Η αντιγραφή απέτυχε"
#: ../urpm/cdrom.pm:66
#, c-format
-msgid "You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done automatically)"
-msgstr "Πρέπει να προσαρτήσεις το CD-ROM από μόνος σου (ή να εγκαταστήσεις το perl-Hal-Cdroms ώστε αυτό να γίνεται αυτόματα)"
+msgid ""
+"You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+"Πρέπει να προσαρτήσεις το CD-ROM από μόνος σου (ή να εγκαταστήσεις το perl-"
+"Hal-Cdroms ώστε αυτό να γίνεται αυτόματα)"
#: ../urpm/cdrom.pm:68
#, c-format
msgid "HAL daemon (hald) is not running or not ready"
msgstr "Ο δαίμονας HAL (hald) δεν εκτελείται ή δεν είναι έτοιμος"
-#: ../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 "το μέσο \"%s\" δεν είναι διαθέσιμο"
@@ -630,129 +630,129 @@ msgstr "αδυναμία ανάγνωσης του αρχείου ρυθμίσε
msgid "medium `%s' is defined twice, aborting"
msgstr "το μέσο `%s' προσδιορίστηκε δύο φορές, γίνεται εγκατάλειψη"
-#: ../urpm/cfg.pm:251
-#: ../urpm/media.pm:497
-#: ../urpm/media.pm:503
+#: ../urpm/cfg.pm:251 ../urpm/media.pm:497 ../urpm/media.pm:503
#, c-format
msgid "unable to write config file [%s]"
msgstr "αδυναμία εγγραφής του αρχείου ρυθμίσεων [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "το %s δεν είναι διαθέσιμο, επιστροφή στη χρήση του %s"
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
-msgstr "αδυναμία ανάγνωσης των ρυθμίσεων του proxy (διαμεσολαβητής) (τα δικαιώματα δεν είναι επαρκή για την ανάγνωση του %s)"
+msgstr ""
+"αδυναμία ανάγνωσης των ρυθμίσεων του proxy (διαμεσολαβητής) (τα δικαιώματα "
+"δεν είναι επαρκή για την ανάγνωση του %s)"
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Παρακαλώ εισάγετε πιστοποίηση για πρόσβαση διαμεσολαβητή\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Όνομα χρήστη:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Κωδικός πρόσβασης:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr "Άγνωστο webfetch `%s' !!!\n"
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr "το %s απέτυχε: έγινε έξοδος με το σήμα %d"
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr "το %s απέτυχε: έγινε έξοδος με %d"
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, c-format
msgid "copy failed"
msgstr "αποτυχία αντιγραφής"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, c-format
msgid "wget is missing\n"
msgstr "λείπει το wget\n"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, c-format
msgid "curl is missing\n"
msgstr "λείπει το curl\n"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr "το curl απέτυχε: ακύρωση της λήψης\n"
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr "λείπει το rsync\n"
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr "λείπει το ssh\n"
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr "λείπει το prozilla\n"
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr "Αδυναμία εκτέλεσης του prozilla\n"
-#: ../urpm/download.pm:602
+#: ../urpm/download.pm:646
#, c-format
msgid "aria2 is missing\n"
msgstr "λείπει το aria2\n"
-#: ../urpm/download.pm:716
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr " ολοκληρώθηκε το %s%% από τα %s, εκτίμηση = %s, ταχύτητα = %s"
-#: ../urpm/download.pm:718
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr " ολοκληρώθηκε το %s%%, ταχύτητα = %s"
-#: ../urpm/download.pm:783
+#: ../urpm/download.pm:828
#, c-format
msgid "retrieving %s"
msgstr "ανάκτηση %s"
-#: ../urpm/download.pm:787
+#: ../urpm/download.pm:835
#, c-format
msgid "retrieved %s"
msgstr "ανακτήθηκε %s"
-#: ../urpm/download.pm:836
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "καθορίστηκε άγνωστο πρωτόκολλο για το %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "το %s δεν είναι διαθέσιμο, επιστροφή στη χρήση του %s"
-
-#: ../urpm/download.pm:873
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "δεν βρέθηκε το webfetch, υποστηριζόμενα webfetch είναι: %s\n"
-#: ../urpm/download.pm:894
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "αδυναμία χειρισμού πρωτοκόλλου: %s"
@@ -777,53 +777,55 @@ msgstr "ανάκτηση αρχείων rpm από το μέσο \"%s\"..."
msgid "[repackaging]"
msgstr "[επαναπακετάρισμα]"
-#: ../urpm/install.pm:168
+#: ../urpm/install.pm:169
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "δημιουργήθηκε transaction για εγκατάσταση στο %s (αφαίρεση=%d, εγκατάσταση=%d, αναβάθμιση=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"δημιουργήθηκε transaction για εγκατάσταση στο %s (αφαίρεση=%d, εγκατάσταση=%"
+"d, αναβάθμιση=%d)"
-#: ../urpm/install.pm:171
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "Αδυναμία δημιουργίας transaction"
-#: ../urpm/install.pm:194
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "αδυναμία εξαγωγής rpm από το πακέτο delta-rpm %s"
-#: ../urpm/install.pm:207
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "αδυναμία εγκατάστασης του πακέτου %s"
-#: ../urpm/install.pm:210
+#: ../urpm/install.pm:211
#, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "αφαίρεση του κακοδιατυπομένου rpm (%s) από το %s"
-#: ../urpm/install.pm:211
-#: ../urpm/install.pm:268
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, c-format
msgid "removing %s failed: %s"
msgstr "η αφαίρεση του %s απέτυχε: %s"
-#: ../urpm/install.pm:249
+#: ../urpm/install.pm:250
#, c-format
msgid "Removing package %s"
msgstr "Αφαίρεση του πακέτου %s"
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "αφαίρεση του πακέτου %s"
-#: ../urpm/install.pm:266
+#: ../urpm/install.pm:267
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "αφαίρεση των εγκατεστημένων rpm (%s) από το %s"
-#: ../urpm/install.pm:274
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Περισσότερες πληροφορίες στο πακέτο %s"
@@ -848,8 +850,7 @@ msgstr "Δεν προσδιορίστηκε εξυπηρετητής, λείπε
msgid "No base defined"
msgstr "Δεν ορίστηκε βάση"
-#: ../urpm/ldap.pm:172
-#: ../urpm/ldap.pm:175
+#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
#, c-format
msgid "Cannot connect to ldap uri:"
msgstr "Αδυναμία σύνδεσης στο ldap uri:"
@@ -867,19 +868,16 @@ msgstr "εγκατάλειψη"
#: ../urpm/lock.pm:65
#, c-format
msgid "%s database is locked (another program is already using it)"
-msgstr "η βάση δεδομένων %s είναι κλειδωμένη (ένα άλλο πρόγραμμα τη χρησιμοποιεί ήδη)"
+msgstr ""
+"η βάση δεδομένων %s είναι κλειδωμένη (ένα άλλο πρόγραμμα τη χρησιμοποιεί ήδη)"
-#: ../urpm/main_loop.pm:113
-#: ../urpm/main_loop.pm:123
-#: ../urpm/main_loop.pm:157
-#: ../urpm/main_loop.pm:233
-#: ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Η εγκατάσταση απέτυχε"
-#: ../urpm/main_loop.pm:115
-#: ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr "Να προσπαθήσω να συνεχίσω, έτσι κι αλλιώς; (y/N) "
@@ -943,31 +941,22 @@ msgstr "Προσπάθεια για εξαναγκαστική εγκατάστ
msgid "Packages are up to date"
msgstr "Τα πακέτα είναι ενημερωμένα"
-#: ../urpm/main_loop.pm:313
-#: ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Η εγκατάσταση είναι δυνατή"
#: ../urpm/md5sum.pm:26
#, c-format
-msgid "examining %s file"
-msgstr "εξέταση αρχείου %s"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr "μη έγκυρο αρχείο MD5SUM"
-
-#: ../urpm/md5sum.pm:28
-#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "προειδοποίηση: μη διαθέσιμο md5sum για %s στο αρχείο MD5SUM"
#: ../urpm/media.pm:204
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "το εικονικό μέσο \"%s\" πρέπει να έχει ένα καθαρό σύνδεσμο url, το μέσο αγνοείται"
+msgstr ""
+"το εικονικό μέσο \"%s\" πρέπει να έχει ένα καθαρό σύνδεσμο url, το μέσο "
+"αγνοείται"
#: ../urpm/media.pm:206
#, c-format
@@ -989,8 +978,7 @@ msgstr "προσπάθεια παράκαμψης του υπάρχοντος μ
msgid "failed to migrate removable device, ignoring media"
msgstr "σφάλμα στην εισαγωγή της αφαιρούμενης συσκευής, το μέσο θα αγνοηθεί"
-#: ../urpm/media.pm:499
-#: ../urpm/media.pm:505
+#: ../urpm/media.pm:499 ../urpm/media.pm:505
#, c-format
msgid "wrote config file [%s]"
msgstr "εγγραφή αρχείου ρυθμίσεων [%s]"
@@ -998,7 +986,8 @@ msgstr "εγγραφή αρχείου ρυθμίσεων [%s]"
#: ../urpm/media.pm:548
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
-msgstr "Δεν μπορεί να χρησιμοποιηθεί παράλληλη κατάσταση με use-distrib κατάσταση"
+msgstr ""
+"Δεν μπορεί να χρησιμοποιηθεί παράλληλη κατάσταση με use-distrib κατάσταση"
#: ../urpm/media.pm:556
#, c-format
@@ -1007,8 +996,12 @@ msgstr "χρήση του συσχετισμένου μέσου για παρά
#: ../urpm/media.pm:572
#, c-format
-msgid "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --update, --use-distrib or --parallel"
-msgstr "--synthesis δεν μπορεί να χρησιμοποιηθεί μαζί με --media, --excludemedia, --sortmedia, --update, --use-distrib ή --parallel"
+msgid ""
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update, --use-distrib or --parallel"
+msgstr ""
+"--synthesis δεν μπορεί να χρησιμοποιηθεί μαζί με --media, --excludemedia, --"
+"sortmedia, --update, --use-distrib ή --parallel"
#: ../urpm/media.pm:666
#, c-format
@@ -1030,241 +1023,230 @@ msgstr "θα εγκαταστήσει αντί για να αναβαθμίσε
msgid "medium \"%s\" already exists"
msgstr "το μέσο \"%s\" υπάρχει ήδη"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr "(αγνοήθηκε κατά προεπιλογή)"
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "προσθήκη του μέσου \"%s\" πριν από το απομακρυσμένο μέσο \"%s\""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, c-format
msgid "adding medium \"%s\""
msgstr "προσθήκη του μέσου \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr "ο κατάλογος %s δεν υπάρχει"
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "αυτή η τοποθεσία δεν φαίνεται να περιέχει καμία διανομή"
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, c-format
msgid "unable to parse media.cfg"
msgstr "αδυναμία ανάλυσης του media.cfg"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "αδυναμία πρόσβασης στο μέσο διανομής (δεν βρέθηκε αρχείο media.cfg)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr "παράληψη του μη συμβατού μέσου `%s' (για %s)"
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, c-format
msgid "retrieving media.cfg file..."
msgstr "ανάκτηση του αρχείου media.cfg..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "προσπάθεια επιλογής του ανύπαρκτου μέσου \"%s\""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "επιλογή πολλαπλών μέσων: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "αφαίρεση του μέσου \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "επαναρύθμιση του urpmi για το μέσο \"%s\""
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...η επαναρρύθμιση απέτυχε"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "η επαναρρύθμιση πέτυχε"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Σφάλμα στη δημιουργία του αρχείου ονομάτων: η εξάρτηση %d δεν βρέθηκε"
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "το μέσο \"%s\" είναι ενημερωμένο"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "εξέταση του αρχείου σύνθεσης [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "πρόβλημα ανάγνωσης του αρχείου σύνθεσης από το μέσο \"%s\""
-#: ../urpm/media.pm:1176
-#: ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "αντιγραφή [%s] για το μέσο \"%s\"..."
-#: ../urpm/media.pm:1178
-#: ../urpm/media.pm:1233
-#: ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...η αντιγραφή απέτυχε"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "αντιγραφή του αρχείου περιγραφής του \"%s\"..."
-#: ../urpm/media.pm:1231
-#: ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...η αντιγραφή ολοκληρώθηκε"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "η αντιγραφή του [%s] απέτυχε (το αρχείο είναι ύποπτα μικρό)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "υπολογισμός του md5sum του ανακτημένου πηγαίου synthesis"
-#: ../urpm/media.pm:1312
-#: ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "η ανάκτηση του [%s] απέτυχε (τα md5sum δεν ταιριάζουν)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, c-format
msgid "genhdlist2 failed on %s"
msgstr "αποτυχία του genhdlist2 στο %s"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, c-format
msgid "comparing %s and %s"
msgstr "σύγκριση του %s και του %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "άκυρο αρχείο hdlist %s για το μέσο \"%s\""
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "αντιγραφή του αρχείου MD5SUM από το \"%s\"..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "μη έγκυρο αρχείο MD5SUM (έγινε λήψη από το %s)"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
+#, fuzzy, c-format
+msgid "no metadata found for medium \"%s\""
+msgstr "δεν βρέθηκε αρχείο synthesis για το μέσο \"%s\""
+
+#: ../urpm/media.pm:1475
#, c-format
msgid "retrieving source synthesis of \"%s\"..."
msgstr "ανάκτηση της πηγαίας synthesis από το \"%s\"..."
-#: ../urpm/media.pm:1478
-#, c-format
-msgid "found probed synthesis as %s"
-msgstr "το αρχείο synthesis εντοπίστηκε σαν %s"
-
-#: ../urpm/media.pm:1485
-#: ../urpm/media.pm:1593
-#, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "δεν βρέθηκε αρχείο synthesis για το μέσο \"%s\""
-
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "Εξέταση του αρχείου δημοσίου κλειδιού από το \"%s\"..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...εισαγωγή του κλειδιού %s από το αρχείο δημοσίου κλειδιού του \"%s\""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "αδυναμία εισαγωγής του αρχείου δημοσίου κλειδιού του \"%s\""
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "δεν βρέθηκε αρχείο synthesis για το μέσο \"%s\""
+
+#: ../urpm/media.pm:1612
#, c-format
msgid "updated medium \"%s\""
msgstr "ενημερώθηκε το μέσο \"%s\""
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr "αποτυχία ανάκτησης του [%s]"
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr "γίνεται προσπάθεια ξανά με την εναλλακτική διεύθυνση %s"
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
-msgstr "Αδυναμία εύρεσης μιας εναλλακτικής διεύθυνσης από τη λίστα των εναλλακτικών διευθύνσεων %s"
+msgstr ""
+"Αδυναμία εύρεσης μιας εναλλακτικής διεύθυνσης από τη λίστα των εναλλακτικών "
+"διευθύνσεων %s"
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr "βρέθηκε η γεωτοποθεσία %s %.2f %.2f από την ζώνη ώρας %s"
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, c-format
msgid "getting mirror list from %s"
msgstr "λήψη της λίστας των εναλλακτικών διευθύνσεων από το %s"
-#: ../urpm/msg.pm:63
-#: ../urpmi:501
-#: ../urpmi:516
-#: ../urpmi:611
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "ΟοNn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64
-#: ../urpme:38
-#: ../urpmi:552
-#: ../urpmi:647
-#: ../urpmi:653
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1330,18 +1312,25 @@ msgstr "MB"
msgid "GB"
msgstr "GB"
-#: ../urpm/msg.pm:190
-#: ../urpm/msg.pm:199
+#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
#, c-format
msgid "TB"
msgstr "TB"
#: ../urpm/orphans.pm:310
#, c-format
-msgid "The following package is now orphan, use \"urpme --auto-orphans\" to remove it."
-msgid_plural "The following packages are now orphans, use \"urpme --auto-orphans\" to remove them."
-msgstr[0] "Το παρακάτω πακέτο είναι, πλέον, ορφανό. Για να το αφαιρέσεις, χρησιμοποίησε την εντολή \"urpme --auto-orphans\" ."
-msgstr[1] "Τα παρακάτω πακέτα είναι, πλέον, ορφανά. Για να τα αφαιρέσεις, χρησιμοποίησε την εντολή \"urpme --auto-orphans\" ."
+msgid ""
+"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
+"it."
+msgid_plural ""
+"The following packages are now orphans, use \"urpme --auto-orphans\" to "
+"remove them."
+msgstr[0] ""
+"Το παρακάτω πακέτο είναι, πλέον, ορφανό. Για να το αφαιρέσεις, χρησιμοποίησε "
+"την εντολή \"urpme --auto-orphans\" ."
+msgstr[1] ""
+"Τα παρακάτω πακέτα είναι, πλέον, ορφανά. Για να τα αφαιρέσεις, χρησιμοποίησε "
+"την εντολή \"urpme --auto-orphans\" ."
#: ../urpm/parallel.pm:14
#, c-format
@@ -1395,16 +1384,19 @@ msgstr "απέτυχε το cp, στον οικοδεσπότη (host) %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, στον οικοδεσπότη (host) %s (μήπως δεν διαθέτει μια καλή έκδοση του urpmi;) (το αποτέλεσμα εξαγωγής του κώδικα: %d)"
+msgid ""
+"%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
+"code: %d)"
+msgstr ""
+"απέτυχε το %s, στον οικοδεσπότη (host) %s (μήπως δεν διαθέτει μια καλή "
+"έκδοση του urpmi;) (το αποτέλεσμα εξαγωγής του κώδικα: %d)"
#: ../urpm/removable.pm:32
#, c-format
msgid "unable to access medium \"%s\"."
msgstr "αδυναμία πρόσβασης στο μέσο \"%s\"."
-#: ../urpm/removable.pm:72
-#: ../urpm/removable.pm:90
+#: ../urpm/removable.pm:72 ../urpm/removable.pm:90
#, c-format
msgid "mounting %s"
msgstr "προσάρτηση του %s"
@@ -1414,23 +1406,342 @@ msgstr "προσάρτηση του %s"
msgid "unmounting %s"
msgstr "αποπροσάρτηση του %s"
+#: ../urpm/search.pm:29 ../urpmf:29
+#, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2006 Mandriva.\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 έκδοση %s\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
+"Αυτό είναι ελεύθερο λογισμικό και μπορεί να αναδιανεμηθεί υπό τους όρους της "
+"GNU GPL.\n"
+"\n"
+"χρήση: urpmf [επιλογές] ακολουθία-έκφραση ( urpmf [options] pattern-"
+"expression )\n"
+
+#: ../urpm/search.pm:36 ../urpmf:36
+#, c-format
+msgid " --version - print this tool's version number.\n"
+msgstr " --έκδοση - τύπωσε τον αριθμό έκδοσης αυτού του εργαλείου\n"
+
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid " --env - use specific environment (typically a bug report).\n"
+msgstr ""
+" --env - χρήση συγκεκριμένου περιβάλλοντος (τυπικά μία αναφορά\n"
+" σφάλματος).\n"
+
+#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid " --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+" --excludemedia - μην χρήση των μέσων που δόθηκαν, διαχωρισμένα με το "
+"κόμμα.\n"
+
+#: ../urpm/search.pm:39 ../urpmf:39
+#, c-format
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+" --literal, -l - δεν αντικαθιστά τους μπαλαντέρ, εφαρμογή του ορίσματος ως "
+"έχει.\n"
+
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+" --urpmi-root - χρήση μίας άλλης διαδρομής root για την βάση δεδομένων "
+"urpmi κ' την εγκατάσταση του rpm.\n"
+
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+" --sortmedia - sort media according to substrings separated by comma.\n"
+msgstr ""
+" --sortmedia - ταξινόμηση μέσων σύμφωνα με τα τμήματα λεκτικών "
+"διαχωρισμένα\n"
+" με το κόμμα.\n"
+
+#: ../urpm/search.pm:43 ../urpmf:43
+#, c-format
+msgid " --use-distrib - use the given path to access media\n"
+msgstr ""
+" --use-distrib - χρησιμοποιεί την καθορισμένη διαδρομή για πρόσβαση στο "
+"μέσο\n"
+
+#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+" --synthesis - χρήση του synthesis που δίδεται αντί του urpmi db.\n"
+
+#: ../urpm/search.pm:45 ../urpmf:45
+#, c-format
+msgid " --uniq - do not print identical lines twice.\n"
+msgstr " --uniq - μην τυπώσεις πανομοιότυπες γραμμές.\n"
+
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid " --update - use only update media.\n"
+msgstr " --update - χρήση μόνο των μέσων αναβάθμισης.\n"
+
+#: ../urpm/search.pm:47 ../urpmf:47
+#, c-format
+msgid " --verbose - verbose mode.\n"
+msgstr " --verbose - αναλυτική λειτουργία.\n"
+
+#: ../urpm/search.pm:48 ../urpmf:48
+#, c-format
+msgid " -i - ignore case distinctions in patterns.\n"
+msgstr ""
+" -i - αγνόησε τη διάκριση πεζών-κεφαλαίων στις ακολουθίες.\n"
+
+#: ../urpm/search.pm:49 ../urpmf:49
+#, c-format
+msgid " -I - honor case distinctions in patterns (default).\n"
+msgstr ""
+" -I - να γίνει διάκριση πεζών-κεφαλαίων στις ακολουθίες "
+"(προεπιλογή).\n"
+
+#: ../urpm/search.pm:50 ../urpmf:50
+#, c-format
+msgid " -F<str> - change field separator (defaults to ':').\n"
+msgstr ""
+" -F<str> - αντικαθιστά τον διαχωριστή με <str> (από προεπιλογή "
+"':').\n"
+
+#: ../urpm/search.pm:51 ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Ακολουθίες εκφράσεων:\n"
+
+#: ../urpm/search.pm:52 ../urpmf:52
+#, c-format
+msgid " text - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+" text - οποιοδήποτε κείμενο επεξεργάζεται σαν απλή έκφραση "
+"(regexp), εκτός αν έχει επιλεγεί το -l .\n"
+
+#: ../urpm/search.pm:53 ../urpmf:53
+#, c-format
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -e - συμπεριέλαβε κώδικα perl απευθείας σαν perl -e.\n"
+
+#: ../urpm/search.pm:54 ../urpmf:54
+#, c-format
+msgid " -a - binary AND operator.\n"
+msgstr " -a - δυαδικός AND τελεστής.\n"
+
+#: ../urpm/search.pm:55 ../urpmf:55
+#, c-format
+msgid " -o - binary OR operator.\n"
+msgstr " -ο - δυαδικός OR τελεστής.\n"
+
+#: ../urpm/search.pm:56 ../urpmf:56
+#, c-format
+msgid " ! - unary NOT.\n"
+msgstr " ! - ΟΧΙ μοναδιαίο.\n"
+
+#: ../urpm/search.pm:57 ../urpmf:57
+#, c-format
+msgid " ( ) - left and right parentheses.\n"
+msgstr " ( ) - αριστερή και δεξιά παρένθεση.\n"
+
+#: ../urpm/search.pm:58 ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Κατάλογος ετικετών:\n"
+
+#: ../urpm/search.pm:59 ../urpmf:59
+#, c-format
+msgid " --qf - specify a printf-like output format\n"
+msgstr " --qf - καθορίζει την μορφή εμφάνισης του τύπου printf\n"
+
+#: ../urpm/search.pm:60 ../urpmf:60
+#, c-format
+msgid " example: '%%name:%%files'\n"
+msgstr " παράδειγμα: '%%name:%%files'\n"
+
+#: ../urpm/search.pm:61 ../urpmf:61
+#, c-format
+msgid " --arch - architecture\n"
+msgstr " --arch - αρχιτεκτονική\n"
+
+#: ../urpm/search.pm:62 ../urpmf:62
+#, c-format
+msgid " --buildhost - build host\n"
+msgstr " --buildhost - αναζήτηση στο πεδίο « BuildHost »\n"
+
+#: ../urpm/search.pm:63 ../urpmf:63
+#, c-format
+msgid " --buildtime - build time\n"
+msgstr " --buildtime - αναζήτηση στο πεδίο «BuildTime»\n"
+
+#: ../urpm/search.pm:64 ../urpmf:64
+#, c-format
+msgid " --conffiles - configuration files\n"
+msgstr " --conffiles - αρχεία ρυθμίσεων\n"
+
+#: ../urpm/search.pm:65 ../urpmf:65
+#, c-format
+msgid " --conflicts - conflict tags\n"
+msgstr " --conflicts - ετικέτες συγκρούσεων\n"
+
+#: ../urpm/search.pm:66 ../urpmf:66
+#, c-format
+msgid " --description - package description\n"
+msgstr " --description - αναζήτηση στην περιγραφή των πακέτων\n"
+
+#: ../urpm/search.pm:67 ../urpmf:67
+#, c-format
+msgid " --distribution - distribution\n"
+msgstr " --distribution - διανομή\n"
+
+#: ../urpm/search.pm:68 ../urpmf:68
+#, c-format
+msgid " --epoch - epoch\n"
+msgstr " --epoch - .\n"
+
+#: ../urpm/search.pm:69 ../urpmf:69
+#, c-format
+msgid " --filename - filename of the package\n"
+msgstr " --filename - όνομα αρχείου του πακέτου\n"
+
+#: ../urpm/search.pm:70 ../urpmf:70
+#, c-format
+msgid " --files - list of files contained in the package\n"
+msgstr " --files - λίστα αρχείων που περιέχονται στο πακέτο.\n"
+
+#: ../urpm/search.pm:71 ../urpmf:71
+#, c-format
+msgid " --group - group\n"
+msgstr " --group - ομάδα\n"
+
+#: ../urpm/search.pm:72 ../urpmf:72
+#, c-format
+msgid " --license - license\n"
+msgstr " --license - άδεια\n"
+
+#: ../urpm/search.pm:73 ../urpmf:73
+#, c-format
+msgid " --name - package name\n"
+msgstr " --name - όνομα πακέτου\n"
+
+#: ../urpm/search.pm:74 ../urpmf:74
+#, c-format
+msgid " --obsoletes - obsoletes tags\n"
+msgstr " --obsoletes - αναζήτηση στο πεδίο «obsoletes»\n"
+
+#: ../urpm/search.pm:75 ../urpmf:75
+#, c-format
+msgid " --packager - packager\n"
+msgstr " --packager - δημιουργός πακέτου\n"
+
+#: ../urpm/search.pm:76 ../urpmf:76
+#, c-format
+msgid " --provides - provides tags\n"
+msgstr ""
+" --provides - τύπωσε την ετικέτα με τις παροχές: όλες οι παροχές.\n"
+
+#: ../urpm/search.pm:77 ../urpmf:77
+#, c-format
+msgid " --requires - requires tags\n"
+msgstr ""
+" --requires - τύπωσε την ετικέτα με τις εξαρτήσεις: όλες οι "
+"εξαρτήσεις.\n"
+
+#: ../urpm/search.pm:78 ../urpmf:78
+#, c-format
+msgid " --size - installed size\n"
+msgstr " --size - μέγεθος εγκατεστημένου\n"
+
+#: ../urpm/search.pm:79 ../urpmf:79
+#, c-format
+msgid " --sourcerpm - source rpm name\n"
+msgstr " --sourcerpm - όνομα πηγαίου rpm\n"
+
+#: ../urpm/search.pm:80 ../urpmf:80
+#, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --suggests - αναζήτηση στο πεδίο «suggests»\n"
+
+#: ../urpm/search.pm:81 ../urpmf:81
+#, c-format
+msgid " --summary - summary\n"
+msgstr " --summary - περίληψη.\n"
+
+#: ../urpm/search.pm:82 ../urpmf:82
+#, c-format
+msgid " --url - url\n"
+msgstr " --url - url\n"
+
+#: ../urpm/search.pm:83 ../urpmf:83
+#, c-format
+msgid " --vendor - vendor\n"
+msgstr " --vendor - κατασκευαστής\n"
+
+#: ../urpm/search.pm:84 ../urpmf:84
+#, c-format
+msgid " -m - the media in which the package was found\n"
+msgstr " -m - το μέσο στο οποίο βρέθηκε το πακέτο\n"
+
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
+#, c-format
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+" -f - τύπωσε την έκδοση, κυκλοφορίας και αρχιτεκτονικής με "
+"όνομα.\n"
+
+#: ../urpm/search.pm:197 ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+"Άγνωστος τύπος: μπορείτε να χρησιμοποιήσετε μόνο μια επιλογή πολλαπλών τιμών "
+"(multi-valued tag)"
+
+#: ../urpm/search.pm:290 ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "δεν βρέθηκε αρχείο hdlist για το μέσο \"%s\""
+
+#: ../urpm/search.pm:297 ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "δεν υπάρχει διαθέσιμη σύνθεση για το μέσο \"%s\""
+
+#: ../urpm/search.pm:304 ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "δεν υπάρχουν διαθέσιμες πληροφορίες xml για το μέσο \"%s\""
+
#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr "το urpmi επανανακινήθηκε, και η λίστα με τα πακέτα προτεραιότητας δεν έχει αλλάξει"
+msgstr ""
+"το urpmi επανανακινήθηκε, και η λίστα με τα πακέτα προτεραιότητας δεν έχει "
+"αλλάξει"
#: ../urpm/select.pm:32
#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "το urpmi επανανακινήθηκε, και η λίστα με τα πακέτα προτεραιότητας έχει αλλάξει: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"το urpmi επανανακινήθηκε, και η λίστα με τα πακέτα προτεραιότητας έχει "
+"αλλάξει: %s vs %s"
#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Κανένα πακέτο με το όνομα %s"
-#: ../urpm/select.pm:172
-#: ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Τα παρακάτω πακέτα περιέχουν %s: %s"
@@ -1443,7 +1754,9 @@ msgstr ""
#: ../urpm/select.pm:295
#, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "τα πακέτα %s βρέθηκαν στην βάση δεδομένων του urpmi, αλλά κανένα τους δεν είναι εγκατεστημένο"
+msgstr ""
+"τα πακέτα %s βρέθηκαν στην βάση δεδομένων του urpmi, αλλά κανένα τους δεν "
+"είναι εγκατεστημένο"
#: ../urpm/select.pm:538
#, c-format
@@ -1455,8 +1768,7 @@ msgstr "Το πακέτο %s είναι ήδη εγκατεστημένο"
msgid "Packages %s are already installed"
msgstr "Τα πακέτα %s είναι ήδη εγκατεστημένα"
-#: ../urpm/select.pm:557
-#: ../urpm/select.pm:641
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "λόγω έλλειψης του %s"
@@ -1466,8 +1778,7 @@ msgstr "λόγω έλλειψης του %s"
msgid "due to already installed %s"
msgstr "επειδή το %s είναι ήδη εγκατεστημένο"
-#: ../urpm/select.pm:559
-#: ../urpm/select.pm:639
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "λόγω μη ικανοποίησης του %s"
@@ -1510,17 +1821,17 @@ msgstr "για να εγκατασταθεί το %s"
msgid "due to conflicts with %s"
msgstr "λόγω συγκρούσεων με το %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Μη έγκυρη υπογραφή (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Μη έγκυρο ID Κλειδιού (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Απουσία υπογραφής (%s)"
@@ -1555,13 +1866,15 @@ msgstr "Αδυναμία μετακίνησης του αρχείου %s στο
msgid ""
"urpme version %s\n"
"Copyright (C) 1999-2008 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 έκδοση %s\n"
"Copyright (C) 1999-2008 Mandriva.\n"
-"Αυτό είναι ελεύθερο λογισμικό και μπορεί να αναδιανεμηθεί υπό τους όρους της GNU GPL.\n"
+"Αυτό είναι ελεύθερο λογισμικό και μπορεί να αναδιανεμηθεί υπό τους όρους της "
+"GNU GPL.\n"
"\n"
"χρήση:\n"
@@ -1578,17 +1891,16 @@ msgstr " --auto-orphans - απομάκρυνση των ορφανών\n"
#: ../urpme:49
#, c-format
msgid " --test - verify if the removal can be achieved correctly.\n"
-msgstr " --test - επαλήθευση ότι η αφαίρεση μπορεί να επιτευχθεί σωστά.\n"
+msgstr ""
+" --test - επαλήθευση ότι η αφαίρεση μπορεί να επιτευχθεί σωστά.\n"
-#: ../urpme:51
-#: ../urpmi:109
-#: ../urpmq:68
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
-msgstr " --parallel - διανεμημένα urpmi κατά μήκος των μηχανών με ψευδώνυμα.\n"
+msgstr ""
+" --parallel - διανεμημένα urpmi κατά μήκος των μηχανών με ψευδώνυμα.\n"
-#: ../urpme:52
-#: ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Ξανά-πακετάρισμα των αρχείων πριν την διαγραφή\n"
@@ -1596,25 +1908,14 @@ msgstr " --repackage - Ξανά-πακετάρισμα των αρχείων
#: ../urpme:53
#, c-format
msgid " --root - use another root for rpm removal.\n"
-msgstr " --root - χρήση διαφορετικής διαδρομής root για την αφαίρεση rpm.\n"
-
-#: ../urpme:54
-#: ../urpmf:40
-#: ../urpmi:111
-#: ../urpmi.addmedia:72
-#: ../urpmi.recover:36
-#: ../urpmi.removemedia:45
-#: ../urpmi.update:48
-#: ../urpmq:70
-#, c-format
-msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
-msgstr " --urpmi-root - χρήση μίας άλλης διαδρομής root για την βάση δεδομένων urpmi κ' την εγκατάσταση του rpm.\n"
+msgstr ""
+" --root - χρήση διαφορετικής διαδρομής root για την αφαίρεση rpm.\n"
-#: ../urpme:55
-#: ../urpmi:101
+#: ../urpme:55 ../urpmi:101
#, c-format
msgid " --justdb - update only the rpm db, not the filesystem.\n"
-msgstr " --justdb - ενημέρωση της βάσης rpm αλλά όχι το σύστημα αρχείων.\n"
+msgstr ""
+" --justdb - ενημέρωση της βάσης rpm αλλά όχι το σύστημα αρχείων.\n"
#: ../urpme:56
#, c-format
@@ -1628,11 +1929,10 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
" --use-distrib - ρύθμιση urpme απευθείας από ένα δέντρο διανομής, χρήσιμο\n"
-" για την (απ)εγκατάσταση ενός chroot με την --root επιλογή.\n"
+" για την (απ)εγκατάσταση ενός chroot με την --root "
+"επιλογή.\n"
-#: ../urpme:59
-#: ../urpmi:152
-#: ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - αναλυτική λειτουργία.\n"
@@ -1640,7 +1940,8 @@ msgstr " --verbose, -v - αναλυτική λειτουργία.\n"
#: ../urpme:60
#, c-format
msgid " -a - select all packages matching expression.\n"
-msgstr " -a - επιλογή όλων των πακέτων που ταιριάζουν με την έκφραση.\n"
+msgstr ""
+" -a - επιλογή όλων των πακέτων που ταιριάζουν με την έκφραση.\n"
#: ../urpme:73
#, c-format
@@ -1677,9 +1978,11 @@ msgstr "Δεν υπάρχουν ορφανά προς αφαίρεση"
#: ../urpme:149
#, 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] "Για να ικανοποιηθούν οι εξαρτήσεις, θα αφαιρεθεί το παρακάτω πακέτο"
-msgstr[1] "Για να ικανοποιηθούν οι εξαρτήσεις, θα αφαιρεθούν τα παρακάτω %d πακέτα"
+msgstr[1] ""
+"Για να ικανοποιηθούν οι εξαρτήσεις, θα αφαιρεθούν τα παρακάτω %d πακέτα"
#: ../urpme:154
#, c-format
@@ -1695,10 +1998,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "Αφαίρεση %d πακέτου;"
msgstr[1] "Αφαίρεση %d πακέτων;"
-#: ../urpme:161
-#: ../urpmi:553
-#: ../urpmi:648
-#: ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (y/N) "
@@ -1718,301 +2018,11 @@ msgstr "Η αφαίρεση απέτυχε"
msgid "Removal is possible"
msgstr "Η αφαίρεση είναι δυνατή"
-#: ../urpmf:29
-#, c-format
-msgid ""
-"urpmf version %s\n"
-"Copyright (C) 2002-2006 Mandriva.\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 έκδοση %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
-"Αυτό είναι ελεύθερο λογισμικό και μπορεί να αναδιανεμηθεί υπό τους όρους της GNU GPL.\n"
-"\n"
-"χρήση: urpmf [επιλογές] ακολουθία-έκφραση ( urpmf [options] pattern-expression )\n"
-
-#: ../urpmf:36
-#, c-format
-msgid " --version - print this tool's version number.\n"
-msgstr " --έκδοση - τύπωσε τον αριθμό έκδοσης αυτού του εργαλείου\n"
-
-#: ../urpmf:37
-#: ../urpmi:132
-#: ../urpmq:80
-#, c-format
-msgid " --env - use specific environment (typically a bug report).\n"
-msgstr ""
-" --env - χρήση συγκεκριμένου περιβάλλοντος (τυπικά μία αναφορά\n"
-" σφάλματος).\n"
-
-#: ../urpmf:38
-#: ../urpmi:74
-#: ../urpmq:49
-#, c-format
-msgid " --excludemedia - do not use the given media, separated by comma.\n"
-msgstr " --excludemedia - μην χρήση των μέσων που δόθηκαν, διαχωρισμένα με το κόμμα.\n"
-
-#: ../urpmf:39
-#, c-format
-msgid " --literal, -l - don't match patterns, use argument as a literal string.\n"
-msgstr " --literal, -l - δεν αντικαθιστά τους μπαλαντέρ, εφαρμογή του ορίσματος ως έχει.\n"
-
-#: ../urpmf:42
-#: ../urpmi:77
-#: ../urpmq:50
-#, c-format
-msgid " --sortmedia - sort media according to substrings separated by comma.\n"
-msgstr ""
-" --sortmedia - ταξινόμηση μέσων σύμφωνα με τα τμήματα λεκτικών διαχωρισμένα\n"
-" με το κόμμα.\n"
-
-#: ../urpmf:43
-#, c-format
-msgid " --use-distrib - use the given path to access media\n"
-msgstr " --use-distrib - χρησιμοποιεί την καθορισμένη διαδρομή για πρόσβαση στο μέσο\n"
-
-#: ../urpmf:44
-#: ../urpmi:78
-#: ../urpmq:51
-#, c-format
-msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
-msgstr " --synthesis - χρήση του synthesis που δίδεται αντί του urpmi db.\n"
-
-#: ../urpmf:45
-#, c-format
-msgid " --uniq - do not print identical lines twice.\n"
-msgstr " --uniq - μην τυπώσεις πανομοιότυπες γραμμές.\n"
-
-#: ../urpmf:46
-#: ../urpmi:75
-#: ../urpmq:46
-#, c-format
-msgid " --update - use only update media.\n"
-msgstr " --update - χρήση μόνο των μέσων αναβάθμισης.\n"
-
-#: ../urpmf:47
-#, c-format
-msgid " --verbose - verbose mode.\n"
-msgstr " --verbose - αναλυτική λειτουργία.\n"
-
-#: ../urpmf:48
-#, c-format
-msgid " -i - ignore case distinctions in patterns.\n"
-msgstr " -i - αγνόησε τη διάκριση πεζών-κεφαλαίων στις ακολουθίες.\n"
-
-#: ../urpmf:49
-#, c-format
-msgid " -I - honor case distinctions in patterns (default).\n"
-msgstr " -I - να γίνει διάκριση πεζών-κεφαλαίων στις ακολουθίες (προεπιλογή).\n"
-
-#: ../urpmf:50
-#, c-format
-msgid " -F<str> - change field separator (defaults to ':').\n"
-msgstr " -F<str> - αντικαθιστά τον διαχωριστή με <str> (από προεπιλογή ':').\n"
-
-#: ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Ακολουθίες εκφράσεων:\n"
-
-#: ../urpmf:52
-#, c-format
-msgid " text - any text is parsed as a regexp, unless -l is used.\n"
-msgstr " text - οποιοδήποτε κείμενο επεξεργάζεται σαν απλή έκφραση (regexp), εκτός αν έχει επιλεγεί το -l .\n"
-
-#: ../urpmf:53
-#, c-format
-msgid " -e - include perl code directly as perl -e.\n"
-msgstr " -e - συμπεριέλαβε κώδικα perl απευθείας σαν perl -e.\n"
-
-#: ../urpmf:54
-#, c-format
-msgid " -a - binary AND operator.\n"
-msgstr " -a - δυαδικός AND τελεστής.\n"
-
-#: ../urpmf:55
-#, c-format
-msgid " -o - binary OR operator.\n"
-msgstr " -ο - δυαδικός OR τελεστής.\n"
-
-#: ../urpmf:56
-#, c-format
-msgid " ! - unary NOT.\n"
-msgstr " ! - ΟΧΙ μοναδιαίο.\n"
-
-#: ../urpmf:57
-#, c-format
-msgid " ( ) - left and right parentheses.\n"
-msgstr " ( ) - αριστερή και δεξιά παρένθεση.\n"
-
-#: ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Κατάλογος ετικετών:\n"
-
-#: ../urpmf:59
-#, c-format
-msgid " --qf - specify a printf-like output format\n"
-msgstr " --qf - καθορίζει την μορφή εμφάνισης του τύπου printf\n"
-
-#: ../urpmf:60
-#, c-format
-msgid " example: '%%name:%%files'\n"
-msgstr " παράδειγμα: '%%name:%%files'\n"
-
-#: ../urpmf:61
-#, c-format
-msgid " --arch - architecture\n"
-msgstr " --arch - αρχιτεκτονική\n"
-
-#: ../urpmf:62
-#, c-format
-msgid " --buildhost - build host\n"
-msgstr " --buildhost - αναζήτηση στο πεδίο « BuildHost »\n"
-
-#: ../urpmf:63
-#, c-format
-msgid " --buildtime - build time\n"
-msgstr " --buildtime - αναζήτηση στο πεδίο «BuildTime»\n"
-
-#: ../urpmf:64
-#, c-format
-msgid " --conffiles - configuration files\n"
-msgstr " --conffiles - αρχεία ρυθμίσεων\n"
-
-#: ../urpmf:65
-#, c-format
-msgid " --conflicts - conflict tags\n"
-msgstr " --conflicts - ετικέτες συγκρούσεων\n"
-
-#: ../urpmf:66
-#, c-format
-msgid " --description - package description\n"
-msgstr " --description - αναζήτηση στην περιγραφή των πακέτων\n"
-
-#: ../urpmf:67
-#, c-format
-msgid " --distribution - distribution\n"
-msgstr " --distribution - διανομή\n"
-
-#: ../urpmf:68
-#, c-format
-msgid " --epoch - epoch\n"
-msgstr " --epoch - .\n"
-
-#: ../urpmf:69
-#, c-format
-msgid " --filename - filename of the package\n"
-msgstr " --filename - όνομα αρχείου του πακέτου\n"
-
-#: ../urpmf:70
-#, c-format
-msgid " --files - list of files contained in the package\n"
-msgstr " --files - λίστα αρχείων που περιέχονται στο πακέτο.\n"
-
-#: ../urpmf:71
-#, c-format
-msgid " --group - group\n"
-msgstr " --group - ομάδα\n"
-
-#: ../urpmf:72
-#, c-format
-msgid " --license - license\n"
-msgstr " --license - άδεια\n"
-
-#: ../urpmf:73
-#, c-format
-msgid " --name - package name\n"
-msgstr " --name - όνομα πακέτου\n"
-
-#: ../urpmf:74
-#, c-format
-msgid " --obsoletes - obsoletes tags\n"
-msgstr " --obsoletes - αναζήτηση στο πεδίο «obsoletes»\n"
-
-#: ../urpmf:75
-#, c-format
-msgid " --packager - packager\n"
-msgstr " --packager - δημιουργός πακέτου\n"
-
-#: ../urpmf:76
-#, c-format
-msgid " --provides - provides tags\n"
-msgstr " --provides - τύπωσε την ετικέτα με τις παροχές: όλες οι παροχές.\n"
-
-#: ../urpmf:77
-#, c-format
-msgid " --requires - requires tags\n"
-msgstr " --requires - τύπωσε την ετικέτα με τις εξαρτήσεις: όλες οι εξαρτήσεις.\n"
-
-#: ../urpmf:78
-#, c-format
-msgid " --size - installed size\n"
-msgstr " --size - μέγεθος εγκατεστημένου\n"
-
-#: ../urpmf:79
-#, c-format
-msgid " --sourcerpm - source rpm name\n"
-msgstr " --sourcerpm - όνομα πηγαίου rpm\n"
-
-#: ../urpmf:80
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests - αναζήτηση στο πεδίο «suggests»\n"
-
-#: ../urpmf:81
-#, c-format
-msgid " --summary - summary\n"
-msgstr " --summary - περίληψη.\n"
-
-#: ../urpmf:82
-#, c-format
-msgid " --url - url\n"
-msgstr " --url - url\n"
-
-#: ../urpmf:83
-#, c-format
-msgid " --vendor - vendor\n"
-msgstr " --vendor - κατασκευαστής\n"
-
-#: ../urpmf:84
-#, c-format
-msgid " -m - the media in which the package was found\n"
-msgstr " -m - το μέσο στο οποίο βρέθηκε το πακέτο\n"
-
-#: ../urpmf:85
-#: ../urpmq:99
-#, c-format
-msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - τύπωσε την έκδοση, κυκλοφορίας και αρχιτεκτονικής με όνομα.\n"
-
#: ../urpmf:153
#, c-format
msgid "unterminated expression (%s)"
msgstr "μη τερματισμένη έκφραση (%s)"
-#: ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Άγνωστος τύπος: μπορείτε να χρησιμοποιήσετε μόνο μια επιλογή πολλαπλών τιμών (multi-valued tag)"
-
-#: ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "δεν βρέθηκε αρχείο hdlist για το μέσο \"%s\""
-
-#: ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "δεν υπάρχει διαθέσιμη σύνθεση για το μέσο \"%s\""
-
-#: ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "δεν υπάρχουν διαθέσιμες πληροφορίες xml για το μέσο \"%s\""
-
#: ../urpmi:81
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -2033,24 +2043,27 @@ msgstr " --force-key - εξαναγκασμός ενημέρωσης το
msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - απομάκρυνση των ορφανών, χωρίς επιβαιβέωση\n"
-#: ../urpmi:85
-#: ../urpmq:54
+#: ../urpmi:85 ../urpmq:54
#, c-format
msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
-msgstr " --no-suggests - να μην επιλεγούν αυτόματα τα \"προτεινόμενα\" πακέτα.\n"
+msgstr ""
+" --no-suggests - να μην επιλεγούν αυτόματα τα \"προτεινόμενα\" πακέτα.\n"
#: ../urpmi:86
#, c-format
-msgid " --no-uninstall - never ask to uninstall a package, abort the installation.\n"
-msgstr " --no-uninstall - μην ρωτήσεις για να απεγκαταστήσεις ένα πακέτο, διέκοψε την εγκατάσταση.\n"
+msgid ""
+" --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+" --no-uninstall - μην ρωτήσεις για να απεγκαταστήσεις ένα πακέτο, διέκοψε "
+"την εγκατάσταση.\n"
#: ../urpmi:87
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - μη εγκατάσταση πακέτων (μόνο λήψη)\n"
-#: ../urpmi:88
-#: ../urpmq:56
+#: ../urpmi:88 ../urpmq:56
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -2066,14 +2079,16 @@ msgid ""
" are going to be installed or upgraded,\n"
" default is %d.\n"
msgstr ""
-" --split-level - διαχωρισμός σε μικρότερες συναλλαγές, αν περισσότερα από τα καθορισμένα\n"
+" --split-level - διαχωρισμός σε μικρότερες συναλλαγές, αν περισσότερα από "
+"τα καθορισμένα\n"
" πακέτα πρόκειται να ενημερωθούν ή να αναβαθμιστούν.\n"
" Η προεπιλογή είναι %d.\n"
#: ../urpmi:94
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
-msgstr " --split-length - μικρότερο μήκος συναλλαγής, η προεπιλογή είναι %d.\n"
+msgstr ""
+" --split-length - μικρότερο μήκος συναλλαγής, η προεπιλογή είναι %d.\n"
#: ../urpmi:96
#, c-format
@@ -2088,12 +2103,15 @@ msgstr " --buildrequires - εγκατάσταση των buildrequires των
#: ../urpmi:98
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
-msgstr " --install-src - εγκατάσταση μόνο του πηγαίου πακέτου (όχι εκτελέσιμα).\n"
+msgstr ""
+" --install-src - εγκατάσταση μόνο του πηγαίου πακέτου (όχι εκτελέσιμα).\n"
#: ../urpmi:99
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
-msgstr " --clean - αφαίρεσε τα rpm από την προσωρινή μνήμη πριν από κάθε άλλο.\n"
+msgstr ""
+" --clean - αφαίρεσε τα rpm από την προσωρινή μνήμη πριν από κάθε "
+"άλλο.\n"
#: ../urpmi:100
#, c-format
@@ -2102,8 +2120,11 @@ msgstr " --noclean - κρατά τα rpm στην προσωρινή μν
#: ../urpmi:102
#, c-format
-msgid " --replacepkgs - force installing packages which are already installed.\n"
-msgstr " --replacepkgs - εξαναγκασμός εγκατάστασης πακέτων που είναι ήδη εγκατεστημένα.\n"
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+" --replacepkgs - εξαναγκασμός εγκατάστασης πακέτων που είναι ήδη "
+"εγκατεστημένα.\n"
#: ../urpmi:104
#, c-format
@@ -2111,7 +2132,8 @@ msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
" dependencies checking.\n"
msgstr ""
-" --allow-nodeps - επέτρεψε στον χρήστη να ρωτάει για να εγκατεστημένα πακέτα χωρίς\n"
+" --allow-nodeps - επέτρεψε στον χρήστη να ρωτάει για να εγκατεστημένα "
+"πακέτα χωρίς\n"
" να ελέγχει τις εξαρτήσεις.\n"
#: ../urpmi:106
@@ -2134,12 +2156,11 @@ 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 - ρύθμισε το urpmi απευθείας από ένα δένδρο διανομής, χρήσιμο\n"
+" --use-distrib - ρύθμισε το urpmi απευθείας από ένα δένδρο διανομής, "
+"χρήσιμο\n"
" για να εγκαταστήσετε ένα chroot με την επιλογή --root .\n"
-#: ../urpmi:114
-#: ../urpmi.addmedia:59
-#: ../urpmi.update:37
+#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:37
#, c-format
msgid " --metalink - generate and use a local metalink.\n"
msgstr " --metalink - δημιουργία και χρήση ενός τοπικού μετασυνδέσμου.\n"
@@ -2171,16 +2192,15 @@ msgstr " --wget-options - πρόσθετες επιλογές για να πε
#: ../urpmi:121
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
-msgstr " --prozilla-options - πρόσθετες επιλογές για να περάσετε στο prozilla\n"
+msgstr ""
+" --prozilla-options - πρόσθετες επιλογές για να περάσετε στο prozilla\n"
#: ../urpmi:122
#, c-format
msgid " --aria2-options - additional options to pass to aria2\n"
msgstr " --aria2-options - πρόσθετες επιλογές για να περάσετε στο aria2\n"
-#: ../urpmi:123
-#: ../urpmi.addmedia:60
-#: ../urpmi.update:38
+#: ../urpmi:123 ../urpmi.addmedia:60 ../urpmi.update:38
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - περιόρισε την ταχύτητα λήψης.\n"
@@ -2192,31 +2212,29 @@ msgid ""
" (--no-resume disables it, default is disabled).\n"
msgstr ""
" --resume - ανάκτηση της λήψης ελλιπών αρχείων\n"
-" (--no-resume το απενεργοποιεί, από προεπιλογή είναι απενεργοποιημένο).\n"
+" (--no-resume το απενεργοποιεί, από προεπιλογή είναι "
+"απενεργοποιημένο).\n"
-#: ../urpmi:126
-#: ../urpmi.addmedia:61
-#: ../urpmi.update:39
-#: ../urpmq:76
+#: ../urpmi:126 ../urpmi.addmedia:61 ../urpmi.update:39 ../urpmq:76
#, 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 - χρήση καθορισμένου HTTP proxy, ο αριθμός της θύρας\n"
-" θεωρείται ότι είναι από προεπιλογή ο 1080 (η μορφή είναι <proxyhost[:port]>).\n"
+" θεωρείται ότι είναι από προεπιλογή ο 1080 (η μορφή είναι "
+"<proxyhost[:port]>).\n"
-#: ../urpmi:128
-#: ../urpmi.addmedia:63
-#: ../urpmi.update:41
-#: ../urpmq:78
+#: ../urpmi:128 ../urpmi.addmedia:63 ../urpmi.update:41 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
" authentication (format is <user:password>).\n"
msgstr ""
-" --proxy-user - καθορίζει τον χρήστη και τον κωδικό πρόσβασης που θα χρησιμοποιηθεί για\n"
-" τον έλεγχο ταυτότητας στον proxy (η μορφή είναι <user:password>).\n"
+" --proxy-user - καθορίζει τον χρήστη και τον κωδικό πρόσβασης που θα "
+"χρησιμοποιηθεί για\n"
+" τον έλεγχο ταυτότητας στον proxy (η μορφή είναι <user:"
+"password>).\n"
#: ../urpmi:130
#, c-format
@@ -2240,113 +2258,138 @@ msgstr " --excludedocs - εξαιρούμενα αρχεία τεκμηρίω
#: ../urpmi:138
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
-msgstr " --ignoresize - να μην γίνει έλεγχος της χωρητικότητας του δίσκου πριν την εγκατάσταση.\n"
+msgstr ""
+" --ignoresize - να μην γίνει έλεγχος της χωρητικότητας του δίσκου πριν "
+"την εγκατάσταση.\n"
#: ../urpmi:139
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
-msgstr " --ignorearch - επιτρέπει την εγκατάσταση πακέτων για άλλες αρχιτεκτονικές.\n"
+msgstr ""
+" --ignorearch - επιτρέπει την εγκατάσταση πακέτων για άλλες "
+"αρχιτεκτονικές.\n"
#: ../urpmi:140
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - να μην εκτελεστούν τα scripts εγκατάστασης\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - εμφανίζει τις συγκρούσεις.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - πακέτα τα οποίο η εγκατάσταση θα προσπεράσει\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --prefer - πακέτα που θα πρέπει να προτιμηθούν\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-" --more-choices - όταν βρίσκονται πολλά πακέτα, να προτείνονται περισσότερες επιλογές \n"
+" --more-choices - όταν βρίσκονται πολλά πακέτα, να προτείνονται "
+"περισσότερες επιλογές \n"
" από αυτές της προεπιλογής.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - μα μην κλειδωθεί η βάση rpm.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
-msgstr " --strict-arch - αναβάθμισε μόνο τα πακέτα με την ίδια αρχιτεκτονική.\n"
+msgstr ""
+" --strict-arch - αναβάθμισε μόνο τα πακέτα με την ίδια αρχιτεκτονική.\n"
-#: ../urpmi:148
-#: ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
-msgstr " -a - επιλογή όλων των μέσων που ταιριάζουν στην γραμμή εντολών.\n"
+msgstr ""
+" -a - επιλογή όλων των μέσων που ταιριάζουν στην γραμμή "
+"εντολών.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - σιωπηλή λειτουργία.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --debug - περισσότερο αναλυτική λειτουργία.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
-msgstr " τα ονόματα ή τα αρχεία rpm που δόθηκαν στην γραμμή εντολών θα εγκατασταθούν.\n"
+msgstr ""
+" τα ονόματα ή τα αρχεία rpm που δόθηκαν στην γραμμή εντολών θα "
+"εγκατασταθούν.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
-msgstr "Σφάλμα: αδύνατη η χρήση του --auto-select παράλληλα με τη λίστα πακέτων.\n"
+msgstr ""
+"Σφάλμα: αδύνατη η χρήση του --auto-select παράλληλα με τη λίστα πακέτων.\n"
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-"Σφάλμα: Για την δημιουργία αναφοράς bug, καθορίστε τους ορισμούς της γραμμής εντολών\n"
+"Σφάλμα: Για την δημιουργία αναφοράς bug, καθορίστε τους ορισμούς της γραμμής "
+"εντολών\n"
"με το --bug.\n"
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
-msgstr "Δεν μπορείτε να εγκαταστήσετε δυαδικά αρχεία rpm όταν χρησιμοποιείτε --install-src"
+msgstr ""
+"Δεν μπορείτε να εγκαταστήσετε δυαδικά αρχεία rpm όταν χρησιμοποιείτε --"
+"install-src"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr "Δεν μπορείς να εγκαταστήσεις αρχεία προδιαγραφών (spec)"
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr "αντιστοίχηση στο --buildrequires"
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
-msgstr "παρακαλώ χρησιμοποιήστε --buildrequires ή --install-src, από προεπιλογή --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgstr ""
+"παρακαλώ χρησιμοποιήστε --buildrequires ή --install-src, από προεπιλογή --"
+"buildrequires"
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
-msgid "Directory [%s] already exists, please use another directory for bug report or delete it"
-msgstr "Ο κατάλογος [%s] υπάρχει ήδη, παρακαλώ χρησιμοποιήστε ένα διαφορετικό κατάλογο για να αναφορά σφάλματος ή διαγράψτε το"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Ο κατάλογος [%s] υπάρχει ήδη, παρακαλώ χρησιμοποιήστε ένα διαφορετικό "
+"κατάλογο για να αναφορά σφάλματος ή διαγράψτε το"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "αδυναμία δημιουργίας καταλόγου [%s] για την αναφορά σφάλματος"
-#: ../urpmi:274
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2355,46 +2398,50 @@ msgstr ""
"Σφάλμα: το %s φαίνεται να είναι προσαρτημένο μόνο για ανάγνωση.\n"
"Χρησιμοποίησε το --allow-force για να εξαναγκάσεις τη λειτουργία."
-#: ../urpmi:348
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr "Ενημέρωση των μέσων...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:435
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (προς αναβάθμιση)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:437
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (προς αναβάθμιση)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:441
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (προς εγκατάσταση)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (προς εγκατάσταση)"
-#: ../urpmi:449
+#: ../urpmi:450
#, c-format
-msgid "In order to satisfy the '%s' dependency, one of the following packages is needed:"
-msgstr "Για να ικανοποιηθούν οι εξαρτήσεις του '%s', απαιτείται ένα από τα παρακάτω πακέτα:"
+msgid ""
+"In order to satisfy the '%s' dependency, one of the following packages is "
+"needed:"
+msgstr ""
+"Για να ικανοποιηθούν οι εξαρτήσεις του '%s', απαιτείται ένα από τα παρακάτω "
+"πακέτα:"
-#: ../urpmi:452
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Ποια είναι η επιλογή σας; (1-%d) "
-#: ../urpmi:494
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2405,19 +2452,19 @@ msgstr ""
"που είναι παλαιότερα από αυτά που είναι εγκατεστημένα:\n"
"%s"
-#: ../urpmi:496
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
"that are older than the installed ones:\n"
"%s"
msgstr ""
-"Τα ακόλουθα πακέτα δεν μπορούν να εγκατασταθούν, γιατί εξαρτώνται από πακέτα\n"
+"Τα ακόλουθα πακέτα δεν μπορούν να εγκατασταθούν, γιατί εξαρτώνται από "
+"πακέτα\n"
"που είναι παλαιότερα από αυτά που είναι εγκατεστημένα:\n"
"%s"
-#: ../urpmi:502
-#: ../urpmi:517
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2426,15 +2473,12 @@ msgstr ""
"\n"
"Να συνεχίσω την εγκατάσταση;"
-#: ../urpmi:503
-#: ../urpmi:518
-#: ../urpmi:612
-#: ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (Y/n) "
-#: ../urpmi:511
+#: ../urpmi:512
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2443,7 +2487,7 @@ msgstr ""
"Ένα πακέτα που ζητήθηκε δεν μπορεί να εγκατασταθεί:\n"
"%s"
-#: ../urpmi:512
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2452,12 +2496,12 @@ msgstr ""
"Ορισμένα πακέτα που ζητήθηκαν δεν μπορούν να εγκατασταθούν:\n"
"%s"
-#: ../urpmi:529
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "η αφαίρεση του πακέτου %s θα καταστρέψει το σύστημά σου"
-#: ../urpmi:537
+#: ../urpmi:538
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2468,70 +2512,73 @@ msgstr ""
"πρέπει να αφαιρεθεί, για να αναβαθμιστούν κάποια άλλα:\n"
"%s\n"
-#: ../urpmi:539
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
"have to be removed for others to be upgraded:\n"
"%s\n"
msgstr ""
-"Η εγκατάσταση δεν μπορεί να συνεχιστεί διότι τα παρακάτω πακέτα πρέπει να αφαιρεθούν για να αναβαθμιστούν κάποια άλλα:\n"
+"Η εγκατάσταση δεν μπορεί να συνεχιστεί διότι τα παρακάτω πακέτα πρέπει να "
+"αφαιρεθούν για να αναβαθμιστούν κάποια άλλα:\n"
"%s\n"
-#: ../urpmi:547
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(μονάχα έλεγχος, η αφαίρεση δεν θα γίνει πραγματικά)"
-#: ../urpmi:567
+#: ../urpmi:568
#, 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 ""
-"Πρέπει πρώτα να χρησιμοποιήσετε την urpmi --buildrequires για να εγκαταστήσετε τις παρακάτω εξαρτήσεις:\n"
+"Πρέπει πρώτα να χρησιμοποιήσετε την urpmi --buildrequires για να "
+"εγκαταστήσετε τις παρακάτω εξαρτήσεις:\n"
"%s\n"
-#: ../urpmi:578
+#: ../urpmi:579
#, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "Θα αφαιρεθεί το παρακάτω ορφανό πακέτο."
msgstr[1] "Θα αφαιρεθούν τα παρακάτω ορφανά πακέτα."
-#: ../urpmi:594
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(μονάχα έλεγχος, η εγκατάσταση δεν θα γίνει πραγματικά)"
-#: ../urpmi:600
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr "Θα χρησιμοποιηθεί επιπλέον %s χώρου στο σκληρό δίσκο."
-#: ../urpmi:601
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr "Θα ελευθερωθεί %s χώρου στο σκληρό δίσκο."
-#: ../urpmi:602
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr "%s των πακέτων θα ανακτηθούν."
-#: ../urpmi:603
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Συνέχιση με την εγκατάσταση ενός πακέτου;"
msgstr[1] "Συνέχιση με την εγκατάσταση των %d πακέτων;"
-#: ../urpmi:624
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Ακύρωση"
-#: ../urpmi:632
+#: ../urpmi:633
#, c-format
msgid "Press Enter when mounted..."
msgstr "Πατήστε Enter όταν προσαρτηθεί..."
@@ -2569,7 +2616,8 @@ msgstr ""
" cdrom://<διαδρομή>\n"
"\n"
"χρήση: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
-"χρήση: urpmi.addmedia [options] --mirrorlist <url> <όνομα> <σχετική διαδρομή>\n"
+"χρήση: urpmi.addmedia [options] --mirrorlist <url> <όνομα> <σχετική "
+"διαδρομή>\n"
"\n"
"παραδείγματα:\n"
"\n"
@@ -2579,32 +2627,31 @@ msgstr ""
"\n"
"και οι [επιλογές] είναι από\n"
-#: ../urpmi.addmedia:55
-#: ../urpmi.update:33
-#: ../urpmq:73
+#: ../urpmi.addmedia:55 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
-msgstr " --wget - χρήση του wget για την ανάκτηση απομακρυσμένων αρχείων.\n"
+msgstr ""
+" --wget - χρήση του wget για την ανάκτηση απομακρυσμένων αρχείων.\n"
-#: ../urpmi.addmedia:56
-#: ../urpmi.update:34
-#: ../urpmq:74
+#: ../urpmi.addmedia:56 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
-msgstr " --curl - χρήση του curl για την ανάκτηση απομακρυσμένων αρχείων.\n"
+msgstr ""
+" --curl - χρήση του curl για την ανάκτηση απομακρυσμένων αρχείων.\n"
-#: ../urpmi.addmedia:57
-#: ../urpmi.update:35
-#: ../urpmq:75
+#: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
-msgstr " --prozilla - χρήση του prozilla για την ανάκτηση απομακρυσμένων αρχείων.\n"
+msgstr ""
+" --prozilla - χρήση του prozilla για την ανάκτηση απομακρυσμένων "
+"αρχείων.\n"
-#: ../urpmi.addmedia:58
-#: ../urpmi.update:36
+#: ../urpmi.addmedia:58 ../urpmi.update:36
#, c-format
msgid " --aria2 - use aria2 to retrieve distant files.\n"
-msgstr " --aria2 - χρήση του aria2, για την ανάκτηση απομακρυσμένων αρχείων.\n"
+msgstr ""
+" --aria2 - χρήση του aria2, για την ανάκτηση απομακρυσμένων "
+"αρχείων.\n"
#: ../urpmi.addmedia:65
#, c-format
@@ -2617,10 +2664,12 @@ 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 - λήψη των αρχείων xml info με την καθορισμένη πολιτική\n"
-" απο τις εξής: never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
+" απο τις εξής: never, on-demand, update-only, always. cf "
+"urpmi.cfg(5)\n"
#: ../urpmi.addmedia:69
#, c-format
@@ -2649,7 +2698,8 @@ msgstr ""
#: ../urpmi.addmedia:75
#, c-format
msgid " --interactive - with --distrib, ask confirmation for each media\n"
-msgstr " --interactive - με --distrib, ρωτά επιβεβαίωση για κάθε μέσο (media)\n"
+msgstr ""
+" --interactive - με --distrib, ρωτά επιβεβαίωση για κάθε μέσο (media)\n"
#: ../urpmi.addmedia:76
#, c-format
@@ -2662,16 +2712,18 @@ msgid ""
" --from - use specified url for list of mirrors, the default is\n"
" %s\n"
msgstr ""
-" --from - χρήση του καθορισμένου url για την λίστα των mirrors, η προεπιλογή είναι\n"
+" --from - χρήση του καθορισμένου url για την λίστα των mirrors, η "
+"προεπιλογή είναι\n"
" %s\n"
#: ../urpmi.addmedia:79
#, c-format
msgid " --virtual - create virtual media wich are always up-to-date.\n"
-msgstr " --virtual - δημιουργία εικονικών μέσων (media) τα οποία είναι πάντα ενημερωμένα.\n"
+msgstr ""
+" --virtual - δημιουργία εικονικών μέσων (media) τα οποία είναι πάντα "
+"ενημερωμένα.\n"
-#: ../urpmi.addmedia:80
-#: ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - απενεργοποίηση του MD5SUM ελέγχου του αρχείου .\n"
@@ -2679,23 +2731,23 @@ msgstr " --no-md5sum - απενεργοποίηση του MD5SUM ελέγχ
#: ../urpmi.addmedia:81
#, c-format
msgid " --nopubkey - don't import pubkey of added media\n"
-msgstr " --nopubkey - να μην γίνει εισαγωγή δημόσιου κλειδιού των νέων μέσων (media)\n"
+msgstr ""
+" --nopubkey - να μην γίνει εισαγωγή δημόσιου κλειδιού των νέων μέσων "
+"(media)\n"
#: ../urpmi.addmedia:82
#, c-format
msgid " --raw - add the media in config, but don't update it.\n"
-msgstr " --raw - προσθήκη του μέσου (media) στην διαμόρφωση, αλλά χωρίς ενημέρωση.\n"
+msgstr ""
+" --raw - προσθήκη του μέσου (media) στην διαμόρφωση, αλλά χωρίς "
+"ενημέρωση.\n"
-#: ../urpmi.addmedia:83
-#: ../urpmi.removemedia:43
-#: ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - σιωπηλή λειτουργία.\n"
-#: ../urpmi.addmedia:84
-#: ../urpmi.removemedia:44
-#: ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - αναλυτική περιγραφή.\n"
@@ -2713,7 +2765,9 @@ msgstr "δεν απαιτείται όρισμα για --distrib --mirrorlist <
#: ../urpmi.addmedia:120
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
-msgstr "εσφαλμένο <url> (στην περίπτωση τοπικού καταλόγου, η διαδρομή θα πρέπει να είναι απόλυτη)"
+msgstr ""
+"εσφαλμένο <url> (στην περίπτωση τοπικού καταλόγου, η διαδρομή θα πρέπει να "
+"είναι απόλυτη)"
#: ../urpmi.addmedia:124
#, c-format
@@ -2733,7 +2787,8 @@ msgstr "Δεν μπορεί να δημιουργηθεί το αρχείο ρυ
#: ../urpmi.addmedia:136
#, c-format
msgid "no need to give <relative path of synthesis> with --distrib"
-msgstr "δε χρειάζεται να δώσεις <σχετική διαδρομή του synthesis> με το --distrib"
+msgstr ""
+"δε χρειάζεται να δώσεις <σχετική διαδρομή του synthesis> με το --distrib"
#: ../urpmi.addmedia:144
#, c-format
@@ -2764,13 +2819,15 @@ msgstr "Αδυναμία προσθήκης μέσου"
msgid ""
"urpmi.recover version %s\n"
"Copyright (C) 2006 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 %s\n"
"Copyright (C) 2006 Mandriva.\n"
-"Αυτό είναι ελεύθερο λογισμικό και μπορεί να διανεμηθεί υπό τους όρους της GNU GPL.\n"
+"Αυτό είναι ελεύθερο λογισμικό και μπορεί να διανεμηθεί υπό τους όρους της "
+"GNU GPL.\n"
"\n"
"χρήση:\n"
@@ -2783,18 +2840,24 @@ msgstr " --checkpoint - ορίστε τώρα το σημείο αναφορ
#, c-format
msgid " --noclean - don't clean repackage directory on checkpoint\n"
msgstr ""
-" --noclean - να μην γίνει καθαρισμός του φακέλου αναδημιουργίας πακέτων\n"
+" --noclean - να μην γίνει καθαρισμός του φακέλου αναδημιουργίας "
+"πακέτων\n"
"κατά την αρχικοποίηση του σημείου αναφοράς\n"
#: ../urpmi.recover:37
#, c-format
-msgid " --list - list transactions since provided date/duration argument\n"
-msgstr " --list - λίστα συναλλαγών που έγιναν από μια καθορισμένη ημερομηνία/διάρκεια και μετά\n"
+msgid ""
+" --list - list transactions since provided date/duration argument\n"
+msgstr ""
+" --list - λίστα συναλλαγών που έγιναν από μια καθορισμένη "
+"ημερομηνία/διάρκεια και μετά\n"
#: ../urpmi.recover:38
#, c-format
msgid " --list-all - list all transactions in rpmdb (long)\n"
-msgstr " --list-all - εμφανίζει την λίστα με όλες τις συναλλαγές της βάσης RPM.\n"
+msgstr ""
+" --list-all - εμφανίζει την λίστα με όλες τις συναλλαγές της βάσης "
+"RPM.\n"
#: ../urpmi.recover:39
#, c-format
@@ -2809,7 +2872,8 @@ msgid ""
" --rollback - rollback until specified date,\n"
" or rollback the specified number of transactions\n"
msgstr ""
-" --rollback - επαναφορά στην κατάσταση που αντιστοιχεί στην καθορισμένη ημερομηνία,\n"
+" --rollback - επαναφορά στην κατάσταση που αντιστοιχεί στην καθορισμένη "
+"ημερομηνία,\n"
" ή υποχώρηση σύμφωνα με τον καθορισμένο αριθμό συναλλαγών\n"
#: ../urpmi.recover:42
@@ -2852,12 +2916,14 @@ msgstr "Λανθασμένα ορίσματα της γραμμής εντολώ
#: ../urpmi.recover:84
#, c-format
msgid "You can't specify --checkpoint and --rollback at the same time\n"
-msgstr "Δεν μπορείς να προσδιορίσεις συγχρόνως το --checkpoint και το --rollback \n"
+msgstr ""
+"Δεν μπορείς να προσδιορίσεις συγχρόνως το --checkpoint και το --rollback \n"
#: ../urpmi.recover:86
#, c-format
msgid "You can't specify --checkpoint and --list at the same time\n"
-msgstr "Δεν μπορείς να προσδιορίσεις συγχρόνως το --checkpoint και το --list \n"
+msgstr ""
+"Δεν μπορείς να προσδιορίσεις συγχρόνως το --checkpoint και το --list \n"
#: ../urpmi.recover:88
#, c-format
@@ -2879,8 +2945,7 @@ msgstr "Δεν βρέθηκε συναλλαγή από %s\n"
msgid "You must be superuser to do this"
msgstr "Πρέπει να είστε υπερχρήστης για να το πράξετε αυτό"
-#: ../urpmi.recover:143
-#: ../urpmi.recover:209
+#: ../urpmi.recover:143 ../urpmi.recover:209
#, c-format
msgid "Writing rpm macros file [%s]...\n"
msgstr "Εγγραφή αρχείου rpm μακροεντολών [%s]...\n"
@@ -2927,7 +2992,9 @@ msgstr "Μόνο ο διαχειριστής επιτρέπεται να αφα
#: ../urpmi.removemedia:72
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "τίποτα για διαγραφή (χρησιμοποιήστε το urpmi.addmedia για να προσθέσετε ένα μέσο)\n"
+msgstr ""
+"τίποτα για διαγραφή (χρησιμοποιήστε το urpmi.addmedia για να προσθέσετε ένα "
+"μέσο)\n"
#: ../urpmi.removemedia:78
#, c-format
@@ -2960,12 +3027,15 @@ msgstr " --force-key - εξαναγκασμός ενημέρωσης του
#: ../urpmi.update:46
#, c-format
msgid " --ignore - don't update, mark the media as ignored.\n"
-msgstr " --ignore - να μην ενημερωθεί, να σημειωθεί το μέσο ως αγνοημένο.\n"
+msgstr ""
+" --ignore - να μην ενημερωθεί, να σημειωθεί το μέσο ως αγνοημένο.\n"
#: ../urpmi.update:47
#, c-format
msgid " --no-ignore - don't update, mark the media as enabled.\n"
-msgstr " --no-ignore - να μην γίνει ενημέρωση, το μέσο θα σημειωθεί ως ενεργοποιημένο.\n"
+msgstr ""
+" --no-ignore - να μην γίνει ενημέρωση, το μέσο θα σημειωθεί ως "
+"ενεργοποιημένο.\n"
#: ../urpmi.update:49
#, c-format
@@ -2985,7 +3055,9 @@ msgstr " -f - εξαναγκάζει την ενημέρωση τω
#: ../urpmi.update:52
#, c-format
msgid " -ff - really force updating synthesis\n"
-msgstr " -ff - εξαναγκάζει πραγματικά την ενημέρωση των αρχείων synthesis\n"
+msgstr ""
+" -ff - εξαναγκάζει πραγματικά την ενημέρωση των αρχείων "
+"synthesis\n"
#: ../urpmi.update:69
#, c-format
@@ -2995,7 +3067,9 @@ msgstr "Μόνο ο διαχειριστής επιτρέπεται να ανα
#: ../urpmi.update:78
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "τίποτα για αναβάθμιση (χρησιμοποιήστε urpmi.addmedia για να προσθέσετε ένα μέσο)\n"
+msgstr ""
+"τίποτα για αναβάθμιση (χρησιμοποιήστε urpmi.addmedia για να προσθέσετε ένα "
+"μέσο)\n"
#: ../urpmi.update:87
#, c-format
@@ -3026,19 +3100,23 @@ msgstr "ενεργοποίηση του μέσου %s"
msgid ""
"urpmq version %s\n"
"Copyright (C) 2000-2006 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 %s\n"
"Copyright (C) 2000-2006 Mandriva.\n"
-"Αυτό είναι ελεύθερο λογισμικό και μπορεί να διανεμηθεί υπό τους όρους της GNU GPL.\n"
+"Αυτό είναι ελεύθερο λογισμικό και μπορεί να διανεμηθεί υπό τους όρους της "
+"GNU GPL.\n"
"\n"
"χρήση:\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 - χρήση μόνο των μέσων που δόθηκαν, στην αναζήτηση των\n"
" ζητούμενων (ή των αναβαθμιζόμενων) πακέτων.\n"
@@ -3066,7 +3144,8 @@ msgstr " --list-media - εμφανίζει τα διαθέσιμα μέσα
#: ../urpmq:60
#, c-format
msgid " --list-url - list available media and their url.\n"
-msgstr " --list-url - εμφανίζει τα διαθέσιμα μέσα ενημέρωσης και τα URL τους.\n"
+msgstr ""
+" --list-url - εμφανίζει τα διαθέσιμα μέσα ενημέρωσης και τα URL τους.\n"
#: ../urpmq:61
#, c-format
@@ -3082,7 +3161,8 @@ msgstr " --list-aliases - λίστα των διαθέσιμων παράλλη
#: ../urpmq:63
#, 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 - εμφανίζει την διαμόρφωση με τη μορφή ενός ορίσματος\n"
" urpmi.addmedia.\n"
@@ -3096,8 +3176,10 @@ msgstr ""
#: ../urpmq:65
#, c-format
-msgid " --sources - give all source packages before downloading (root only).\n"
-msgstr " --sources - δίνει όλα τα πηγαία πακέτα πριν τη λήψη (μόνο root).\n"
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
+msgstr ""
+" --sources - δίνει όλα τα πηγαία πακέτα πριν τη λήψη (μόνο root).\n"
#: ../urpmq:67
#, c-format
@@ -3225,13 +3307,18 @@ msgstr " -r - αναλυτική εμφάνιση της έκδοσ
#: ../urpmq:105
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
-msgstr " -s - το επόμενο πακέτο είναι πηγαίο πακέτο (ίδιο με το --src).\n"
+msgstr ""
+" -s - το επόμενο πακέτο είναι πηγαίο πακέτο (ίδιο με το --"
+"src).\n"
#: ../urpmq:106
#, 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 - αφαίρεση του πακέτου εάν μια πιο πρόσφατη έκδοση είναι ήδη\n"
+" -u - αφαίρεση του πακέτου εάν μια πιο πρόσφατη έκδοση είναι "
+"ήδη\n"
" εγκατεστημένη.\n"
#: ../urpmq:107
@@ -3243,14 +3330,16 @@ msgstr " -y - επιβάλει την ασαφής αναζήτησ
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
-" -Y - όπως το -y, αλλά δεν λαμβάνει υπόψη τον τύπο των χαρακτήρων\n"
+" -Y - όπως το -y, αλλά δεν λαμβάνει υπόψη τον τύπο των "
+"χαρακτήρων\n"
" (κεφαλαία/πεζά).\n"
# ???
#: ../urpmq:109
#, c-format
msgid " names or rpm files given on command line are queried.\n"
-msgstr " τα ονόματα ή τα αρχεία rpm που δόθηκαν στη γραμμή εντολών συγκεντρώθηκαν.\n"
+msgstr ""
+" τα ονόματα ή τα αρχεία rpm που δόθηκαν στη γραμμή εντολών συγκεντρώθηκαν.\n"
#: ../urpmq:156
#, c-format
@@ -3270,60 +3359,91 @@ msgstr "χρησιμοποίησε το -l για να δεις μια λίστ
#: ../urpmq:404
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
-msgstr "δεν βρέθηκαν πληροφορίες xml, για το μέσο \"%s\", μονάχα περιορισμένα αποτελέσματα για το πακέτο %s"
+msgstr ""
+"δεν βρέθηκαν πληροφορίες xml, για το μέσο \"%s\", μονάχα περιορισμένα "
+"αποτελέσματα για το πακέτο %s"
#: ../urpmq:405
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
-msgstr "δεν βρέθηκαν πληροφορίες xml, για το μέσο \"%s\", μονάχα περιορισμένα αποτελέσματα για τα πακέτα %s"
+msgstr ""
+"δεν βρέθηκαν πληροφορίες xml, για το μέσο \"%s\", μονάχα περιορισμένα "
+"αποτελέσματα για τα πακέτα %s"
#: ../urpmq:408
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
-msgstr "δεν βρέθηκαν πληροφορίες xml, για το μέσο \"%s\", αδύνατη η λήψη αποτελεσμάτων για το πακέτο %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
+msgstr ""
+"δεν βρέθηκαν πληροφορίες xml, για το μέσο \"%s\", αδύνατη η λήψη "
+"αποτελεσμάτων για το πακέτο %s"
#: ../urpmq:409
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
-msgstr "δεν βρέθηκαν πληροφορίες xml, για το μέσο \"%s\", αδύνατη η επιστροφή αποτελεσμάτων για τα πακέτα %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"δεν βρέθηκαν πληροφορίες xml, για το μέσο \"%s\", αδύνατη η επιστροφή "
+"αποτελεσμάτων για τα πακέτα %s"
#: ../urpmq:473
#, c-format
msgid "No changelog found\n"
msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
+#~ msgid "examining %s file"
+#~ msgstr "εξέταση αρχείου %s"
+
+#~ msgid "invalid MD5SUM file"
+#~ msgstr "μη έγκυρο αρχείο MD5SUM"
+
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "το αρχείο synthesis εντοπίστηκε σαν %s"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - δημιουργία μέσου αναβάθμισης.\n"
+
#~ msgid "malformed URL: [%s]"
#~ msgstr "κακοδιατυπωμένο URL: [%s]"
+
#~ msgid "sorry, you can't use --install-src to install remote .src.rpm files"
#~ msgstr ""
#~ "δεν μπορείτε να χρησιμοποιήσετε --install-src για να εγκαταστήσετε "
#~ "απομακρυσμένα .src.rpm αρχεία"
+
#~ msgid "Error"
#~ msgstr "Σφάλμα"
+
#~ msgid "%d installation transaction failed"
#~ msgid_plural "%d installation transactions failed"
#~ msgstr[0] "αποτυχία %d διεργασίας εγκατάστασης"
#~ msgstr[1] "αποτυχία %d διεργασιών εγκατάστασης"
+
#~ msgid "Package %s can not be installed"
#~ msgstr "Το πακέτο %s δεν μπορεί να εγκατασταθεί"
+
#~ msgid "Packages %s can not be installed"
#~ msgstr "Τα πακέτα %s δεν μπορούν να εγκατασταθούν"
+
#~ msgid "Checking to remove the following packages"
#~ msgstr "Έλεγχος για την αφαίρεση των παρακάτω πακέτων"
#, fuzzy
#~ msgid "%s database locked"
#~ msgstr "Η βάση δεδομένων urpmi είναι κλειδωμένη"
+
#~ msgid "Unknown option %s"
#~ msgstr "Άγνωστη επιλογή %s"
+
#~ msgid "too many mount points for removable medium \"%s\""
#~ msgstr "πολλαπλά σημεία σύνδεσης για το αφαιρούμενο μέσο \"%s\""
+
#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
#~ msgstr "Το μέσο \"%s\" είναι ένα αρχείο ISO, θα προσαρτηθεί on-the-fly"
+
#~ msgid "using different removable device [%s] for \"%s\""
#~ msgstr "χρήση διαφορετικής αφαιρούμενης συσκευής [%s] για το \"%s\""
+
#~ msgid "unable to retrieve pathname for removable medium \"%s\""
#~ msgstr ""
#~ "αδυναμία ανάκτησης της διαδρομής (pathname) για το αφαιρούμενο μέσο \"%s\""
@@ -3331,6 +3451,7 @@ msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
#, fuzzy
#~ msgid "unable to mount the distribution medium"
#~ msgstr "αδυναμία πρόσβασης στο πρώτο μέσο εγκατάστασης"
+
#~ msgid ""
#~ "unable to access medium \"%s\",\n"
#~ "this could happen if you mounted manually the directory when creating the "
@@ -3339,6 +3460,7 @@ msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
#~ "αδυναμία πρόσβασης μέσου \"%s\",\n"
#~ "αυτό μπορεί να συμβαίνει εάν έχετε προσαρτήσει μόνοι σας τον κατάλογο "
#~ "όταν δημιουργήθηκε το μέσο."
+
#~ msgid "inconsistent medium \"%s\" marked removable but not really"
#~ msgstr ""
#~ "το αντιφατικό μέσο \"%s\" έχει αναφερθεί ως αφαιρούμενο αλλά δεν είναι "
@@ -3347,14 +3469,17 @@ msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
#, fuzzy
#~ msgid " -c - clean headers cache directory.\n"
#~ msgstr " -v - αναλυτική λειτουργία.\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "το εικονικό μέσο χρειάζεται να είναι τοπικό"
#, fuzzy
#~ msgid "unable to parse synthesis file of \"%s\""
#~ msgstr "αδυναμία ανάλυσης του hdlist αρχείου από το \"%s\""
+
#~ msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
#~ msgstr "υπολογισμός md5sum από υπάρχουσα πηγή hdlist (ή synthesis) [%s]"
+
#~ msgid ""
#~ "virtual medium \"%s\" should not have defined hdlist or list file, medium "
#~ "ignored"
@@ -3365,6 +3490,7 @@ msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
#, fuzzy
#~ msgid "invalid hdlist name"
#~ msgstr "μη έγκυρο όνομα αρχείου rpm [%s]"
+
#~ msgid "unable to find list file for \"%s\", medium ignored"
#~ msgstr "αδυναμία εύρεσης αρχείου λίστας για το \"%s\", το μέσο αγνοείται"
@@ -3379,10 +3505,12 @@ msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
#, fuzzy
#~ msgid "unable to access list file of \"%s\""
#~ msgstr "αδυναμία ανάλυσης του hdlist αρχείου από το \"%s\""
+
#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
#~ msgstr ""
#~ "το μέσο \"%s\" προσπαθεί να χρησιμοποιήσει την ήδη χρησιμοποιημένη "
#~ "hdlist, το μέσο αγνοείται"
+
#~ msgid "medium \"%s\" trying to use an already used list, medium ignored"
#~ msgstr ""
#~ "το μέσο \"%s\" προσπαθεί να χρησιμοποιήσει την ήδη χρησιμοποιημένη λίστα, "
@@ -3394,29 +3522,39 @@ msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
#~ msgstr ""
#~ "Σημείωση: αφού δεν έγινε αναζήτηση σε κανένα μέσο που χρησιμοποιεί "
#~ "hdlists, το urpmf δεν μπόρεσε να επιστρέψει κανένα αποτέλεσμα\n"
+
#~ msgid "performing second pass to compute dependencies\n"
#~ msgstr "γίνεται δεύτερος έλεγχος για να υπολογιστούν οι εξαρτήσεις\n"
+
#~ msgid "building hdlist [%s]"
#~ msgstr "δημιουργία hdlist [%s]"
+
#~ msgid ""
#~ "Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
#~ "corrupted."
#~ msgstr ""
#~ "αδυναμία δημιουργίας αρχείου σύνθεσης για το μέσο \"%s\". Το αρχείο "
#~ "hdlist μπορεί να είναι λανθασμένο."
+
#~ msgid "problem reading hdlist or synthesis file of medium \"%s\""
#~ msgstr ""
#~ "πρόβλημα ανάγνωσης του hdlist ή του αρχείου σύνθεσης από το μέσο \"%s\""
+
#~ msgid "computing md5sum of copied source hdlist (or synthesis)"
#~ msgstr "υπολογισμός md5sum από αντιγραμμένης πηγής hdlist (ή synthesis)"
+
#~ msgid "...retrieving failed: md5sum mismatch"
#~ msgstr "... η ανάκτηση απέτυχε: Ασυμφωνία md5sum"
+
#~ msgid "no rpm files found from [%s]"
#~ msgstr "δεν βρέθηκαν αρχεία rpm από το [%s]"
+
#~ msgid "unable to read rpm files from [%s]: %s"
#~ msgstr "αδυναμία ανάγνωσης αρχείων rpm από το [%s]: %s"
+
#~ msgid "no rpms read"
#~ msgstr "καμία ανάγνωση rpm πακέτων"
+
#~ msgid "reading headers from medium \"%s\""
#~ msgstr "ανάγνωση επικεφαλίδων από το μέσο \"%s\""
@@ -3431,15 +3569,18 @@ msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
#~ msgstr ""
#~ " -h - Προσπάθησε να βρεις και να χρησιμοποιήσεις το αρχείο\n"
#~ " synthesis hdlist.\n"
+
#~ msgid ""
#~ "Note: since no media searched uses hdlists, urpmf was unable to return "
#~ "any result\n"
#~ msgstr ""
#~ "Σημείωση: αφού δεν έγινε αναζήτηση σε κανένα μέσο που χρησιμοποιεί "
#~ "hdlists, το urpmf δεν μπόρεσε να επιστρέψει κανένα αποτέλεσμα\n"
+
#~ msgid "You may want to use --name to search for package names.\n"
#~ msgstr ""
#~ "Μπορείτε να χρησιμοποιήσετε --name για την αναζήτηση ονομάτων πακέτων.\n"
+
#~ msgid " --src, -s - next package is a source package.\n"
#~ msgstr ""
#~ " --src, -s - το επόμενο πακέτο είναι ένα πακέτο πηγαίου κώδικα \n"
@@ -3449,14 +3590,19 @@ msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
#~ msgstr ""
#~ " -h - Προσπάθησε να βρεις και να χρησιμοποιήσεις το αρχείο\n"
#~ " synthesis hdlist.\n"
+
#~ msgid "unable to update medium \"%s\"\n"
#~ msgstr "αδυναμία αναβάθμισης του μέσου \"%s\"\n"
+
#~ msgid "unable to create medium \"%s\"\n"
#~ msgstr "αδυναμία δημιουργίας του μέσου \"%s\"\n"
+
#~ msgid "there are multiple packages with the same rpm filename \"%s\""
#~ msgstr "υπάρχουν πολλαπλά πακέτα με το ίδιο όνομα αρχείου rpm \"%s\""
+
#~ msgid "unable to correctly parse [%s] on value \"%s\""
#~ msgstr "αδυναμία σωστής ανάλυσης του [%s] στην τιμή \"%s\""
+
#~ msgid ""
#~ "medium \"%s\" uses an invalid list file:\n"
#~ " mirror is probably not up-to-date, trying to use alternate method"
@@ -3464,14 +3610,19 @@ msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
#~ "το μέσο \"%s\" χρησιμοποιεί ένα μη έγκυρο αρχείο λίστας:\n"
#~ " η τοποθεσία mirror μάλλον δεν είναι πλήρως ενημερωμένη, προσπάθεια "
#~ "χρησιμοποίησης εναλλακτικής μεθόδου"
+
#~ msgid "medium \"%s\" does not define any location for rpm files"
#~ msgstr "το μέσο \"%s\" δεν καθορίζει κάποια τοποθεσία για τα αρχεία rpm"
+
#~ msgid "unrequested"
#~ msgstr "δεν ζητήθηκαν"
+
#~ msgid " (%d MB)"
#~ msgstr " (%d MB)"
+
#~ msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
#~ msgstr "προσθήκη πακέτου %s (id=%d, eid=%d, αναβάθμιση=%d, αρχείο=%s)"
+
#~ msgid ""
#~ "The following packages have bad signatures:\n"
#~ "%s\n"
@@ -3487,15 +3638,19 @@ msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
#, fuzzy
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Πρέπει να είστε root για να κάνετε χρήση της εντολής ! \n"
+
#~ msgid "unable to remove package %s"
#~ msgstr "αδυναμία αφαίρεσης του πακέτου %s"
+
#~ msgid "No filelist found\n"
#~ msgstr "Δεν βρέθηκε αρχείο λίστας (filelist)\n"
+
#~ msgid ""
#~ "To satisfy dependencies, the following %d packages will be removed (%d MB)"
#~ msgstr ""
#~ "Για να ικανοποιηθούν οι εξαρτήσεις, τα παρακάτω πακέτα %d θα αφαιρεθούν (%"
#~ "d MB)"
+
#~ msgid ""
#~ "To satisfy dependencies, the following %d packages are going to be "
#~ "installed:\n"
@@ -3504,62 +3659,83 @@ msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
#~ "Για να ικανοποιηθούν οι εξαρτήσεις, τα ακόλουθα πακέτα %d πρέπει να "
#~ "εγκατασταθούν:\n"
#~ "%s\n"
+
#~ msgid "Installing packages on nodes..."
#~ msgstr "Εγκατάσταση πακέτων στους κόμβους..."
+
#~ msgid "Distributing files to %s..."
#~ msgstr "Κατανομή αρχείων στο %s..."
+
#~ msgid "Performing install on %s..."
#~ msgstr "Εκτέλεση εγκατάστασης σε %s..."
+
#~ msgid "Preparing install on %s..."
#~ msgstr "Προετοιμάζω εγκατάσταση σε %s...."
+
#~ msgid ""
#~ "\n"
#~ "unknown options '%s'\n"
#~ msgstr ""
#~ "\n"
#~ "άγνωστες επιλογές '%s'\n"
+
#~ msgid "unable to find hdlist file for \"%s\", medium ignored"
#~ msgstr ""
#~ "αδυναμία εύρεσης του αρχείου hdlist για το \"%s\", το μέσο αγνοείται"
+
#~ msgid "inconsistent list file for \"%s\", medium ignored"
#~ msgstr "μη συναφές αρχείο λίστας για το \"%s\", το μέσο αγνοείται"
+
#~ msgid "unable to inspect list file for \"%s\", medium ignored"
#~ msgstr ""
#~ "αδυναμία επιθεώρησης αρχείου λίστας για το \"%s\", το μέσο αγνοείται"
+
#~ msgid "virtual medium \"%s\" is not local, medium ignored"
#~ msgstr "το εικονικό μέσο \"%s\" δεν είναι τοπικό, το μέσο αγνοείται"
+
#~ msgid ""
#~ "virtual medium \"%s\" should have valid source hdlist or synthesis, "
#~ "medium ignored"
#~ msgstr ""
#~ "το εικονικό μέσο \"%s\" πρέπει να έχει έγκυρη πηγή hdlist ή σύνθεσης, το "
#~ "μέσο αγνοείται"
+
#~ msgid "copying source hdlist (or synthesis) of \"%s\"..."
#~ msgstr "αντιγραφή πηγής hdlist (ή synthesis) από \"%s\"..."
+
#~ msgid "retrieval of source hdlist (or synthesis) failed"
#~ msgstr "απέτυχε η ανάκτηση του πηγαίου hdlist (ή synthesis) "
+
#~ msgid "file [%s] already used in the same medium \"%s\""
#~ msgstr "το αρχείο [%s] χρησιμοποιείται από το ίδιο μέσο \"%s\""
+
#~ msgid "nothing written in list file for \"%s\""
#~ msgstr "τίποτα δεν γράφτηκε στο αρχείο λίστας για το \"%s\""
+
#~ msgid "found %d headers in cache"
#~ msgstr "βρέθηκαν %d επικεφαλίδες στην προσωρινή μνήμη"
+
#~ msgid "removing %d obsolete headers in cache"
#~ msgstr ""
#~ "αφαίρεση των μη χρησιμοποιημένων %d επικεφαλίδων από την προσωρινή μνήμη"
+
#~ msgid "using process %d for executing transaction"
#~ msgstr "χρήση διαδικασίας %d για την εκτέλεση transaction"
+
#~ msgid " --norebuild - don't try to rebuild hdlist if not readable.\n"
#~ msgstr ""
#~ " --norebuild - μην προσπαθείς να ξαναδημιουργήσεις την hdlist εάν δεν "
#~ "είναι εγγράψιμη.\n"
+
#~ msgid "copying hdlists file..."
#~ msgstr "αντιγραφή αρχείου hdlist..."
+
#~ msgid "invalid hdlist description \"%s\" in hdlists file"
#~ msgstr "μη έγκυρη περιγραφή hdlist \"%s\" μέσα στο αρχείο hdlists"
+
#~ msgid " -g [group] - restrict results to given group.\n"
#~ msgstr ""
#~ " -g [group] - περιορισμένα αποτελέσματα στην ομάδα που δόθηκε.\n"
+
#~ msgid " defaults is %s.\n"
#~ msgstr " προκαθορισμένο είναι το %s.\n"
-
diff --git a/po/eo.po b/po/eo.po
index 09911947..26186c16 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+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"
@@ -33,7 +33,7 @@ msgstr "RPM instalado"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Jes"
@@ -99,7 +99,7 @@ msgstr "_Instalu"
msgid "_Save"
msgstr "_Konservu"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Nuligu"
@@ -131,9 +131,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - presu tiun ĉi help-mesaĝon.\n"
@@ -167,19 +166,19 @@ msgstr ""
" --verify-rpm - kontrolu rpm-signaturon antaŭ instalado\n"
" (--no-verify-rpm elŝaltu ĝin, defaŭlta estas enŝaltita).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - uzu nur la donitajn datenportilojn, disigitajn per komo.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - permesu serĉadon en \"disponigas\" por trovi la pakaĵon.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - ne serĉu en provides por trovi pakaĵon.\n"
@@ -221,7 +220,22 @@ msgstr "Bonvole atendu..."
msgid "Must be root"
msgstr "Devas esti sistemestro"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "distribuanta %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Instalado de pakaĵo..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Instalado de pakaĵo..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -237,37 +251,37 @@ msgstr ""
msgid "Warning"
msgstr "Averto"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Jes"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (ĝisdatigi)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (instali)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Unu el la sekvantaj pakaĵoj estas bezonata:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "Ĉ_esigu"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -278,14 +292,14 @@ msgstr ""
"%s\n"
"Ĉu vi deziras tamen daŭrigi?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
"Por plenumi dependaĵojn, la sekvanta pakaĵo estos ankaŭ instalita (%d MB)"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -294,49 +308,44 @@ msgstr ""
"esti instalataj:\n"
"%s\n"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d pakaĵo, %d MB)"
msgstr[1] "(%d pakaĵoj, %d MB)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Instalado de pakaĵo..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "Ne povas preni fontajn pakaĵojn, mi ĉesiĝas."
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Mi preparas..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Mi instalas pakaĵon '%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Bonvole enŝovu la medion nomata \"%s\" en aparaton [%s]"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Mi elŝutas pakaĵon '%s'..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Finata"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -347,28 +356,28 @@ msgstr ""
"%s\n"
"Eble vi ĝisdatigu vian urpmi-datenbazon"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "Instalado malsukcesis:"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "La pakaĵo(j) estas jam instalita(j)"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Instalo finita"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "foriganta %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "restartas urpmi"
@@ -407,7 +416,7 @@ msgstr " defaŭlte al %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -g - printu grupojn ankaŭ kun nomo.\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Nur superuzulo rajtas instali pakaĵojn"
@@ -417,134 +426,143 @@ msgstr "Nur superuzulo rajtas instali pakaĵojn"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "Ne povas krei dosierujon [%s] por cim-raporto"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "Mi elŝutas pakaĵon '%s'..."
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "uzante specifan medion sur %s\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "ne povis malfermi rpmdb"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nevalida rpm-a dosiernomo [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "mi ekstraktas rpm-dosieron [%s] ..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "... ekstraktado farita"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...ekstraktado malsukcesis: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "ne povis atingi rpm-an dosieron [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "ne povis analizi \"%s\" en dosiero [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "ne povas registri rpm-dosieron"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "eraro dum registri lokajn pakaĵojn"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "malĝusta deklaro de prokuro en la komanda linio\n"
-#: ../urpm/args.pm:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Mankas signaturo (%s)"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Kopiado malsukcesis"
@@ -591,122 +609,122 @@ msgstr ""
msgid "unable to write config file [%s]"
msgstr "ne povas skribi konfigurodosieron [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr ""
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr ""
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Salutnomo :"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Pasvorto:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr ""
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr ""
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, fuzzy, c-format
msgid "copy failed"
msgstr "Kopiado malsukcesis"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, fuzzy, c-format
msgid "wget is missing\n"
msgstr "pro mankanta %s"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, fuzzy, c-format
msgid "curl is missing\n"
msgstr "pro mankanta %s"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr ""
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr ""
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr ""
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr ""
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr ""
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "pro mankanta %s"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr ""
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, fuzzy, c-format
msgid "retrieving %s"
msgstr "foriganta %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...ekstraktado malsukcesis: %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "nekonata protokolo difinita por %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr ""
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, 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:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "ne povas uzi la protokolon: %s"
@@ -726,59 +744,59 @@ msgstr "pakaĵo %s ne estis trovata."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "ekstraktanta la rpm-dosierojn de datenportilo \"%s\"..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
"transakcio kreita por instali sur %s (forigu=%d, instalu=%d, ĝisdatigu=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "ne povis krei transakcion"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "ne povas forigi pakaĵon %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "ne povas instali pakaĵon %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "instalas %s el %s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "...ekstraktado malsukcesis: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "mi forigas la pakaĵon %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "mi forigas la pakaĵon %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "instalas %s el %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Kromaj informoj pri pakaĵo %s"
@@ -823,90 +841,80 @@ msgstr "Averto"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Instalado malsukcesis"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Instalado malsukcesis:"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, c-format
msgid "The following package has bad signature"
msgstr "La sekvanta pakaĵo havas malĝustan signaturon"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "La sekvantaj pakaĵoj havas malĝustajn signaturojn"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Ĉu vi deziras daŭrigi la instaladon ?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "instalas %s el %s"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "distribuanta %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "instalas %s el %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "instalas %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Provu instaladon sen kontroli dependaĵojn? (j/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Provu instaladon eĉ pli forte (--force)? (j/N) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Instalado eblas"
#: ../urpm/md5sum.pm:26
-#, fuzzy, c-format
-msgid "examining %s file"
-msgstr "mi kontrolas dosieron MD5SUM"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "atentu: md5-sumo por %s ne haveblas en dosiero MD5SUM"
@@ -980,229 +988,229 @@ msgstr "instalus anstataŭ ĝisdatigi pakaĵon %s"
msgid "medium \"%s\" already exists"
msgstr "medio \"%s\" jam ekzistas"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "mi legas la ĉapojn de la datenportilo \"%s\""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "foriganta datenportilon \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr ""
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "ne povis malfermi rpmdb"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"neeblas aliri la unuan instal-datenportilon (ne trovis hdlists-dosieron)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "mi ekstraktas la dosieron hdlists..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "provas elekti neekzistantan datenportilon \"%s\""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "mi elektas plurtipan datenportilon: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "foriganta datenportilon \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "rekonfiguras urpmi-on por datenportilo \"%s\"..."
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...rekonfigurado malsukcesis"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "rekonfigurado finita"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "medio \"%s\" ne estas elektata"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "mi kontrolas la sintezo-dosieron [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problemo por legi sintezan dosieron por datenportilo \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "skribante list-dosieron por datenportilo \"%s\""
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...kopiado malsukcesis"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "mi kopias priskrib-dosieron de \"%s\"..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...kopiado farita"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopiado de [%s] malsukcesis (dosiero estas strange malgranda)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "kalkulata md5sum de ekstraktita fonto hdlist (aŭ sintezo)"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "kopiado de [%s] malsukcesis (md5sum-konfuzo)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "kontrolanta hdlist-dosieron [%s]"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "instalas %s el %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "neniu \"hdlist\" dosiero trovita por medio \"%s\""
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "mi kopias priskrib-dosieron de \"%s\"..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "nevalida rpm-a dosiernomo [%s]"
-#: ../urpm/media.pm:1461
-#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "ekstraktanta la font-hd-liston (aŭ sintezon) de \"%s\"..."
-
-#: ../urpm/media.pm:1478
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "provita hd-listo (aŭ sintezo) trovita kiel %s"
+msgid "no metadata found for medium \"%s\""
+msgstr "neniu \"hdlist\" dosiero trovita por medio \"%s\""
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "neniu \"hdlist\" dosiero trovita por medio \"%s\""
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "ekstraktanta la font-hd-liston (aŭ sintezon) de \"%s\"..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "kontrolante la publikan ĉifroŝlosilon de \"%s\"..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...importis ĉifroŝlosilon %s de \"%s\""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "ne povis importi la publikan ĉifroŝlosilon de \"%s\""
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "neniu \"hdlist\" dosiero trovita por medio \"%s\""
+
+#: ../urpm/media.pm:1612
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "aldonita datenportilo %s"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "mi legas la rpm-dosierojn de [%s]"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1273,7 +1281,7 @@ msgstr ""
msgid "TB"
msgstr ""
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1632,11 +1640,6 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "uzante specifan medion sur %s\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1652,118 +1655,136 @@ msgstr "konstruis hdlist-an sintezan dosieron por medio \"%s\""
msgid "no xml-info available for medium \"%s\""
msgstr "skribante list-dosieron por datenportilo \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Neniu pakaĵo nomata %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "La sekvantaj pakaĵoj enhavas %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "La pakaĵoj estas jam instalitaj"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, c-format
msgid "Package %s is already installed"
msgstr "La pakaĵo %s estas jam instalita"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, c-format
msgid "Packages %s are already installed"
msgstr "La pakaĵoj %s estas jam instalitaj"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "pro mankanta %s"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "La pakaĵo %s estas jam instalita"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "pro neplenumita %s"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "mi provas disponigi %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "por konservi %s"
#: ../urpm/select.pm:607
#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"La sekvanta pakaĵo estas forigota por ke aliaj estu ĝisdatigotaj:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"La sekvantaj pakaĵoj estas forigotaj por ke aliaj estu ĝisdatigotaj:\n"
+"%s"
+
+#: ../urpm/select.pm:635
+#, c-format
msgid "in order to install %s"
msgstr "por instali %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "pro konflikto kun %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Nevalida signaturo (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Nevalida Ŝlosil-ID (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Mankas signaturo (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "ne povas skribi dosieron [%s]"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "Kopiado malsukcesis"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "Kopiado malsukcesis"
@@ -1806,7 +1827,7 @@ msgstr ""
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - distribuita urpmi tra maŝinoj de kromnomo.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - printu etiked-pakilon: packager.\n"
@@ -1834,7 +1855,7 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - babilema modo.\n"
@@ -1898,7 +1919,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "Malinstalu %d pakaĵon?"
msgstr[1] "Malinstalu %d pakaĵojn?"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (J/n) "
@@ -2156,17 +2177,22 @@ msgstr " --url - presu url-on de etikedo: url.\n"
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - printu etikedan priskribon: description.\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - printu etikedajn konfliktojn: ĉiuj konfliktoj.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - pakaĵoj kiuj ne devas esti instalataj.\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, fuzzy, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --skip - pakaĵoj kiuj ne devas esti instalataj.\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2176,70 +2202,70 @@ msgstr ""
"elektojn\n"
" ol en la defaŭlta moduso.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - konservu rpm ne uzatan en kaŝejo.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - ĝisdatigu nur pakaĵoj por la sama arkitekturo.\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - elektu ĉiujn kongruojn en la komanda linio.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - silenta modo.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --verbose - babilema modo.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " nomoj aŭ rpm-dosieroj tapitaj en la komanda linio instaliĝos.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "Kio fareblas per binaraj rpm-dosieroj se uzante --install-src"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2248,17 +2274,12 @@ msgstr ""
"Dosieraro [%s] jam ekzistas, bonvole elektu alian dosieraron por la cim-"
"raporto, aŭ forigi ĝin"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Ne povas krei dosierujon [%s] por cim-raporto"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2267,48 +2288,48 @@ msgstr ""
"Eraro: %s ŝajnas esti nur legebla.\n"
"Uzu --allow-force por provi skribadon."
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (ĝisdatigi)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (ĝisdatigi)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (instali)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (instali)"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "Por plenumi dependaĵojn, la sekvanta pakaĵo estas forigota"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Kiu estas via elekto? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2320,7 +2341,7 @@ msgstr ""
"kiuj estas pli malnovaj ol tiuj kiuj estas jam instalataj:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2332,19 +2353,19 @@ msgstr ""
"kiuj estas pli malnovaj ol tiuj kiuj estas jam instalataj:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Ĉu mi devus daŭri malgraŭe?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (J/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2353,7 +2374,7 @@ msgstr ""
"Iuj postulataj pakaĵoj ne instaleblas:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2362,12 +2383,12 @@ msgstr ""
"Iuj postulataj pakaĵoj ne instaleblas:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "forigi pakaĵon %s detruos vian sistemon"
-#: ../urpmi:551
+#: ../urpmi:538
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2378,7 +2399,7 @@ msgstr ""
"forigotas por ke aliaj estu ĝisdatigotaj:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2389,30 +2410,12 @@ msgstr ""
"forigotas por ke aliaj estu ĝisdatigotaj:\n"
"%s\n"
-#: ../urpmi:560
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"La sekvanta pakaĵo estas forigota por ke aliaj estu ĝisdatigotaj:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"La sekvantaj pakaĵoj estas forigotaj por ke aliaj estu ĝisdatigotaj:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2422,46 +2425,46 @@ msgstr ""
"Vi devas esti root por instali la sekvantajn dependaĵojn:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "Por plenumi dependaĵojn, la sekvanta pakaĵo estas forigota"
msgstr[1] "Por plenumi dependaĵojn, la %d sekvantaj pakaĵoj estas forigotaj"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Nuligu"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Premu la enigklavon kiam vi pretas..."
@@ -3197,6 +3200,14 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Neniu \"changelog\" trovita\n"
+#, fuzzy
+#~ msgid "examining %s file"
+#~ msgstr "mi kontrolas dosieron MD5SUM"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "provita hd-listo (aŭ sintezo) trovita kiel %s"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - kreu ĝisdatigan datenportilon.\n"
diff --git a/po/es.po b/po/es.po
index 4850813f..7b09b29f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -18,7 +18,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-es\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2008-08-30 13:35-0300\n"
"Last-Translator: José Manuel Pérez <jmprodu@hotmail.com>\n"
"Language-Team: Español <es@li.org>\n"
@@ -38,7 +38,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:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -106,7 +106,7 @@ msgstr "_Instalar"
msgid "_Save"
msgstr "_Guardar"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Cancelar"
@@ -138,9 +138,8 @@ msgstr ""
msgid "Options:"
msgstr "Opciones:"
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../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"
@@ -178,18 +177,18 @@ msgstr ""
" --verify-rpm - verificar la firma del rpm antes de la instalación.\n"
" (--no-verify-rpm lo deshabilita, habilitado predet.).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - usar sólo soportes dados, separados por comas.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - permite buscar en «provides» para encontrar paquete.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -p - no buscar en «provides» para encontrar paquete.\n"
@@ -230,7 +229,22 @@ msgstr "Por favor, espere..."
msgid "Must be root"
msgstr "Debe ser root"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "distribuyendo %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Instalación de paquete..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Instalación de paquete..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -246,37 +260,37 @@ msgstr ""
msgid "Warning"
msgstr "Advertencia"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Aceptar"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (para actualizar)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (para instalar)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Elección de paquetes"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Uno de los paquetes siguientes es necesario:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Abortar"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -287,62 +301,57 @@ msgstr ""
"%s\n"
"¿Continuar a pesar de todo?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Para satisfacer las dependencias, se instalará el paquete siguiente"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, 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:"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d paquete, %d MB)"
msgstr[1] "(%d paquetes, %d MB)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Instalación de paquete..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "no se pueden obtener los paquetes fuente, abortando"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Preparando..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Instalando paquete `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Por favor, inserte el soporte denominado «%s»"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Descargando paquete `%s'..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Hecho"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -353,28 +362,28 @@ msgstr ""
"%s\n"
"Puede querer actualizar su base de datos de urpmi"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "Falló la instalación:"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "ya está todo instalado"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Finalizó la instalación"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "quitando %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "reiniciando urpmi"
@@ -413,7 +422,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:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Sólo el superusuario está autorizado a instalar paquetes"
@@ -423,136 +432,145 @@ msgstr "Sólo el superusuario está autorizado a instalar paquetes"
msgid "Running urpmi in restricted mode..."
msgstr "Lanzando urpmi en modo restringido..."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, c-format
msgid "fail to create directory %s"
msgstr "no se puede crear el directorio %s"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr "dueño no válido para el directorio %s"
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, c-format
msgid "Can not download packages into %s"
msgstr "No se pueden descargar los paquetes en %s"
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr "El directorio de entorno %s no existe"
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "uasando un entorno específico en %s\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "no se puede abrir rpmdb"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nombre de archivo rpm no válido [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "obteniendo archivo rpm [%s] ..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...recuperación hecha"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...falló la recuperación: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "no se puede acceder al archivo rpm [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "no se pudo interpretar el archivo spec %s [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "no se puede registrar el archivo rpm"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Arquitectura incompatible para el rpm [%s]"
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "error registrando paquetes locales"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Esta operación está prohibida en modo restringido"
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, 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:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "expresión %s no esperada"
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "falta expresíon antes de %s"
-#: ../urpm/args.pm:382
+#: ../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:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "no hay expresión a cerrar"
-#: ../urpm/args.pm:395
+#: ../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ía usar la opción «--"
"literal»"
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "el directorio chroot no existe"
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr "No se puede usar %s sin %s"
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr "No se puede usar %s con %s"
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr "Demasiados argumentos\n"
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Falló la copia"
@@ -601,123 +619,123 @@ msgstr "el soporte «%s» está definido dos veces, abortando"
msgid "unable to write config file [%s]"
msgstr "no se puede escribir el archivo de configuración [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "%s no está disponible, probando con %s"
+
+#: ../urpm/download.pm:157
#, 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)"
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Por favor, ingrese sus credenciales para acceder al proxy\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Nombre de usuario:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Contraseña:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr "¡¡¡webfetch «%» desconocido!!!\n"
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr "%s falló: salió con la señal %d"
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr "%s falló: salió con %d"
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, c-format
msgid "copy failed"
msgstr "falló la copia"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, c-format
msgid "wget is missing\n"
msgstr "falta wget\n"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, c-format
msgid "curl is missing\n"
msgstr "falta curl\n"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr "curl falló: descarga cancelada\n"
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr "falta rsync\n"
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr "falta ssh\n"
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr "falta prozilla\n"
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr "No se pudo ejecutar prozilla\n"
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, c-format
msgid "aria2 is missing\n"
msgstr "falta aria2\n"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr " %s%% de %s completo, ETA = %s, velocidad = %s"
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr " %s%% completo, velocidad = %s"
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, c-format
msgid "retrieving %s"
msgstr "descargando %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, c-format
msgid "retrieved %s"
msgstr "descargados %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "protocolo desconocido definido para %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "%s no está disponible, probando con %s"
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, 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:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "no se puede manejar el protocolo: %s"
@@ -737,12 +755,12 @@ msgstr "no se encontró el paquete %s."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "obteniendo archivos rpm desde el soporte «%s» ..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr "[reempaquetado]"
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -750,47 +768,47 @@ msgstr ""
"transacción creada para instalar sobre %s (quitar=%d, instalar=%d, "
"actualizar=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "no se puede crear transacción"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "no se puede extraer el rpm del paquete delta-rpm %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "no se puede instalar el paquete %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "quitando rpm no válido (%s) desde %s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, c-format
msgid "removing %s failed: %s"
msgstr "falló la eliminación de %s: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, c-format
msgid "Removing package %s"
msgstr "Quitando paquete %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "quitando paquete %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "quitando rpms instalados (%s) desde %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Más información sobre el paquete %s"
@@ -836,18 +854,18 @@ 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)"
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Falló la instalación"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr "¿Intenta continuar de todas formas? (s/N) "
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -856,73 +874,63 @@ msgstr ""
"Falló la instalación, rpms no válidos:\n"
"%s"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, c-format
msgid "The following package has bad signature"
msgstr "El siguiente paquete contienen una firma no válida"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Los siguientes paquetes contienen firmas no válidas"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "¿Desea continuar con la instalación?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, c-format
msgid "removing installed rpms (%s)"
msgstr "quitando rpms instalandos (%s)"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "distribuyendo %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "instalando %s desde %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "instalando %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "¿Intentar de instalar sin verificar las dependencias? (s/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "¿Intentar con más fuerza la instalación (--force)? (s/N) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr "Los paquetes están actualizados"
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Es posible la instalación"
#: ../urpm/md5sum.pm:26
#, c-format
-msgid "examining %s file"
-msgstr "examinando archivo %s"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr "archivo MD5SUM no válido"
-
-#: ../urpm/md5sum.pm:28
-#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "atención: md5sum para %s no está disponible en el fichero MD5SUM"
@@ -995,231 +1003,231 @@ msgstr "instalaría en vez de actualizar el paquete %s"
msgid "medium \"%s\" already exists"
msgstr "ya existe el soporte «%s»"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr "(ignorado de manera predeterminada)"
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "añadiendo soporte «%s» antes del soporte remoto «%s»"
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, c-format
msgid "adding medium \"%s\""
msgstr "añadiendo soporte «%s»"
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr "el directorio %s no existe"
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "esta ubicación no parece contener una distribución"
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, c-format
msgid "unable to parse media.cfg"
msgstr "no se puede interpretar media.cfg"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, 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)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr "omitiendo soporte no compatible «%s» (para %s)"
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, c-format
msgid "retrieving media.cfg file..."
msgstr "recuperando archivo media.cfg..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "intentando seleccionar soporte inexistente \"%s\""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "seleccionando soportes múltiples: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "quitando el soporte «%s»"
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "reconfigurando urpmi para el soporte «%s»"
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...falló la reconfiguración"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "reconfiguración terminada"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
"Error generando el archivo de nombres: no se encontró la dependencia %d"
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "el soporte «%s» está al día"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "examinando el archivo de síntesis [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problema leyendo el archivo de síntesis del soporte «%s»"
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "copiando [%s] para el soporte «%s»..."
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...falló la copia"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "copiando descripción de archivo de «%s»..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...copia hecha"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "falló la copia de [%s] (el archivo es sospechosamente pequeño)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "computando md5sum del synthesis fuente descargado"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "falló la descarga de [%s] (no coincide md5sum)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, c-format
msgid "genhdlist2 failed on %s"
msgstr "falló genhdlist2 en %s"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, c-format
msgid "comparing %s and %s"
msgstr "comparando %s y %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "archivo hdlist %s no válido para el soporte «%s»"
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "copiando archivo MD5SUM de «%s»..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "archivo MD5SUM no válido (descargado desde %s)"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
+#, fuzzy, c-format
+msgid "no metadata found for medium \"%s\""
+msgstr "no se encuentra el archivo synthesis para el soporte «%s»"
+
+#: ../urpm/media.pm:1475
#, c-format
msgid "retrieving source synthesis of \"%s\"..."
msgstr "descargando synthesis fuente de «%s»..."
-#: ../urpm/media.pm:1478
-#, c-format
-msgid "found probed synthesis as %s"
-msgstr "encontrado synthesis por prueba como %s"
-
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
-#, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "no se encuentra el archivo synthesis para el soporte «%s»"
-
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "examinando archivo de clave pública de «%s»..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "... se importó clave %s desde archivo de clave pública de «%s»"
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "no se puede importar archivo de clave pública de «%s»"
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "no se encuentra el archivo synthesis para el soporte «%s»"
+
+#: ../urpm/media.pm:1612
#, c-format
msgid "updated medium \"%s\""
msgstr "soporte «%s» actualizado"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr "falló la descarga de [%s]"
-#: ../urpm/mirrors.pm:19
+#: ../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"
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr "No se pudo encontrar una ráplica en la lista de réplicas %s"
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr "se encontró la geolocalización %s %.2f %.2f para el huso horario %s"
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, c-format
msgid "getting mirror list from %s"
msgstr "obteniendo lista de réplicas desde %s"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1290,7 +1298,7 @@ msgstr "GB"
msgid "TB"
msgstr "TB"
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1674,11 +1682,6 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Formato incorrecto: debe usar sólo una etiqueta multi-valor"
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "uasando un entorno específico en %s\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1694,121 +1697,139 @@ msgstr "no hay synthesis para el soporte «%s»"
msgid "no xml-info available for medium \"%s\""
msgstr "no hay xml-info para el soporte «%s»"
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr "se reinició urpmi, y la lista de paquetes prioritarios no cambió"
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, 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"
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Ningún paquete llamado %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Los siguientes paquetes contienen %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr "Debería usar \"-a\" para utilizarlos a todos"
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, 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"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, c-format
msgid "Package %s is already installed"
msgstr "El paquete %s ya está instalado"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, c-format
msgid "Packages %s are already installed"
msgstr "Los paquetes %s ya están instalados"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "debido a que falta %s"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, c-format
msgid "due to already installed %s"
msgstr "debido a que ya está instalado %s"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "debido a que no se satisfizo %s"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "intentando promover %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "para mantener %s"
#: ../urpm/select.pm:607
#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Se tiene que quitar el paquete siguiente para poder actualizar otros:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Se tienen que quitar los paquetes siguientes para poder actualizar otros:\n"
+"%s"
+
+#: ../urpm/select.pm:635
+#, c-format
msgid "in order to install %s"
msgstr "para instalar %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "debido a conflictos con %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Firma no válida (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "ID de clave no válida (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Falta firma (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr "sistema"
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr "Debería reiniciar %s para %s"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't write file"
msgstr "No se puede escribir archivo"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't open file"
msgstr "No se puede abrir archivo"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, c-format
msgid "Can't move file %s to %s"
msgstr "No se puede mover archivo %s a %s"
@@ -1854,7 +1875,7 @@ msgstr ""
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - urpmi distribuido entre máquinas de alias.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../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"
@@ -1885,7 +1906,7 @@ msgstr ""
"distribución,\n"
" útil para (des)instalar un chroot con la opción --root.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - modo informativo.\n"
@@ -1952,7 +1973,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "¿Quitar %d paquete?"
msgstr[1] "¿Quitar %d paquetes?"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (s/N) "
@@ -2221,17 +2242,22 @@ msgstr ""
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - no ejecutar los scriplets del paquete\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - imprime conflictos.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - paquetes que no deberían instalarse\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --prefer - paquetes que deberían ser preferidos\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2240,45 +2266,45 @@ msgstr ""
" --more-choices - cuando se encuentran varios paquetes, proponer más\n"
" opciones que las predeterminadas.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - no trabar la DB de rpm.\n"
-#: ../urpmi:147
+#: ../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"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
" -a - selecciona todas coincidencias en línea de comando.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - modo silencioso.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --debug - modo muy informativo.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " se instalan los nombres o archivos rpm dados en línea de comandos.\n"
-#: ../urpmi:182
+#: ../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"
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2288,29 +2314,29 @@ msgstr ""
"usuales\n"
"de la línea de comandos, junto con --bug.\n"
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "No puede instalar archivos rpm binarios utilizando --install-src"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr "No puede instalar archivos spec"
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr "asumiendo --buildrequires"
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
"por favor, use --buildrequires o --install-src, asumiendo --buildrequires"
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2319,17 +2345,12 @@ msgstr ""
"El directorio [%s] ya existe, por favor use otro directorio para reportar "
"errores o bórrelo"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "No se puede crear el directorio [%s] para reporte de bugs"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr "El directorio de entorno %s no existe"
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2338,36 +2359,36 @@ msgstr ""
"Error: %s parece estar montado como sólo lectura.\n"
"Use --allow-force para forzar la operación"
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr "Actualizando soportes...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (para actualizar)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (para actualizar)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (para instalar)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (para instalar)"
-#: ../urpmi:462
+#: ../urpmi:450
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2376,12 +2397,12 @@ msgstr ""
"Para satisfacer la dependencia «%s», se necesita uno de los paquetes "
"siguientes:"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "¿Qué elige? (1-%d)"
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2392,7 +2413,7 @@ msgstr ""
"más antiguos que los ya instalados:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2403,7 +2424,7 @@ msgstr ""
"más antiguos que los ya instalados:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2412,12 +2433,12 @@ msgstr ""
"\n"
"¿Seguir adelante con la instalación?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (S/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2426,7 +2447,7 @@ msgstr ""
"No se puede instalar el paquete pedido:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2435,12 +2456,12 @@ msgstr ""
"No se puede instalar algunos paquetes pedidos:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "quitar el paquete %s dañará su sistema"
-#: ../urpmi:551
+#: ../urpmi:538
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2451,7 +2472,7 @@ msgstr ""
"siguiente para poder actualizar otros:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2462,30 +2483,12 @@ msgstr ""
"siguientes para poder actualizar otros:\n"
"%s\n"
-#: ../urpmi:560
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Se tiene que quitar el paquete siguiente para poder actualizar otros:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Se tienen que quitar los paquetes siguientes para poder actualizar otros:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(sólo prueba, no se llevará a cabo la desinstalación)"
-#: ../urpmi:583
+#: ../urpmi:568
#, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2496,46 +2499,46 @@ msgstr ""
"dependencias siguientes:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "Se quitará el paquete huérfano siguiente."
msgstr[1] "Se quitarán los paquetes huérfanos siguientes."
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(sólo prueba, no se llevará a cabo la instalación)"
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr "se utilizarán %s de espacio de disco adicional."
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr "se liberará %s de espacio de disco."
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr "se descargarán %s de paquetes."
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
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:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Cancelar"
-#: ../urpmi:648
+#: ../urpmi:633
#, c-format
msgid "Press Enter when mounted..."
msgstr "Presione «Intro» cuando el soporte sté montado..."
@@ -3314,6 +3317,15 @@ msgstr ""
msgid "No changelog found\n"
msgstr "No se encontró changelog\n"
+#~ msgid "examining %s file"
+#~ msgstr "examinando archivo %s"
+
+#~ msgid "invalid MD5SUM file"
+#~ msgstr "archivo MD5SUM no válido"
+
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "encontrado synthesis por prueba como %s"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - crea sólo soporte de actualización.\n"
diff --git a/po/et.po b/po/et.po
index 56c1ed61..aada31cb 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2008-08-30 12:48+0300\n"
"Last-Translator: Marek Laane <bald@starman.ee>\n"
"Language-Team: Estonian <linux-ee@lists.eenet.ee>\n"
@@ -27,7 +27,7 @@ msgstr "RPM-i paigaldamine"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Viga: faili %s ei leitud, toiming katkestatakse"
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Olgu"
@@ -93,7 +93,7 @@ msgstr "_Paigalda"
msgid "_Save"
msgstr "_Salvesta"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Loobu"
@@ -125,9 +125,8 @@ msgstr ""
msgid "Options:"
msgstr "Võtmed:"
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - näitab seda abiteadet.\n"
@@ -164,19 +163,19 @@ msgstr ""
" --verify-rpm - kontrollib RPM-i signatuuri enne paigaldust\n"
" (--no-verify-rpm tühistab selle, vaikimisi on sees).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - kasutatakse ainult määratud andmekandjaid (eraldajaks "
"koma).\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - lubab pakette otsida pakutavate seas.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - ei luba pakettide otsimist pakutavate seas.\n"
@@ -217,7 +216,22 @@ msgstr "Palun oodake..."
msgid "Must be root"
msgstr "Vajalikud on administraatori õigused"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "%s jaotamine"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Paketi paigaldamine..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Paketi paigaldamine..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -233,37 +247,37 @@ msgstr ""
msgid "Warning"
msgstr "Hoiatus"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Olgu"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (uuendus)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (paigaldus)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Paketivalik"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Vajalik on üks järgnevatest pakettidest:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Katkesta"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -274,61 +288,56 @@ msgstr ""
"%s\n"
"Kas siiski jätkata paigaldamist?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Sõltuvuste lahendamiseks paigaldatakse järgmine pakett:"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Sõltuvuste lahendamiseks paigaldatakse järgmised paketid:"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d pakett, %d MB)"
msgstr[1] "(%d paketti, %d MB)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Paketi paigaldamine..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "pakette ei õnnestunud hankida, katkestatakse"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Valmistumine..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Paketi '%s' paigaldamine (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Palun sisestage andmekandja nimega \"%s\""
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Paketi '%s' allalaadimine..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Tehtud"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -339,28 +348,28 @@ msgstr ""
"%s\n"
"Te võiksite ehk uuendada urpmi andmebaasi"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "Paigaldamine nurjus:"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Kõik on juba paigaldatud"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Paigaldus lõpetatud"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "%s eemaldamine"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "urpmi taaskäivitamine"
@@ -400,7 +409,7 @@ msgstr " vaikimisi on %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - näitab RPM-i täielikku nime (NVRA).\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Pakette võib paigaldada ainult administraator"
@@ -410,135 +419,144 @@ msgstr "Pakette võib paigaldada ainult administraator"
msgid "Running urpmi in restricted mode..."
msgstr "Urpmi käivitamine piiratud režiimis..."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, c-format
msgid "fail to create directory %s"
msgstr "kataloogi %s loomine nurjus"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr "kataloogi %s vale omanik"
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, c-format
msgid "Can not download packages into %s"
msgstr "%s pakettide allalaadimine nurjus"
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr "Keskkonna kataloogi %s ei ole olemas"
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "spetsiifilise keskkonna kasutamine %s puhul\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "rpmdb avamine nurjus"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "vigane RPM-faili nimi [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "RPM-faili [%s] tõmbamine..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...tõmbamine tehtud"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...tõmbamine nurjus: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "ligipääs RPM-failile [%s] nurjus"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "spetsifikatsioonifaili %s parsimine nurjus [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "RPM-faili registreerimine nurjus"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Sobimatu arhitektuur RPM-ile [%s]"
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "viga kohalike pakettide registreerimisel"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "See operatsioon on piiratud režiimis keelatud"
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "käsureal on määratud vigane puhverserver\n"
-#: ../urpm/args.pm:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "ootamatu avaldis %s"
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "avaldis puudub %s ees"
-#: ../urpm/args.pm:382
+#: ../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:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "pole ühtegi avaldist lõpetada"
-#: ../urpm/args.pm:395
+#: ../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:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot-kataloogi ei ole olemas"
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr "%s kasutamine on võimalik ainult koos %s-ga"
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr "%s kasutamine ei ole võimalik %s-ga"
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr "Liiga palju argumente\n"
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Kopeerimine nurjus"
@@ -587,122 +605,122 @@ msgstr "andmekandja '%s' on määratud kaks korda, loobutakse'"
msgid "unable to write config file [%s]"
msgstr "seadistustefaili [%s] kirjutamine nurjus"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "%s ei ole kättesaadav, kasutatakse %s"
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr "puhverserveri sätete lugemine nurjus (%s lugemiseks puuduvad õigused)"
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Palun anna oma tunnused puhverserveri kasutamiseks\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Kasutajanimi:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Parool:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr "Tundmatu veebitõmbaja '%s'!\n"
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr "%s nurjus: lõpetas signaaliga %d"
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr "%s nurjus: lõpetas %d-ga"
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, c-format
msgid "copy failed"
msgstr "kopeerimine nurjus"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, c-format
msgid "wget is missing\n"
msgstr "wget puudub\n"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, c-format
msgid "curl is missing\n"
msgstr "curl puudub\n"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr "curl nurjus: allalaadimine katkestati\n"
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr "rsync puudub\n"
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr "ssh puudub\n"
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr "prozilla puudub\n"
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr "Prozilla käivitamine nurjus\n"
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, c-format
msgid "aria2 is missing\n"
msgstr "aria2 puudub\n"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr " %s%% %s-st valmis, aega jäänud: %s, kiirus: %s"
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr " %s%% valmis, kiirus: %s"
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, c-format
msgid "retrieving %s"
msgstr "%s tõmbamine"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, c-format
msgid "retrieved %s"
msgstr "tõmmati %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "tundmatu protokoll %s jaoks"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "%s ei ole kättesaadav, kasutatakse %s"
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "veebitõmbajat ei leitud, toetatud on programm %s\n"
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "ei suuda käsitleda protokolli: %s"
@@ -722,59 +740,59 @@ msgstr "paketti %s ei leitud."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "RPM-failide tõmbamine andmekandjalt \"%s\"..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr "[taaspakendamine]"
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
"tehing %s paigaldamiseks loodud (eemaldus=%d, paigaldus=%d, uuendus=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "tehingu loomine nurjus"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "RPM-i ekstraktimine delta-rpm-paketist %s nurjus"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "paketi %s paigaldamine nurjus"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "vigase RPM-faili (%s) eemaldamine %s-st"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, c-format
msgid "removing %s failed: %s"
msgstr "%s eemaldamine nurjus: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, c-format
msgid "Removing package %s"
msgstr "Paketi %s eemaldamine"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "paketi %s eemaldamine"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "paigaldatud RPM-failide (%s) eemaldamine %s-st"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Rohkem infot paketi %s kohta"
@@ -819,18 +837,18 @@ msgstr "loobutakse"
msgid "%s database is locked (another program is already using it)"
msgstr "%s andmebaas on lukus (seda kasutab teine programm)"
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Paigaldamine nurjus"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr "Kas proovida siiski jätkata? (j/E)"
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -839,73 +857,63 @@ msgstr ""
"Paigaldamine nurjus, vigased RPM-failid:\n"
"%s"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, c-format
msgid "The following package has bad signature"
msgstr "Järgmisel paketil on vigane signatuur"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Järgmistel pakettidel on vigane signatuur"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Kas jätkata paigaldusega?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, c-format
msgid "removing installed rpms (%s)"
msgstr "paigaldatud RPM-failide (%s) eemaldamine"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "%s jaotamine"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "%s paigaldamine andmekandjalt %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "%s paigaldamine"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Kas proovida paigaldust ilma sõltuvusi kontrollimata? (j/E)"
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Kas proovida paigaldust veel jõulisemalt (--force)? (j/E) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr "Pole ühtegi paketti uuendada"
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Paigaldamine on võimalik"
#: ../urpm/md5sum.pm:26
#, c-format
-msgid "examining %s file"
-msgstr "%s faili uurimine"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr "vigane MD5SUM-fail"
-
-#: ../urpm/md5sum.pm:28
-#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "hoiatus: MD5SUM failis puudub %s MD5 kontrollsumma"
@@ -978,229 +986,229 @@ msgstr "paketti %s ei uuendata, seda saab ainult paigaldada"
msgid "medium \"%s\" already exists"
msgstr "andmekandja \"%s\" on juba olemas"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr "(vaikimisi eiratakse)"
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "andmekandja \"%s\" lisamine enne võrguandmekandjat \"%s\""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, c-format
msgid "adding medium \"%s\""
msgstr "andmekandja \"%s\" lisamine"
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr "kataloogi %s ei ole olemas"
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "see asukoht ei paista sisaldavat ühtegi distributsiooni"
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, c-format
msgid "unable to parse media.cfg"
msgstr "faili media.cfg parsimine nurjus"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"ligipääs distributsiooniandmekandjale nurjus (ei leitud faili media.cfg)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr "jäetakse vahele mitteühilduv andmekandja '%s' (%s)"
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, c-format
msgid "retrieving media.cfg file..."
msgstr "faili media.cfg tõmbamine..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "püüti valida olematut andmekandjat \"%s\""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "mitme andmekandja valik: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "andmekandja \"%s\" eemaldamine"
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "urpmi ümberseadistamine andmekandja \"%s\" tarbeks"
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...ümberseadistamine nurjus"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "ümberseadistamine tehtud"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Viga nimedefaili loomisel: sõltuvust %d ei leitud"
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "andmekandja \"%s\" on täiesti värske"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "sünteesifaili [%s] uurimine"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "probleem andmekandja \"%s\" sünteesifaili lugemisel"
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "kopeeritakse [%s] andmekandjale \"%s\"..."
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...kopeerimine nurjus"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "\"%s\" kirjelduste faili kopeerimine..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...kopeerimine tehtud"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "[%s] kopeerimine nurjus (fail on kahtlaselt väike)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "tõmmatud allika sünteesifaili MD5SUM arvutamine"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "[%s] tõmbamine nurjus (MD5SUM ei klapi)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, c-format
msgid "genhdlist2 failed on %s"
msgstr "genhdlist2 nurjus %s puhul"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, c-format
msgid "comparing %s and %s"
msgstr "%s ja %s võrdlemine"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "vigane hdlist-fail %s andmekandjale \"%s\""
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "\"%s\" MD5SUM-faili kopeerimine..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "vigane MD5SUM-fail (alla laaditud asukohast %s)"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
+#, fuzzy, c-format
+msgid "no metadata found for medium \"%s\""
+msgstr "andmekandjale \"%s\" ei leitud sünteesifaili"
+
+#: ../urpm/media.pm:1475
#, c-format
msgid "retrieving source synthesis of \"%s\"..."
msgstr "\"%s\" allika sünteesifaili tõmbamine..."
-#: ../urpm/media.pm:1478
-#, c-format
-msgid "found probed synthesis as %s"
-msgstr "leiti kontrollitud sünteesifail %s"
-
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
-#, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "andmekandjale \"%s\" ei leitud sünteesifaili"
-
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "\"%s\" avaliku võtme faili uurimine..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...imporditi võti %s \"%s\" avaliku võtme failist"
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "\"%s\" avaliku võtme faili import nurjus"
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "andmekandjale \"%s\" ei leitud sünteesifaili"
+
+#: ../urpm/media.pm:1612
#, c-format
msgid "updated medium \"%s\""
msgstr "uuendati andmekandjat \"%s\""
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr "[%s] tõmbamine nurjus"
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr "püütakse uuesti peegliga %s"
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr "Peeglite nimekirjas %s ei leitud peeglit"
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr "leiti geolokatsioon %s %.2f %.2f ajavööndist %s"
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, c-format
msgid "getting mirror list from %s"
msgstr "%s peeglite nimekirja lugemine"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "EeNn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1271,7 +1279,7 @@ msgstr "GB"
msgid "TB"
msgstr "TB"
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1646,11 +1654,6 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Vigane vorming: kasutada tohib ainult üht mitme väärtusega silti"
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "spetsiifilise keskkonna kasutamine %s puhul\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1666,13 +1669,13 @@ msgstr "andmekandjale \"%s\" ei leitud sünteesifaili"
msgid "no xml-info available for medium \"%s\""
msgstr "andmekandjale \"%s\" ei leitud XML-infot"
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
"urpmi käivitati uuesti ja prioriteetsete pakettide nimekirja ei muudetud"
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
@@ -1680,107 +1683,125 @@ msgstr ""
"urpmi käivitati uuesti ja muudeti prioriteetsete pakettide nimekirja: %s %s "
"asemel"
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Paketti nimega %s ei ole"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "%s sisaldub järgmistes pakettides: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr "Kõigi nende kasutamiseks tuleks anda \"-a\""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, c-format
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:543
+#: ../urpm/select.pm:538
#, c-format
msgid "Package %s is already installed"
msgstr "Pakett %s on juba paigaldatud"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, c-format
msgid "Packages %s are already installed"
msgstr "Paketid %s on juba paigaldatud"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "puuduva %s tõttu"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, c-format
msgid "due to already installed %s"
msgstr "juba paigaldatud %s tõttu"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "rahuldamata %s tõttu"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "püüdes välja pakkuda %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "säilitamaks %s"
#: ../urpm/select.pm:607
#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Teiste uuendamiseks tuleb eemaldada järgmine pakett:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Teiste uuendamiseks tuleb eemaldada järgmised paketid:\n"
+"%s"
+
+#: ../urpm/select.pm:635
+#, c-format
msgid "in order to install %s"
msgstr "paigaldamaks %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "konflikti tõttu %s-ga"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Vigane signatuur (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Vigane võtme ID (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Puudub signatuur (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr "süsteem"
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr "%s tuleks taaskäivitada, sest seda vajab %s"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't write file"
msgstr "Faili kirjutamine nurjus"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't open file"
msgstr "Faili avamine nurjus"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, c-format
msgid "Can't move file %s to %s"
msgstr "Faili %s liigutamine asukohta %s ei ole võimalik"
@@ -1826,7 +1847,7 @@ msgstr ""
" --parallel - jagatud urpmi käivitamine üle mitme aliasega määratud "
"masina.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - pakendab failid uuesti enne kustutamist.\n"
@@ -1857,7 +1878,7 @@ msgstr ""
" kasulik chroot paigaldamiseks/eemaldamiseks võtmega --"
"root.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - selgitav režiim.\n"
@@ -1921,7 +1942,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "Kas eemaldada %d pakett?"
msgstr[1] "Kas eemaldada %d paketti?"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (j/E) "
@@ -2184,17 +2205,22 @@ msgstr ""
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - pakettide skripte ei käivitata.\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - näitab konflikte.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - paigaldamisel vahele jäetavad paketid.\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --prefer - eelistatavad paketid.\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2203,42 +2229,42 @@ msgstr ""
" --more-choices - mitme paketi leidmisel pakutakse lisaks vaikevalikule\n"
" ka teisi valikuid.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - RPM-ide andmebaasi ei lukustata.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - uuendatakse ainult senise arhitektuuriga pakette.\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - valib kõik käsureaga sobivad.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - vaikne režiim.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --debug - väga jutukas režiim.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " paigaldatakse käsureal antud nimed või RPM-failid.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr "Viga: võtit --auto-select ei saa kasutada koos pakettide loendiga.\n"
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2247,22 +2273,22 @@ msgstr ""
"Viga: vearaporti loomiseks kasutage koos võtmega --bug\n"
"tavalisi käsureaargumente.\n"
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "Binaarseid RPM-faile ei saa paigaldada võtme --install-src kasutamisel"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr "Spetsifikatsioonifaile ei saa paigaldada"
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr "vaikimisi rakendatakse võtit --buildrequires"
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
@@ -2270,7 +2296,7 @@ msgstr ""
"palun kasutage võtit --buildrequires või --install-src, vaikimisi "
"rakendatakse võtit --buildrequires"
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2279,17 +2305,12 @@ msgstr ""
"Kataloog [%s] on juba olemas, palun kasutage vearaportideks muud kataloogi "
"või kustutage see"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Kataloogi [%s] loomine vearaportideks nurjus"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr "Keskkonna kataloogi %s ei ole olemas"
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2298,48 +2319,48 @@ msgstr ""
"Viga: %s paistab olevat haagitud ainult loetavana.\n"
"Kasutage operatsiooni pealesundimiseks võtit --allow-force."
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr "Andmekandja uuendamine...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (uuendus)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (uuendus)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (paigaldus)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (paigaldus)"
-#: ../urpmi:462
+#: ../urpmi:450
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "Sõltuvuse '%s' lahendamiseks on vajalik üks järgmistest pakettidest:"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Millise valite? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2350,7 +2371,7 @@ msgstr ""
"vanemad kui paigaldatud paketid:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2361,7 +2382,7 @@ msgstr ""
"vanemad kui paigaldatud paketid:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2370,12 +2391,12 @@ msgstr ""
"\n"
"Kas siiski paigaldamist jätkata?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (J/e) "
-#: ../urpmi:524
+#: ../urpmi:512
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2384,7 +2405,7 @@ msgstr ""
"Soovitud paketti ei õnnestu paigaldada:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2393,12 +2414,12 @@ msgstr ""
"Mõnda soovitud paketti ei õnnestu paigaldada:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "paketi %s eemaldamine halvab Teie süsteemi"
-#: ../urpmi:551
+#: ../urpmi:538
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2409,7 +2430,7 @@ msgstr ""
"järgmine pakett:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2420,30 +2441,12 @@ msgstr ""
"järgmised paketid:\n"
"%s\n"
-#: ../urpmi:560
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Teiste uuendamiseks tuleb eemaldada järgmine pakett:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Teiste uuendamiseks tuleb eemaldada järgmised paketid:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(ainult test, tegelikult midagi ei eemaldata)"
-#: ../urpmi:583
+#: ../urpmi:568
#, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2454,46 +2457,46 @@ msgstr ""
"buildrequires:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "Eemaldatakse järgmine orvust pakett."
msgstr[1] "Eemaldatakse järgmised orvust paketid."
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(ainult test, tegelikult midagi ei paigaldata)"
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr "Kasutusele võetakse veel %s kettaruumi."
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr "Vabaneb %s kettaruumi."
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr "Tõmmatakse %s andmeid."
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Kas paigaldada 1 pakett?"
msgstr[1] "Kas paigaldada %d paketti?"
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Loobu"
-#: ../urpmi:648
+#: ../urpmi:633
#, c-format
msgid "Press Enter when mounted..."
msgstr "Vajutage Enter, kui see on tehtud..."
@@ -3268,6 +3271,15 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Muutuste logi ei leitud\n"
+#~ msgid "examining %s file"
+#~ msgstr "%s faili uurimine"
+
+#~ msgid "invalid MD5SUM file"
+#~ msgstr "vigane MD5SUM-fail"
+
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "leiti kontrollitud sünteesifail %s"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - loob uuendatava andmekandja.\n"
diff --git a/po/eu.po b/po/eu.po
index 686ccf33..b489550a 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2008-10-04 12:44+0200\n"
"Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
"Language-Team: Euskara <eu@li.org>\n"
@@ -29,7 +29,7 @@ msgstr "RPM instalaketa"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Akatsa: ezin da %s fitxategia aurkitu, eragiketa galaraziko da"
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Ados"
@@ -95,7 +95,7 @@ msgstr "_Instalatu"
msgid "_Save"
msgstr "_Gorde"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Utzi"
@@ -127,9 +127,8 @@ msgstr ""
msgid "Options:"
msgstr "Aukerak:"
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - laguntza-mezu hau inprimatzen du.\n"
@@ -145,15 +144,18 @@ msgstr ""
#: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
msgstr ""
" --auto-select - automatikoki sistemaren bertsioa berritzeko paketeak "
"hautatzen ditu\n"
#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - deitzea behartzen du, nahiz eta pakete batzuk ez egon.\n"
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - deitzea behartzen du, nahiz eta pakete batzuk ez egon.\n"
#: ../gurpmi.pm:50 ../urpmi:133
#, c-format
@@ -165,19 +167,20 @@ msgstr ""
" (--no-verify-rpm ezgaitzeko, era lehenetsian gaituta "
"dago).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - emandako euskarria bakarrik erabiltzen du, komaz "
"bereizita.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
-msgstr " -p - paketeak aurkitzeko bilaketa 'provides'en egitea baimentzen du.\n"
+msgstr ""
+" -p - paketeak aurkitzeko bilaketa 'provides'en egitea baimentzen du.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -p - paketeak aurkitzeko bilaketa ez du 'provides'en egiten.\n"
@@ -192,11 +195,13 @@ msgstr " --root - beste root bat erabiltzen du rpm instalatzeko.\n"
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
-msgstr " --test - instalazioa zuzen gauzatu daitekeen egiaztatzen du.\n"
+msgstr ""
+" --test - instalazioa zuzen gauzatu daitekeen egiaztatzen du.\n"
#: ../gurpmi.pm:57 ../urpmi:76
#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
" --searchmedia - soilik adierazitako euskarria erabiltzen du eskatutako "
"paketeak bilatzeko.\n"
@@ -216,7 +221,22 @@ msgstr "Itxaron mesedez..."
msgid "Must be root"
msgstr "Root izan behar da"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "%s banatzen"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Paketearen instalazioa..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Paketearen instalazioa..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -232,37 +252,37 @@ msgstr ""
msgid "Warning"
msgstr "Kontuz"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Ados"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (Eguneratu)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (instalatu)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Paketa aukera"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Ondoko paketeetako bat behar da:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Geldiarazi"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -273,59 +293,56 @@ msgstr ""
"%s\n"
"Instalazioarekin jarraitu hala ere?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, 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 "Mendekotasunak asetzeko, ondorengo paketea instalatuko da:"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Mendekotasunak asetzeko, ondoko paketeak instalatuko dira:"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(pakete %d, %d MB)"
msgstr[1] "(%d pakete, %d MB)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Paketearen instalazioa..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "ezin dira iturburuko paketeak lortu, abortatzen"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Prestatzen..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "`%s' paketea instalatzen (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Mesedez, sartu \"%s\" izeneko euskarria"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "`%s' paketea deskargatzen..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Eginda"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -336,28 +353,28 @@ msgstr ""
"%s\n"
"Zure urpmi datu-basea eguneratzea komeni da"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "Instalaketak huts egin du:"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Dena dago instalatuta"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Instalazioa amaitu da"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "%s kentzen"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "urpmi berrabiarazten"
@@ -396,7 +413,7 @@ msgstr " lehenetsia %s da.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - irteeran jarri rpm izen osoa (NVRA)\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Supererabiltzaileak bakarrik du paketeak instalatzeko baimena"
@@ -406,136 +423,145 @@ msgstr "Supererabiltzaileak bakarrik du paketeak instalatzeko baimena"
msgid "Running urpmi in restricted mode..."
msgstr "urpmi modu murriztuan exekutatzen..."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, c-format
msgid "fail to create directory %s"
msgstr "%s direktorioa sortzeak huts egin du"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr "%s direktorioarentzako jabe baliogabea"
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, c-format
msgid "Can not download packages into %s"
msgstr "Paketeak ezin dira %s-ra jaitsi"
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr "%s ingurune direktorioa ez da existitzen"
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "%s(e)n ingurune espezifikoa erabiliz\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "ezin da rpmdb ireki"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "rpm fitxategi-izen baliogabea [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "[%s] rpm fitxategia berreskuratzen..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...berreskuratu da"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...berreskuratzeak huts egin du: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "ezin izan da rpm fitxategia atzitu [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "ezin da %s spec fitxategia sintaktikoki egiaztatu [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "ezin da rpm fitxategia erregistratu"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "rpm-rentzako arkitektura bateraezina [%s]"
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "errorea pakete lokalak erregistratzean"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Eragiketa hau debekatuta dago modu murriztuan exekutatzerakoan"
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "proxy-adierazpen okerra komando-lerroan\n"
-#: ../urpm/args.pm:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "%s ezusteko adierazpena"
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "%s-ren aurretik adierazpena falta da"
-#: ../urpm/args.pm:382
+#: ../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:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "ez dago itxi beharreko adierazpenik"
-#: ../urpm/args.pm:395
+#: ../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:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot direktorioa ez da existitzen"
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr "Ezin da %s %s gabe erabili"
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr "Ezin da %s %s-rekin erabili"
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr "Argumentu gehiegi\n"
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Ezin izan da kopiatu"
@@ -584,122 +610,123 @@ msgstr "'%s' euskarria bitan definituta dago, galarazten"
msgid "unable to write config file [%s]"
msgstr "ezin da [%s] konfigurazio-fitxategia idatzi"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "%s ez dago eskuragarri, %s erabiliko da"
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
-msgstr "ezin proxy ezarpenak irakurri (behar adinako eskubiderik ez %s irakurtzeko)"
+msgstr ""
+"ezin proxy ezarpenak irakurri (behar adinako eskubiderik ez %s irakurtzeko)"
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Mesedez sartu proxy-ra sartzeko zure egiaztapen datuak\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Erabiltzaile izena:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Pasahitza:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr "webfetch `%s' ezezaguna !!!\n"
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr "%s-k huts egin du: %d seinalearekin irten da"
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr "%s-k huts egin du: %d-rekin irten da"
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, c-format
msgid "copy failed"
msgstr "kopiak huts egin du"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, c-format
msgid "wget is missing\n"
msgstr "wget falta da\n"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, c-format
msgid "curl is missing\n"
msgstr "curl falta da\n"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr "curl-ek huts egin du: deskarga galarazita\n"
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr "rsync falta da\n"
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr "ssh falta da\n"
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr "prozilla falta da\n"
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr "Ezin izan da prozilla exekutatu\n"
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, c-format
msgid "aria2 is missing\n"
msgstr "aria2 falta da\n"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr " %s%% / %s osatuta, ETA = %s, abiadura = %s"
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr " %s%% osatuta, abiadura = %s"
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, c-format
msgid "retrieving %s"
msgstr "%s berreskuratzen"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, c-format
msgid "retrieved %s"
msgstr "%s eskuratuta"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "%s(e)rako protokolo ezezaguna definitu da"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "%s ez dago eskuragarri, %s erabiliko da"
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, 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:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "ezin da protokoloa maneiatu: %s"
@@ -719,59 +746,60 @@ msgstr "ez da %s paketea aurkitu."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "rpm fitxategiak berreskuratzen \"%s\" euskarritik..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr "[birpaketatzen]"
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
"transakzioa sortu da %s(e)n instalatzeko (kendu=%d, instalatu=%d,eguneratu=%"
"d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "ezin da transakziorik sortu"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "ezin da rpm atera %s delta-rpm paketetik"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "ezin da %s paketea instalatu"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "(%s) rpm okerra %s-tik ezabatzen"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, c-format
msgid "removing %s failed: %s"
msgstr "%s ezabatzeak huts egin du: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, c-format
msgid "Removing package %s"
msgstr "%s paketea ezabatzen"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "%s paketea kentzen"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "%2$s-n instalatutako rpm-ak (%1$s) ezabatzen"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Informazio gehiago %s paketeari buruz"
@@ -814,20 +842,21 @@ msgstr "galarazten"
#: ../urpm/lock.pm:65
#, c-format
msgid "%s database is locked (another program is already using it)"
-msgstr "%s datubasea giltzatuta dago (beste programa bat hura erabiltzen ari da)"
+msgstr ""
+"%s datubasea giltzatuta dago (beste programa bat hura erabiltzen ari da)"
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Instalazioak huts egin du"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr "Hala ere jarraitzen saiatu? (y/N)"
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -836,80 +865,71 @@ msgstr ""
"Instalaketak huts egin du, rpm okerrak:\n"
"%s"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, c-format
msgid "The following package has bad signature"
msgstr "Ondoko paketeak sinadura okerra dauka"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Ondoko pakete hauek sinadura okerra dute"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Instalatzen jarraitu nahi duzu?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, c-format
msgid "removing installed rpms (%s)"
msgstr "instalatutako rpm-ak ezabatzen (%s)"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "%s banatzen"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "%s %s-tik instalatzen"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "%s instalatzen"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Mendekotasunak egiaztatu gabe saiatu nahi duzu instalatzen? (b/E) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Indar handiagoz instalatzen saiatu (--force)? (b/E) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr "Paketeak egunean daude"
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Instalazioa posible da"
#: ../urpm/md5sum.pm:26
#, c-format
-msgid "examining %s file"
-msgstr "%s fitxategia aztertzen"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr "MD5SUM fitxategi baliogabea"
-
-#: ../urpm/md5sum.pm:28
-#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "oharra: %s-rentzako md5sum ezin da eskuratu MD5SUM fitxategian"
#: ../urpm/media.pm:204
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "\"%s\" euskarri birtualak url garbia eduki beharko luke, ez ikusi egingo zaio"
+msgstr ""
+"\"%s\" euskarri birtualak url garbia eduki beharko luke, ez ikusi egingo zaio"
#: ../urpm/media.pm:206
#, c-format
@@ -921,12 +941,14 @@ msgstr ""
#: ../urpm/media.pm:213
#, c-format
msgid "unable to access synthesis file of \"%s\", medium ignored"
-msgstr "ezin da \"%s\"(r)en synthesis fitxategia atzitu, euskarriari jaramonik ez"
+msgstr ""
+"ezin da \"%s\"(r)en synthesis fitxategia atzitu, euskarriari jaramonik ez"
#: ../urpm/media.pm:240
#, c-format
msgid "trying to override existing medium \"%s\", skipping"
-msgstr "existitzen den \"%s\" euskarriari jaramonik ez egiteko ahalegina, ekiditen"
+msgstr ""
+"existitzen den \"%s\" euskarriari jaramonik ez egiteko ahalegina, ekiditen"
#: ../urpm/media.pm:456
#, c-format
@@ -977,228 +999,228 @@ msgstr "%s paketea eguneratu beharrean instalatu egingo luke"
msgid "medium \"%s\" already exists"
msgstr "\"%s\" euskarria lehendik badago"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr "(era lehenetsian jaramonik ez)"
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "\"%s\" euskarria \"%s\" urruneko euskarriaren aurretik eransten"
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, c-format
msgid "adding medium \"%s\""
msgstr "\"%s\" euskarria eransten"
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr "%s direktorioa ez da existitzen"
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "kokapen honek ez dirudi banaketarik daukanik"
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, c-format
msgid "unable to parse media.cfg"
msgstr "ezin izan da media.cfg sintaktikoki egiaztatu"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "ezin da banaketa menua atzitu (ez da media.cfg fitxategirik aurkitu)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr "alboratu '%s' euskarri ez bateragarria (%s-rentzako)"
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, c-format
msgid "retrieving media.cfg file..."
msgstr "media.cfg fitxategia berreskuratzen..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "existitzen ez den \"%s\" euskarria hautatu nahian zabiltza"
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "hainbat euskarri hautatzen: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "\"%s\" euskarria kentzen"
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "\"%s\" euskarriarentzako urpmi birkonfiguratzen"
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...birkonfiguraketak hutsegin du"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "birkonfiguraketa amaituta"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Akatsa izen fitxategia sortzerakoan: %d menpekotasuna ez da aurkitu"
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "\"%s\" euskarria egunean dago"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "[%s] laburpen-fitxategia aztertzen"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "arazoa \"%s\" euskarriaren laburpen-fitxategia irakurtzean"
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "[%s] kopiatzen \"%s\" euskarriarentzako..."
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...ezin izan da kopiatu"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "\"%s\"(r)en deskribapen-fitxategia kopiatzen..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...kopiatzea burutu da"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "ezin izan da [%s] kopiatu (fitxategia txikiegia da)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "berreskuratutako iturburu synthesis-en md5sum kalkulatzen"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "[%s]-ren berreskuperaketak huts egin du (md5sum ez dator bat)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, c-format
msgid "genhdlist2 failed on %s"
msgstr "genhdlist2-k huts egin du %s-rekin"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, c-format
msgid "comparing %s and %s"
msgstr "%s eta %s parekatzen"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "%s hdlist fitxategi baliogabea \"%s\" euskarriarentzat"
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "\"%s\"-ren MD5SUM fitxategia kopiatzen..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "MD5SUM fitxategi baliogabea (%s-tik jaitsitakoa)"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
+#, fuzzy, c-format
+msgid "no metadata found for medium \"%s\""
+msgstr "ez da \"%s\" euskarriaren synthesis fitxategirik aurkitu"
+
+#: ../urpm/media.pm:1475
#, c-format
msgid "retrieving source synthesis of \"%s\"..."
msgstr "\"%s\"-ren synthesis iturburua berreskuratzen..."
-#: ../urpm/media.pm:1478
-#, c-format
-msgid "found probed synthesis as %s"
-msgstr "aztertutako synthesis aurkitu da %s gisa"
-
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
-#, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "ez da \"%s\" euskarriaren synthesis fitxategirik aurkitu"
-
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "\"%s\"(r)en gako publikoen fitxategia aztertzen..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...%s gakoa inportatu da \"%s\"(r)en gako publikoen fitxategitik"
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "ezin da \"%s\"(r)en gako publikoen fitxategia inportatu"
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "ez da \"%s\" euskarriaren synthesis fitxategirik aurkitu"
+
+#: ../urpm/media.pm:1612
#, c-format
msgid "updated medium \"%s\""
msgstr "\"%s\" euskarri eguneratua"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr "[%s] berreskurapenak huts egin du"
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr "%s ispiluarekin berriz saiatzen"
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr "Ezin da ispilu bat aurkitu %s ispilu zerrendan"
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr "%s %.2f %.2f geokokapenak aurkitu dira %s ordugunetik"
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, c-format
msgid "getting mirror list from %s"
msgstr "%s-tik ispilu zerrenda jasotzen"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "eEnN"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1269,7 +1291,7 @@ msgstr "GB"
msgid "TB"
msgstr "TB"
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1277,7 +1299,9 @@ msgid ""
msgid_plural ""
"The following packages are now orphans, use \"urpme --auto-orphans\" to "
"remove them."
-msgstr[0] "Ondoko paketeak umezutz daude orain, erabili \"urpme --auto-orphans\" berauek ezabatzeko."
+msgstr[0] ""
+"Ondoko paketeak umezutz daude orain, erabili \"urpme --auto-orphans\" "
+"berauek ezabatzeko."
msgstr[1] ""
#: ../urpm/parallel.pm:14
@@ -1335,7 +1359,9 @@ msgstr "cp-k huts egin du %s ostalarian (%d)"
msgid ""
"%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
"code: %d)"
-msgstr "%s-k huts egin du %s ostalarian (agian ez dauka urpmi-ren bertsio egokia?) (irteera kodea: %d)"
+msgstr ""
+"%s-k huts egin du %s ostalarian (agian ez dauka urpmi-ren bertsio egokia?) "
+"(irteera kodea: %d)"
#: ../urpm/removable.pm:32
#, c-format
@@ -1384,11 +1410,13 @@ msgstr ""
#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
-msgstr " --excludemedia - ez erabili adierazitako euskarria, komaz bereizita.\n"
+msgstr ""
+" --excludemedia - ez erabili adierazitako euskarria, komaz bereizita.\n"
#: ../urpm/search.pm:39 ../urpmf:39
#, c-format
-msgid " --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
" --literal, -l - ez parekatu patroi gisa, erabili argumentua hitzez hitz "
"testu ilara gisa.\n"
@@ -1398,11 +1426,13 @@ msgstr ""
#: ../urpmi.update:48 ../urpmq:70
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
-msgstr " --urpmi-root - erabili beste erro bat urpmi db eta rpm instalatzeko.\n"
+msgstr ""
+" --urpmi-root - erabili beste erro bat urpmi db eta rpm instalatzeko.\n"
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../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 - euskarriak komaz bereizitako azpikateen arabera "
"ordenatzen ditu.\n"
@@ -1415,7 +1445,8 @@ msgstr " --use-distrib - erabili emandako bidea euskarria atzitzeko\n"
#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
-msgstr " --synthesis - emandako laburpena erabiltzen du urpmi db-ren ordez.\n"
+msgstr ""
+" --synthesis - emandako laburpena erabiltzen du urpmi db-ren ordez.\n"
#: ../urpm/search.pm:45 ../urpmf:45
#, c-format
@@ -1440,7 +1471,8 @@ msgstr " -i - ereduetan ez bereiztu hizki larri eta xeheak.\n"
#: ../urpm/search.pm:49 ../urpmf:49
#, c-format
msgid " -I - honor case distinctions in patterns (default).\n"
-msgstr " -I - ereduetan hizki larri eta xeheak bereiztu (lehenetsia).\n"
+msgstr ""
+" -I - ereduetan hizki larri eta xeheak bereiztu (lehenetsia).\n"
#: ../urpm/search.pm:50 ../urpmf:50
#, c-format
@@ -1631,11 +1663,6 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Formatu okerra: etiketa balio-anitz bakarra erabili dezakezu"
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "%s(e)n ingurune espezifikoa erabiliz\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1651,121 +1678,141 @@ msgstr "ez dago \"%s\" euskarriarentzako synthesis eskuragarri"
msgid "no xml-info available for medium \"%s\""
msgstr "ez dago \"%s\" euskarriarentzako xml-info eskuragarri"
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
"urpmi berrabiatu egin da, eta lehentasuna duten paketeen zerrenda ez da "
"aldatu"
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
"urpmi berrabiatu egin da, eta lehentasuna duten paketeen zerrenda aldatu "
"egin da: %s vs %s"
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Ez dago %s izeneko paketerik"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Ondoko paketeek %s dute: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr "\"-a\" erabili behar zenuke guztiak erabiltzeko"
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, c-format
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"
+msgstr ""
+"%s paketea(k) aurkitu d(ir)a urpmi db-an, baino ez dago batere instalatuta"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, c-format
msgid "Package %s is already installed"
msgstr "%s paketea dagoeneko instalatuta dago"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, c-format
msgid "Packages %s are already installed"
msgstr "%s paketeak dagoeneko instalatuta daude"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "%s falta delako"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, c-format
msgid "due to already installed %s"
msgstr "dagoeneko instalatutako %s dela eta"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "%s bete gabe dagoelako"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "%s jaso nahian"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "%s gordetzeko"
#: ../urpm/select.pm:607
#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Ondoko paketea ezabatu behar da besteak berritu ahal daitezen:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Pakete hauek kendu egin behar dira besteak berritzeko:\n"
+"%s"
+
+#: ../urpm/select.pm:635
+#, c-format
msgid "in order to install %s"
msgstr "%s instalatzeko"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "%s(r)ekin gatazkak daudelako"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Sinadura ez da baliozkoa (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "ID gakoa ez da baliozkoa (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Sinadura falta da (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr "sistema"
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr "%s berrabiatu beharko zenuke %s-rentzako"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't write file"
msgstr "Ezin da fitxategia idatzi"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't open file"
msgstr "Ezin da fitxategia ireki"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, c-format
msgid "Can't move file %s to %s"
msgstr "Ezin da %s fitxategiar %s-ra mugitu"
@@ -1807,7 +1854,7 @@ msgstr " --test - ezabaketa egokiro egin daitekeen egiaztatzen du.\n"
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - urpmi banatzen du alias-makinen artean.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - fitxategiak bir-paketatu ezabatu aurretik\n"
@@ -1837,7 +1884,7 @@ msgstr ""
" erabilgarria chroot --root aukerarekin (des)"
"instalatzeko.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - modu berritsua.\n"
@@ -1884,7 +1931,8 @@ msgstr "Ez dago ezabatu beharreko umezurtzik"
#: ../urpme:149
#, 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] "Mendekotasunak asetzeko, ondoko paketea ezabatuko da"
msgstr[1] "Mendekotasunak asetzeko, ondoko %d paketeak ezabatuko dira"
@@ -1902,7 +1950,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "%d paketea ezabatu?"
msgstr[1] "%d paketeak ezabatu?"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (b/E) "
@@ -2005,7 +2053,8 @@ msgstr " --buildrequires - instalatu paketeen «buildrequires»\n"
#: ../urpmi:98
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
-msgstr " --install-src - iturburu-paketea bakarrik instalatzen du (binarioak ez).\n"
+msgstr ""
+" --install-src - iturburu-paketea bakarrik instalatzen du (binarioak ez).\n"
#: ../urpmi:99
#, c-format
@@ -2019,7 +2068,8 @@ msgstr " --noclean - ez garbitu rpm-ak katxetik.\n"
#: ../urpmi:102
#, c-format
-msgid " --replacepkgs - force installing packages which are already installed.\n"
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
msgstr ""
" --replacepkgs - behartu dagoeneko instalatuta dauden paketeen "
"instalaketa.\n"
@@ -2153,7 +2203,8 @@ msgstr " --excludedocs - docs fitxategiak kanpoan uzten ditu.\n"
#: ../urpmi:138
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
-msgstr " --ignoresize - ez egiaztatu diskoan dagoen lekua instalazio aurretik.\n"
+msgstr ""
+" --ignoresize - ez egiaztatu diskoan dagoen lekua instalazio aurretik.\n"
#: ../urpmi:139
#, c-format
@@ -2165,17 +2216,22 @@ msgstr " --ignorearch - bat ez datozen arkitekturetan instalatzen uzteko.\n"
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - ez du scriptlet(s) paketea exekutatzen\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - gatazkak erakutsi.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - instalatu behar ez liratekeen paketeak\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --prefer - hobetsi beharko liratekeen paketeak\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2184,42 +2240,44 @@ msgstr ""
" --more-choices - pakete ugari aurkitzen direnean, proposatu lehenetsiak\n"
" baino aukera gehiago.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - ez giltzatu rpm db.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
-msgstr " --strict-arch - berritu soilik arkitektura berdina duten paketeak.\n"
+msgstr ""
+" --strict-arch - berritu soilik arkitektura berdina duten paketeak.\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - komando-lerroko bat-etortze guztiak hautatzen ditu.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - modu lasaia.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --debug - oso modu berritsua.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
-msgstr " komando-lerroan idatzitako izenak edo rpm fitxategiak instalatuko dira.\n"
+msgstr ""
+" komando-lerroan idatzitako izenak edo rpm fitxategiak instalatuko dira.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr "Akatsa: ezin da erabili -auto-select pakete zerrendarekin.\n"
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2229,27 +2287,29 @@ msgstr ""
"argumentuak\n"
"--bug argumentuarekin batera.\n"
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "Ezin dituzu rpm fitxategi bitarrak instalatu --install-src erabilita"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr "Zuk ezin dituzu 'spec' fitxategiak instalatu"
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr "lehenetsia --buildrequires"
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
-msgstr "mesedez erabili --buildrequires edo --install-src, lehenetsia --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgstr ""
+"mesedez erabili --buildrequires edo --install-src, lehenetsia --buildrequires"
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2258,17 +2318,12 @@ msgstr ""
"[%s] direktorioa badago lehendik, erabili beste direktorio bat akatsen berri "
"emateko edo ezabatu"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Ezin da erroreen berri emateko [%s] direktorioa sortu"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr "%s ingurune direktorioa ez da existitzen"
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2277,48 +2332,48 @@ msgstr ""
"Akatsa: %s irakurri-soilik muntatu dela dirudi.\n"
"Erabili --allow-force eragiketa behartzeko."
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr "Euskarria eguneratzen...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (eguneratu)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (eguneratu)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (instalatu)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (instalatu)"
-#: ../urpmi:462
+#: ../urpmi:450
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "%s mendekotasuna asetzeko, ondoko paketeetako bat behar da:"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Zein hautatzen duzu? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2329,7 +2384,7 @@ msgstr ""
" batzuekiko menpekotasuna dutelako:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2340,7 +2395,7 @@ msgstr ""
" batzuekiko menpekotasuna dutelako:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2349,12 +2404,12 @@ msgstr ""
"\n"
"Instalazioarekin jarraitu hala ere?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (B/e) "
-#: ../urpmi:524
+#: ../urpmi:512
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2363,7 +2418,7 @@ msgstr ""
"Eskatutako pakete bat ezin da instalatu:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2372,12 +2427,12 @@ msgstr ""
"Eskatutako pakete bat ezin da instalatu:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "%s paketea kentzen baduzu, sistema apurtuko duzu"
-#: ../urpmi:551
+#: ../urpmi:538
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2388,7 +2443,7 @@ msgstr ""
"kendu egin behar direlako, beste batzuen bertsioa berritzeko:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2399,30 +2454,12 @@ msgstr ""
"kendu egin behar direlako, beste batzuen bertsioa berritzeko:\n"
"%s\n"
-#: ../urpmi:560
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Ondoko paketea ezabatu behar da besteak berritu ahal daitezen:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Pakete hauek kendu egin behar dira besteak berritzeko:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(froga soilik, ezabaketa ez da egingo)"
-#: ../urpmi:583
+#: ../urpmi:568
#, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2433,46 +2470,46 @@ msgstr ""
"mendekotasunak instalatzeko:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "Ondoko pakete umezurtza ezabatuko da."
msgstr[1] "Ondoko pakete umezurtzak ezabatuko dira."
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(froga soilik, instalazioa ez da egingo)"
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr "diskoan %s leku gehiago erabiliko da."
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr "diskoan %s lekua askatuko da."
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr "paketeen %s eskuratuko dira."
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
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:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Utzi"
-#: ../urpmi:648
+#: ../urpmi:633
#, c-format
msgid "Press Enter when mounted..."
msgstr "Sakatu 'Sartu' muntatuta dagoenean..."
@@ -2524,7 +2561,8 @@ msgstr ""
#: ../urpmi.addmedia:55 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
-msgstr " --wget - wget erabiltzen du urruneko fitxategiak eskuratzeko.\n"
+msgstr ""
+" --wget - wget erabiltzen du urruneko fitxategiak eskuratzeko.\n"
#: ../urpmi.addmedia:56 ../urpmi.update:34 ../urpmq:74
#, c-format
@@ -2534,7 +2572,8 @@ msgstr " --curl - curl erabiltzen du urruneko fitxategiak eskuratzeko.\n"
#: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
-msgstr " --prozilla - prozilla erabiltzen du urruneko fitxategiak eskuratzeko.\n"
+msgstr ""
+" --prozilla - prozilla erabiltzen du urruneko fitxategiak eskuratzeko.\n"
#: ../urpmi.addmedia:58 ../urpmi.update:36
#, c-format
@@ -2672,7 +2711,8 @@ msgstr "Ezin da konfig fitxategia sortu [%s]"
#: ../urpmi.addmedia:136
#, c-format
msgid "no need to give <relative path of synthesis> with --distrib"
-msgstr "ez dago <synthesis-en bide erlatiboa> eman beharrik --distrib aukerarekin"
+msgstr ""
+"ez dago <synthesis-en bide erlatiboa> eman beharrik --distrib aukerarekin"
#: ../urpmi.addmedia:144
#, c-format
@@ -2729,7 +2769,8 @@ msgstr ""
#: ../urpmi.recover:37
#, c-format
-msgid " --list - list transactions since provided date/duration argument\n"
+msgid ""
+" --list - list transactions since provided date/duration argument\n"
msgstr ""
" --list - zerrendatu ematen den data/iraupen argumentutik egin "
"diren eragiketak\n"
@@ -2910,7 +2951,8 @@ msgstr " --no-ignore - ez eguneratu, markatu euskarria gaitu gisa.\n"
#: ../urpmi.update:49
#, c-format
msgid " --probe-rpms - do not use synthesis, use rpm files directly\n"
-msgstr " --probe-rpms - ez erabili synthesis, zuzenean rpm fitxategiak erabili\n"
+msgstr ""
+" --probe-rpms - ez erabili synthesis, zuzenean rpm fitxategiak erabili\n"
#: ../urpmi.update:50
#, c-format
@@ -2935,7 +2977,8 @@ msgstr "Supererabiltzaileak soilik dauka euskarriak eguneratzeko baimena"
#: ../urpmi.update:78
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "ez dago eguneratzeko ezer (erabili urpmi.addmedia euskarria gehitzeko)\n"
+msgstr ""
+"ez dago eguneratzeko ezer (erabili urpmi.addmedia euskarria gehitzeko)\n"
#: ../urpmi.update:87
#, c-format
@@ -3028,17 +3071,21 @@ msgstr " --list-aliases - alias paralelo erabilgarrien zerrenda.\n"
#: ../urpmq:63
#, c-format
-msgid " --dump-config - dump the config in form of urpmi.addmedia argument.\n"
-msgstr " --dump-config - config urpmi.addmedia argumentu gisa iraultzen du.\n"
+msgid ""
+" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+" --dump-config - config urpmi.addmedia argumentu gisa iraultzen du.\n"
#: ../urpmq:64
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
-msgstr " --src - hurrengo paketea iturburu-pakete bat da (-s bezala).\n"
+msgstr ""
+" --src - hurrengo paketea iturburu-pakete bat da (-s bezala).\n"
#: ../urpmq:65
#, c-format
-msgid " --sources - give all source packages before downloading (root only).\n"
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
msgstr ""
"--sources - iturburu-pakete guztiak deskargatu aurretik ematen ditu \n"
" (root-ek bakarrik).\n"
@@ -3169,14 +3216,16 @@ msgstr ""
#: ../urpmq:105
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
-msgstr " -s - hurrengo paketea iturburu-pakete bat da (--src bezala).\n"
+msgstr ""
+" -s - hurrengo paketea iturburu-pakete bat da (--src bezala).\n"
#: ../urpmq:106
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
-msgstr "-u - paketea kentzen du bertsio berriagoa instalatuta badago.\n"
+msgstr ""
+"-u - paketea kentzen du bertsio berriagoa instalatuta badago.\n"
#: ../urpmq:107
#, c-format
@@ -3193,7 +3242,8 @@ msgstr ""
#: ../urpmq:109
#, c-format
msgid " names or rpm files given on command line are queried.\n"
-msgstr " komando-lerroan idatzitako izenak edo rpm fitxategiak kontsultatu dira.\n"
+msgstr ""
+" komando-lerroan idatzitako izenak edo rpm fitxategiak kontsultatu dira.\n"
#: ../urpmq:156
#, c-format
@@ -3226,14 +3276,16 @@ msgstr ""
#: ../urpmq:408
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
"ez dago \"%s\" euskarriarentzako xml info, ezin da %s paketearentzako "
"inolako emaitzarik itzuli"
#: ../urpmq:409
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
"ez dago \"%s\" euskarriarentzako xml info, ezin da %s paketeentzako inolako "
"emaitzarik itzuli"
@@ -3243,3 +3295,11 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Ez da changelog aurkitu\n"
+#~ msgid "examining %s file"
+#~ msgstr "%s fitxategia aztertzen"
+
+#~ msgid "invalid MD5SUM file"
+#~ msgstr "MD5SUM fitxategi baliogabea"
+
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "aztertutako synthesis aurkitu da %s gisa"
diff --git a/po/fa.po b/po/fa.po
index 8021baf0..f4aedd42 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2005-02-06 08:42-0500\n"
"Last-Translator: \n"
"Language-Team: <en@li.org>\n"
@@ -30,7 +30,7 @@ msgstr "نصب RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_تأیید"
@@ -96,7 +96,7 @@ msgstr "_نصب"
msgid "_Save"
msgstr "_ذخیره"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_لغو"
@@ -127,9 +127,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - چاپ این پیغام راهنما.\n"
@@ -163,18 +162,18 @@ msgstr ""
" --verify-rpm - تصدیق امضاهای rpm قبل از نصب\n"
" (--no-verify-rpm غیر فعال شود، پیش‌فرض فعال شده است).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - فقط از رسانه‌های داده شده، جدا شده با ویرگول استفاده شود.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - جستجو در عرضه‌ها برای یافتن بسته را اجازه می‌دهد.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - جستجو در عرضه‌ها برای یافتن بسته نشود.\n"
@@ -215,7 +214,22 @@ msgstr "لطفاً صبر کنید..."
msgid "Must be root"
msgstr "باید مدیر باشید"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "انتشار دادن %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "نصب بسته..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "نصب بسته..."
+
+#: ../gurpmi2:111
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -231,37 +245,37 @@ msgstr ""
msgid "Warning"
msgstr "هشدار"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "تایید"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (ارتقاء دادن)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (نصب کردن)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "یکی از بسته‌های بدنبال آمده لازم است:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_ترک"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -272,60 +286,55 @@ msgstr ""
"%s\n"
"ادامه میدهید؟"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "برای ارضای وابستگی‌ها، بسته‌ی بدنبال آمده نصب خواهد شد (%d مگابایت)"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "برای ارضای وابستگی‌ها، بسته‌ی بدنبال آمده نصب خواهد شد (%d مگابایت)"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(بسته‌های %d، %d مگابایت)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "نصب بسته..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "نمب‌توان بسته های منبع را دریافت کرد، پایان داده می‌شود"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "در حال آماده کردن..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "نصب بسته `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "لطفاً رسانه‌ی بنام \"%s\" بر دستگاه [%s] را داخل نمایید"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "بارگیری بسته `%s'..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_انجام شد"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -336,28 +345,28 @@ msgstr ""
"%s\n"
"بهتر است بانک اطلاعات urpmi را بروزسازی نمایید"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "نصب شکست خورد"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "همه چیز قبلاً نصب شده است"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "نصب پایان یافت"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "برداشتن %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "راه‌اندازی دوباره‌ی urpmi"
@@ -396,7 +405,7 @@ msgstr " %s پیش‌فرض است.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -g - چاپ گروه‌ها با نام.\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "فقط کاربر برتر برای نصب بسته‌ها مجاز می‌باشد"
@@ -406,134 +415,143 @@ msgstr "فقط کاربر برتر برای نصب بسته‌ها مجاز می
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "نمی‌توان شاخه‌ی [%s] را برای گزارش اشکال ایجاد کرد"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "بارگیری بسته `%s'..."
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "استفاده از محیط مشخص بر %s\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "نمی‌توان rpmdb را باز کرد"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "نام پرونده rpm نامعتبر [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "در حال دریافت پرونده‌ی rpm [%s] ..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...دریافت انجام گرفت"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...دریافت شکست خورد: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "نمی‌توان به پرونده rpm [%s] دسترسی یافت"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "نمی‌توان \"%s\" را در پرونده [%s] تجزیه کرد"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "نمی‌توان پرونده rpm را بایگانی کرد"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "خطا در بایگانی کردن بسته‌های محلی"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "تعریف بد پراکسی بر خط فرمان\n"
-#: ../urpm/args.pm:298
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: نمی‌توان پرونده rpm \"%s\" را خواند\n"
-#: ../urpm/args.pm:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "عدم وجود امضا (%s)"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "کپی کردن شکست خورد"
@@ -580,122 +598,122 @@ msgstr ""
msgid "unable to write config file [%s]"
msgstr "نمی‌توان پرونده‌ی تنظیم [%s] را نوشت"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr ""
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr ""
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr ""
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "واژه‌ی رمز:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr ""
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr ""
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, fuzzy, c-format
msgid "copy failed"
msgstr "کپی کردن شکست خورد"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, fuzzy, c-format
msgid "wget is missing\n"
msgstr "بدلیل عدم وجود %s"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, fuzzy, c-format
msgid "curl is missing\n"
msgstr "بدلیل عدم وجود %s"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr ""
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr ""
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr ""
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr ""
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr ""
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "بدلیل عدم وجود %s"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr ""
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, fuzzy, c-format
msgid "retrieving %s"
msgstr "برداشتن %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...دریافت شکست خورد: %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "پایان‌نامه‌ی ناشناس برای %s تعیین شده است"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr ""
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "هیچ webfetch یافت نشد، webfetch دارای پشتیبانی: %s\n"
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "نمی‌توان پایان‌نامه را اداره کرد: %s"
@@ -715,58 +733,58 @@ msgstr "بسته‌ی %s پیدا نشد."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "دریافت پرونده‌های rpm از رسانه \"%s\"..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr "قطعات ایجاد شده برای نصب بر %s (remove=%d, install=%d, upgrade=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "نمی‌توان تکه‌های انتقالی را ایجاد کرد"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "نمی‌توان بسته‌ی %s را برداشت"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "نمی‌توان بسته %s را نصب کرد"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "نصب %s از %s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "...دریافت شکست خورد: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "برداشتن بسته %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "برداشتن بسته %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "نصب %s از %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "اطلاعات بیشتر برای بسته‌ی %s"
@@ -811,90 +829,80 @@ msgstr "هشدار"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "نصب شکست خورد"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "نصب شکست خورد"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "بسته‌های بدنبال آمده امضاهای بد دارند"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "بسته‌های بدنبال آمده امضاهای بد دارند"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "آیا می‌خواهید نصب را ادامه دهید؟"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "نصب %s از %s"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "انتشار دادن %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "نصب %s از %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "نصب %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "تلاش برای نصب بدون بررسی وابستگی‌ها؟ (y/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "تلاش برای نصب حتی قویتر (--force)؟ (y/N) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "نصب ممکن می‌باشد"
#: ../urpm/md5sum.pm:26
-#, fuzzy, c-format
-msgid "examining %s file"
-msgstr "آزمایش پرونده‌ی MD5SUM "
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "هشدار: md5sum برای %s در پرونده MD5SUM وجود ندارد"
@@ -970,228 +978,228 @@ msgstr "بجای ارتقای بسته %s نصب خواهد شد"
msgid "medium \"%s\" already exists"
msgstr "رسانه \"%s\" قبلاً وجود دارد"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "خواندن سرآیندها از رسانه \"%s\""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "برداشتن رسانه‌ی \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr ""
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "نمی‌توان rpmdb را باز کرد"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "ناتوان به دسترسی اولین رسانه‌ی نصب (هیچ پرونده‌ی hdlists دیسک پیدا شد)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "دریافت پرونده‌ی hdlists..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "تلاش برای انتخاب رسانه‌ \"%s\" که وجود ندارد"
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "انتخاب چندین رسانه ها: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "برداشتن رسانه‌ی \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "تنظیم مجدد urpmi برای رسانه \"%s\""
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...تنظیم مجدد شکست خورد"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "تنظیم مجدد انجام گردید"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "رسانه \"%s\" انتخاب نشده است"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "آزمایش پرونده ترکیب [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "مشکل در خواندن پرونده‌ی ترکیب رسانه‌ی \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "نگارش پرونده لیست برای رسانه \"%s\""
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...کپی کردن شکست خورد"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "کپی کردن پرونده‌ی توضیحات \"%s\"..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...کپی شد"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "کپی از [%s] شکست خورد (پرونده بطرز مشکوکی کوچک است)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "حساب کردن md5sum از hdlist منبع دریافت شده (یا ترکیب)"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "کپی کردن [%s] شکست خورد (عدم تطابق md5sum)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "آزمایش پرونده hdlist [%s]"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "نصب %s از %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "هیچ پرونده‌ی hdlist برای رسانه \"%s\" یافت شد"
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "کپی کردن پرونده‌ی توضیحات \"%s\"..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "نام پرونده rpm نامعتبر [%s]"
-#: ../urpm/media.pm:1461
-#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "دریافت hdlist منبع (یا ترکیب) \"%s\"..."
-
-#: ../urpm/media.pm:1478
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "hdlist (یا ترکیب) شناسایی شده مانند %s یافت شد"
+msgid "no metadata found for medium \"%s\""
+msgstr "هیچ پرونده‌ی hdlist برای رسانه \"%s\" یافت شد"
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "هیچ پرونده‌ی hdlist برای رسانه \"%s\" یافت شد"
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "دریافت hdlist منبع (یا ترکیب) \"%s\"..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "در حال آزمایش پرونده کلید عمومی \"%s\"..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...در حال وارد کردن کلید %s از پرونده کلیدعمومی \"%s\""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "نمی‌توان پرونده کلید عمومی \"%s\" را وارد کرد"
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "هیچ پرونده‌ی hdlist برای رسانه \"%s\" یافت شد"
+
+#: ../urpm/media.pm:1612
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "رسانه اضافه شده %s"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "خواندن پرونده‌های rpm از [%s]"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "NnخنoO"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1262,7 +1270,7 @@ msgstr ""
msgid "TB"
msgstr ""
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1620,11 +1628,6 @@ msgstr " -f - چاپ نسخه، انتشار و ساختار با
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "استفاده از محیط مشخص بر %s\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1640,118 +1643,136 @@ msgstr "ساختن پرونده ترکیب hdlist برای رسانه \"%s\""
msgid "no xml-info available for medium \"%s\""
msgstr "نگارش پرونده لیست برای رسانه \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "هیچ بسته‌ای با نام %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "بسته‌های بدنبال آمده حاوی %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "همه چیز قبلاً نصب شده است"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "همه چیز قبلاً نصب شده است"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "همه چیز قبلاً نصب شده است"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "بدلیل عدم وجود %s"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "همه چیز قبلاً نصب شده است"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "بدلیل عدم رضایت %s"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "تلاش برای ترفیع %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "برای نگهداشتن %s"
#: ../urpm/select.pm:607
+#, fuzzy, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"بسته‌های بدنبال آمده باید برداشته شوند تا بسته‌های دیگر بتوانند ارتقا یابند:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"بسته‌های بدنبال آمده باید برداشته شوند تا بسته‌های دیگر بتوانند ارتقا یابند:\n"
+"%s"
+
+#: ../urpm/select.pm:635
#, c-format
msgid "in order to install %s"
msgstr "برای نصب %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "بدلیل اختلاف با %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "امضای نامعتبر (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "شناسه کلید نامعتبر (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "عدم وجود امضا (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "نمی‌توان پرونده‌ی [%s] را نوشت"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "کپی کردن شکست خورد"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "کپی کردن شکست خورد"
@@ -1793,7 +1814,7 @@ msgstr ""
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - urpmi منتشر شده در بین ماشین‌های مستعار.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - چاپ برچسب بسته‌گر: packager.\n"
@@ -1822,7 +1843,7 @@ msgstr ""
" --use-distrib - urpmi را در هوا از درخت distrib پیکربندی می‌کند، برای\n"
" نصب(برداری) یک chroot با گزینه‌ی --root مفید است.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - حالت لغتی.\n"
@@ -1882,7 +1903,7 @@ msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "برداشتن بسته %s"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (y/N) "
@@ -2136,17 +2157,22 @@ msgstr " --url - چاپ برچسب url: url.\n"
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - چاپ برچسب توضیحات: توضیحات.\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - چاپ برچسب اختلاف‌ها: همه اختلاف‌ها.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - بسته‌هایی که نصب آنها باید نادیده گرفته شود\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, fuzzy, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --skip - بسته‌هایی که نصب آنها باید نادیده گرفته شود\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2155,71 +2181,71 @@ msgstr ""
" --more-choices - هنگامی که چندین بسته یافت می‌گردد، گزینه‌های بیشتری\n"
" از پیش‌فرض پیشنهاد شود.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - نگهداری rpm استفاده نشده در حافظه‌ی پنهان.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - فقط بسته‌های با ساختار یکسان ارتقاء داده شوند.\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - انتخاب همه مطابقت‌ها بر خط فرمان.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - حالت ساکت.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --verbose - حالت لغتی.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " نام‌ها یا پرونده‌های rpm داده شده بر خط فرمان نصب خواهند شد.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
"آنچه می‌توان با پرونده‌های باینری rpm انجام داد هنگام استفاده --install-src"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2228,17 +2254,12 @@ msgstr ""
"شاخه‌ی [%s] از قبل وجود دارد، لطفا از شاخه‌ی دیگری برای گزارش اشکال استفاده "
"کنید یاآن را حذف کنید"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "نمی‌توان شاخه‌ی [%s] را برای گزارش اشکال ایجاد کرد"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2247,48 +2268,48 @@ msgstr ""
"خطا: %s بنظر میرسد بطور فقط-خوانش سوار شده است.\n"
"از --allow-force برای اجبار عملیات استفاده گردد."
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (ارتقاء دادن)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (ارتقاء دادن)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (نصب کردن)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (نصب کردن)"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "برای ارضای وابستگی‌ها، %dبسته‌های بدنبال آمده برداشته خواهند شد"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "انتخاب شما چه است؟ (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2299,7 +2320,7 @@ msgstr ""
"بستگی داشته که کهنه تر از بسته‌های نصب شده هستند:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2310,19 +2331,19 @@ msgstr ""
"بستگی داشته که کهنه تر از بسته‌های نصب شده هستند:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "در هر حال ادامه می‌دهید؟"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (Y/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2331,7 +2352,7 @@ msgstr ""
"بعضی از بسته‌های خواسته شده نمی‌توانند نصب شوند:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2340,12 +2361,12 @@ msgstr ""
"بعضی از بسته‌های خواسته شده نمی‌توانند نصب شوند:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "برداشتن بسته‌ی %s سیستم شما را خواهد شکست"
-#: ../urpmi:551
+#: ../urpmi:538
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2356,7 +2377,7 @@ msgstr ""
"باید برداشته شوند تا بسته‌های دیگر بتوانند ارتقا یابند: \n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2367,30 +2388,12 @@ msgstr ""
"باید برداشته شوند تا بسته‌های دیگر بتوانند ارتقا یابند: \n"
"%s\n"
-#: ../urpmi:560
-#, fuzzy, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"بسته‌های بدنبال آمده باید برداشته شوند تا بسته‌های دیگر بتوانند ارتقا یابند:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"بسته‌های بدنبال آمده باید برداشته شوند تا بسته‌های دیگر بتوانند ارتقا یابند:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2400,44 +2403,44 @@ msgstr ""
"برای نصب وابستگی‌های بدنبال آمده شما باید مدیر سیستم باشید:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "برای ارضای وابستگی‌ها، %dبسته‌های بدنبال آمده برداشته خواهند شد"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "لغو"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "وقتی آماده‌اید ورود را فشار دهید..."
@@ -3180,6 +3183,14 @@ msgstr ""
msgid "No changelog found\n"
msgstr "هیچ ثبت تغییری یافت نشد\n"
+#, fuzzy
+#~ msgid "examining %s file"
+#~ msgstr "آزمایش پرونده‌ی MD5SUM "
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "hdlist (یا ترکیب) شناسایی شده مانند %s یافت شد"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - ایجاد یک رسانه بروزسازی.\n"
diff --git a/po/fi.po b/po/fi.po
index 63054fed..d344eae3 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2008-03-28 11:58+0200\n"
"Last-Translator: Anssi Hannula <anssi@mandriva.org>\n"
"Language-Team: Finnish <fi@li.org>\n"
@@ -34,7 +34,7 @@ msgstr "RPM:n asentaminen"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Virhe: tiedostoa %s ei löydy, peruutetaan toimenpide"
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -100,7 +100,7 @@ msgstr "_Asenna"
msgid "_Save"
msgstr "_Tallenna"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Peruuta"
@@ -131,9 +131,8 @@ msgstr ""
msgid "Options:"
msgstr "Valitsimet:"
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - tulosta tämä viesti\n"
@@ -169,19 +168,19 @@ msgstr ""
" --verify-rpm - varmista rpm-allekirjoitus ennen asennusta\n"
" (--no-verify-rpm poistaa käytöstä, vakiona käytössä).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - käytä ainoastaan seuraavia pilkuilla eroteltuja medioita\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - salli etsiminen tarjoaa-tiedoista paketin löytämiseksi\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - älä etsi tarjoaa-tiedoista paketin löytämiseksi\n"
@@ -221,7 +220,22 @@ msgstr "Odota hetki..."
msgid "Must be root"
msgstr "Pitää olla pääkäyttäjä"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "levitetään %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Pakettien asennus..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Pakettien asennus..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -237,37 +251,37 @@ msgstr ""
msgid "Warning"
msgstr "Varoitus"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (päivitettävä)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (asennettava)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Pakettivalinta"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Yksi seuraavista paketeista tarvitaan:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Hylkää"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -278,61 +292,56 @@ msgstr ""
"%s\n"
"Jatketaanko silti?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Riippuvuuksien täyttämiseksi seuraava paketti asennetaan:"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Riippuvuuksien täyttämiseksi seuraavat paketit asennetaan:"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d paketti, %d Mt)"
msgstr[1] "(%d pakettia, %d Mt)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Pakettien asennus..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "lähteen paketteja ei saada, toiminto keskeytetään"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Valmistellaan..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Asennetaan pakettia `%s' (%s / %s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Aseta sisään media \"%s\""
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Ladataan pakettia `%s'..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Valmis"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -343,28 +352,28 @@ msgstr ""
"%s\n"
"Sinun kannattaisi päivittää urpmi-tietokanta"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "Asennus epäonnistui:"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Kaikki on jo asennettu"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Asennus on valmis"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "poistetaan %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "uudelleenkäynnistetään urpmi"
@@ -403,7 +412,7 @@ msgstr " - oletus on %s\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - tulosta koko nimi (NVRA)\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Vain pääkäyttäjä saa asentaa paketteja"
@@ -413,136 +422,145 @@ msgstr "Vain pääkäyttäjä saa asentaa paketteja"
msgid "Running urpmi in restricted mode..."
msgstr "Suorita urpmi rajoitetussa tilassa..."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, c-format
msgid "fail to create directory %s"
msgstr "hakemiston %s luonti epäonnistui"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr "hakemiston %s omistaja virheellinen"
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "Ei voida kirjoittaa uudelleenpaketointikansioon [%s]\n"
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr "Ympäristökansio %s ei ole olemassa"
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "käytetään määrättyä ympäristöä kohteelle %s\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "rpm-tietokantaa ei voitu avata"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "virheellinen rpm-tiedoston nimi [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "noudetaan rpm-tiedostoa [%s]..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...noudettu"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...nouto epäonnistui: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "rpm-tiedostoa [%s] ei voitu käsitellä"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "ei voitu tulkita spec-tiedostoa %s [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "rpm-tiedoston rekisteröinti ei onnistunut"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Paketin laitteistoarkkitehtuuri ei ole yhteensopiva [%s]"
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "virhe rekisteröitäessä paikallisia paketteja"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Tämä toiminto on kielletty kon ohjelma käytetään rajoitetussa tilassa"
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "virheellinen välityspalvelinmääritys komentorivillä\n"
-#: ../urpm/args.pm:298
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: rpm-tiedostoa \"%s\" ei voida lukea\n"
-#: ../urpm/args.pm:375
+#: ../urpm/args.pm:383
#, fuzzy, c-format
msgid "unexpected expression %s"
msgstr "Hakulausekkeet:\n"
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Allekirjoitus puuttuu (%s)"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, fuzzy, c-format
msgid "no expression to close"
msgstr "Hakulausekkeet:\n"
-#: ../urpm/args.pm:395
+#: ../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:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot-kansio ei ole olemassa"
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr "%s ei voida käyttää ilman %s"
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr "%s ei voida käyttää %s kanssa"
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr "Liian monta argumenttia\n"
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Kopiointi epäonnistui"
@@ -591,122 +609,122 @@ msgstr "media '%s' on asetettu kahdesti, keskeytetään"
msgid "unable to write config file [%s]"
msgstr "asetustiedostoon [%s] ei voitu kirjoittaa"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "%s ei ole saatavilla, käytetään %s"
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Syötä tunnistetietojasi välityspalvelimen käyttämiseen\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Käyttäjänimi:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Salasana:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr "Tuntematon lataaja '%s'!\n"
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr "%s epäonnistui: lopetti signaalilla %d"
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr "%s epäonnistui: lopetti arvolla %d"
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, c-format
msgid "copy failed"
msgstr "kopiointi epäonnistui"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, c-format
msgid "wget is missing\n"
msgstr "wget puuttuu\n"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, c-format
msgid "curl is missing\n"
msgstr "curl puuttuu\n"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr "curl epäonnistui: lataaminen peruutettu\n"
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr "rsync puuttuu\n"
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr "ssh puuttuu\n"
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr "prozilla puuttuu\n"
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr "Ohjelmaa prozilla ei voitu suorittaa\n"
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, c-format
msgid "aria2 is missing\n"
msgstr "aria2 puuttuu\n"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr " %s%% valmis, koko %s, valmistumisaika %s, nopeus %s"
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr " %s%% valmis, nopeus %s"
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, c-format
msgid "retrieving %s"
msgstr "noudetaan %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, c-format
msgid "retrieved %s"
msgstr "noudettiin %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "tuntematon protokolla määrätty kohteelle %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "%s ei ole saatavilla, käytetään %s"
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "yhtään webfetch-ohjelmaa ei löytynyt, tuetut ovat: %s\n"
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "ei voida käsitellä protokollaa: %s"
@@ -726,58 +744,58 @@ msgstr "pakettia %s ei löytynyt."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "noudetaan rpm-tiedostoja medialta \"%s\"..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr "[uudelleenpaketoidaan]"
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr "luotiin tapahtuma asennukselle %s (poisto=%d, asennus=%d, päivitys=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "tapahtumaa ei voitu luoda"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "paketin purkaminen %s delta-rpm paketista ei onnistu"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "pakettia %s ei voitu asentaa"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "poistetaan viallinen rpm (%s) kansiosta %s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, c-format
msgid "removing %s failed: %s"
msgstr "tiedoston %s poisto epäonnistui: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, c-format
msgid "Removing package %s"
msgstr "Poistetaan paketti %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "poistetaan paketti %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "poistetaan asennetut paketit (%s) kansiosta %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Lisätietoja paketista %s"
@@ -822,18 +840,18 @@ msgstr "keskeytetään"
msgid "%s database is locked (another program is already using it)"
msgstr "%s-tietokanta on lukittu (se on toisen ohjelman käytössä)"
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Asennus epäonnistui"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -842,73 +860,63 @@ msgstr ""
"Asennus epäonnistui, viallisia tiedostoja:\n"
"%s"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, c-format
msgid "The following package has bad signature"
msgstr "Seuraavalla paketilla on virheellinen allekirjoitus"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Seuraavilla paketeilla on virheellinen allekirjoitus"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Haluatko jatkaa asennusta?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, c-format
msgid "removing installed rpms (%s)"
msgstr "poistetaan asennetut paketit (%s)"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "levitetään %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "asennetaan %s kohteesta %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "asennetaan %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Yritetäänkö asentaa ilman riippuvuuksia? (k/E) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Yritetäänkö asentaa pakolla (--force)? (k/E) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr "Paketit ovat ajan tasalla"
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Asennus on mahdollinen"
#: ../urpm/md5sum.pm:26
#, c-format
-msgid "examining %s file"
-msgstr "tutkitaan %s-tiedostoa"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
-#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "varoitus: md5sum kohteelle %s ei löydy MD5SUM tiedostosta"
@@ -982,228 +990,228 @@ msgstr "paketti %s asennettaisiin päivittämisen sijaan"
msgid "medium \"%s\" already exists"
msgstr "media \"%s\" on jo olemassa"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr "(oletuksena poissa käytöstä)"
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "lisätään media \"%s\" etämedian \"%s\" eteen"
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, c-format
msgid "adding medium \"%s\""
msgstr "lisätään media \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr "kansio %s ei ole olemassa"
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "tämä sijainti ei vaikuta sisältävän jakelua"
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, c-format
msgid "unable to parse media.cfg"
msgstr "ei voida jäsentää media.cfg-tiedostoa "
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "jakelumediaa ei voida käyttää (media.cfg-tiedostoa ei löytynyt)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr "ohitetaan yhteensopimaton media '%s' (%s)"
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, c-format
msgid "retrieving media.cfg file..."
msgstr "noudetaan media.cfg-tiedostoa..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "yritettiin valita media \"%s\" jota ei ole olemassa"
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "valitaan useampi media: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "poistetaan media \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "uudelleenasetetaan urpmi medialle \"%s\""
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...uudelleenasetus epäonnistui"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "uudelleenasetus tehty"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Virhe luodessa names-tiedostoa: riippuvuutta %d ei löytynyt"
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "media \"%s\" on ajan tasalla"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "tutkitaan synthesis-tiedostoa [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "ongelmia luettaessa median \"%s\" synthesis-tiedostoa"
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "kopioidaan tiedostoa [%s] medialle \"%s\""
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...kopiointi epäonnistui"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopioidaan \"%s\" kuvaustiedostoa..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...kopiointi valmis"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "[%s] kopiointi epäonnistui (tiedosto on epäilyttävän pieni)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "lasketaan md5sum haetulle lähde-synthesis-tiedostolle"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "tiedoston [%s] haku epäonnistui (md5sum ei täsmää)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, c-format
msgid "genhdlist2 failed on %s"
msgstr "genhdlist2 epäonnistui %s kohdalla"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, c-format
msgid "comparing %s and %s"
msgstr "verrataan kohteita %s ja %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "virheellinen hdlist-tiedosto %s medialle \"%s\""
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "kopioidaan lähteen \"%s\" MD5SUM-tiedostoa..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "virheellinen rpm-tiedoston nimi [%s]"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
+#, fuzzy, c-format
+msgid "no metadata found for medium \"%s\""
+msgstr "synthesis-tiedostoa ei löytynyt medialle \"%s\""
+
+#: ../urpm/media.pm:1475
#, c-format
msgid "retrieving source synthesis of \"%s\"..."
msgstr "noudetaan synthesis lähteelle \"%s\"..."
-#: ../urpm/media.pm:1478
-#, c-format
-msgid "found probed synthesis as %s"
-msgstr "löydettiin synthesis-tiedosto nimellä %s"
-
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
-#, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "synthesis-tiedostoa ei löytynyt medialle \"%s\""
-
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "tarkistetaan median \"%s\" pubkey-tiedostoa..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...tuotu avain %s median \"%s\" pubkey-tiedostosta"
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "median \"%s\" pubkey-tiedostoa ei voitu tuoda"
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "synthesis-tiedostoa ei löytynyt medialle \"%s\""
+
+#: ../urpm/media.pm:1612
#, c-format
msgid "updated medium \"%s\""
msgstr "media \"%s\" päivitetty"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr "[%s] hakeminen epäonnistui"
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr "yritetään uudelleen peilipalvelimella %s"
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr "Peilipalvelinta ei löydetty listalta %s"
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr "pääteltiin sijainti %s %.2f %.2f aikavyöhykkeestä %s"
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, c-format
msgid "getting mirror list from %s"
msgstr "haetaan peilipalvelinluetteloa kohteesta %s"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "EeNn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1274,7 +1282,7 @@ msgstr "Gt"
msgid "TB"
msgstr "Tt"
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1643,11 +1651,6 @@ msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
"Virheellinen muoto: vain yhtä moniarvoista merkintää voi käyttää kerrallaan"
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "käytetään määrättyä ympäristöä kohteelle %s\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1663,13 +1666,13 @@ msgstr "medialla \"%s\" ei ole synthesis-tiedostoa "
msgid "no xml-info available for medium \"%s\""
msgstr "medialla \"%s\" ei ole xml-info -tietoja"
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
"urpmi uudelleenkäynnistettiin, eikä ensisijaisten pakettien lista muuttunut"
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
@@ -1677,107 +1680,125 @@ msgstr ""
"urpmi uudelleenkäynnistettiin, ja ensisijaisten pakettien lista muuttui: "
"ennen %s, nyt %s"
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Ei pakettia nimeltä %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Seuraavat paketit sisältävät %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Paketteja %s ei voida asentaa"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, c-format
msgid "Package %s is already installed"
msgstr "Paketti %s on jo asennettu"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, c-format
msgid "Packages %s are already installed"
msgstr "Paketit %s on jo asennettu"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "puuttuvan %s takia"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, c-format
msgid "due to already installed %s"
msgstr "jo asennetun %s vuoksi"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "täyttämättömän %s takia"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "yritetään pakottaa %s valinta"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "%s säilyttämiseksi"
#: ../urpm/select.pm:607
#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Seuraava paketti on poistettava, jotta toiset voidaan päivittää:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Seuraavat paketit on poistettava, jotta toiset voidaan päivittää:\n"
+"%s"
+
+#: ../urpm/select.pm:635
+#, c-format
msgid "in order to install %s"
msgstr "%s asentamiseksi"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "johtuen ristiriidasta %s kanssa"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Virheellinen allekirjoitus (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Virheellinen avain-ID (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Allekirjoitus puuttuu (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't write file"
msgstr "Ei voida kirjoittaa tiedostoon"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't open file"
msgstr "Ei voida avata tiedostoa"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, c-format
msgid "Can't move file %s to %s"
msgstr "Tiedostoa %s ei voi siirtää kohteeseen %s"
@@ -1818,7 +1839,7 @@ msgstr " --test - varmista että poisto voidaan hoitaa oikein\n"
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - urpmi-toiminnot useille alias-koneille\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Paketoi tiedostot uudelleen ennen poistoa\n"
@@ -1849,7 +1870,7 @@ msgstr ""
" --use-distrib - aseta urpmi automaattisesti jakelun puusta, hyödyllinen\n"
" asennettaessa juuri käyttäen --root -optiota\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - yksityiskohtainen tyyli\n"
@@ -1913,7 +1934,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "Poista %d paketti?"
msgstr[1] "Poista %d pakettia?"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (k/E) "
@@ -2178,17 +2199,22 @@ msgstr " --ignorearch - älä tarkista rpm-pakettien arkkitehtuuria.\n"
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - älä suorita pakettien komentosarjoja\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - tulosta konfliktimerkinnät\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - paketit joiden asennus pitäisi ohittaa\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --prefer - paketit, joita suositaan\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2197,45 +2223,45 @@ msgstr ""
" --more-choices - mikäli useita paketteja löytyy, ehdota enemmän valintoja\n"
" kuin vain oletus\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - älä lukitse rpm-tietokantaa.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
" --strict-arch - päivitä ainoastaan saman arkitehtuuriin kuuluvia "
"paketteja.\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - valitse kaikki komentoriviin täsmäävät\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - hiljainen tyyli\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --debug - erittäin yksityiskohtainen tyyli.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " komentorivillä syötetyt nimet tai rpm-tiedostot asennetaan.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
"Virhe: --auto-select -valitsinta ei voi käyttää pakettilistan kanssa.\n"
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2244,28 +2270,28 @@ msgstr ""
"Virhe: Virheraportin luomiseksi suorita sama komento uudelleen\n"
"--bug -valitsimen kanssa.\n"
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "Et voi asentaa binaaripaketteja käytettäessä --install-src -valitsinta"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr "Spec-tiedostoja ei voi asentaa"
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr "oletetaan --buildrequires"
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr "käytä --buildrequires tai --install-src, oletetaan --buildrequires"
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2274,17 +2300,12 @@ msgstr ""
"Hakemisto [%s] on jo olemassa. Ole hyvä ja valitse toinen hakemisto "
"virheraportille tai poista se."
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Hakemiston [%s] luominen virheraportille ei onnistu"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr "Ympäristökansio %s ei ole olemassa"
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2293,36 +2314,36 @@ msgstr ""
"Virhe: %s näyttää olevean liitettynä ainoastan lukuoikeuksilla.\n"
"Käytä --allow-force pakottaaksesi toiminnon."
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr "Päivitetään mediaa...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (päivitettävä)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (päivitettävä)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (asennettava)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (asennettava)"
-#: ../urpmi:462
+#: ../urpmi:450
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2330,12 +2351,12 @@ msgid ""
msgstr ""
"Riippuvuuden '%s' täyttämiseksi jokin seuraavista paketeista on asennettava:"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Mikä on valintasi? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2346,7 +2367,7 @@ msgstr ""
"jotka ovat vanhempia kuin nykyhetkellä asennetut paketit:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2357,7 +2378,7 @@ msgstr ""
"jotka ovat vanhempia kuin nykyhetkellä asennetut paketit:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2366,12 +2387,12 @@ msgstr ""
"\n"
"Jatka muiden pakettien asennusta?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (K/e) "
-#: ../urpmi:524
+#: ../urpmi:512
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2380,7 +2401,7 @@ msgstr ""
"Haluttua pakettia ei voida asentaa:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2389,12 +2410,12 @@ msgstr ""
"Joitakin haluttuja paketteja ei voida asentaa:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "paketin %s poisto rikkoisi järjestelmäsi"
-#: ../urpmi:551
+#: ../urpmi:538
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2405,7 +2426,7 @@ msgstr ""
"jotta toiset voidaan päivittää:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2416,30 +2437,12 @@ msgstr ""
"jotta toiset voidaan päivittää:\n"
"%s\n"
-#: ../urpmi:560
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Seuraava paketti on poistettava, jotta toiset voidaan päivittää:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Seuraavat paketit on poistettava, jotta toiset voidaan päivittää:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(vain koe, paketteja ei oikeasti poisteta)"
-#: ../urpmi:583
+#: ../urpmi:568
#, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2450,46 +2453,46 @@ msgstr ""
"asentaaksesi seuraavat riippuvuudet:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "Riippuvuuksien täyttämiseksi seuraava paketti poistetaan"
msgstr[1] "Riippuvuuksien täyttämiseksi seuraavat %d pakettia poistetaan"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(vain koe, paketteja ei oikeasti asenneta)"
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr "Pakettien asentaminen vie %s lisää levytilaa."
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr "%s levytilaa vapautuu."
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr "Noudetaan yhteensä %s."
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Asennetaanko tämä paketti?"
msgstr[1] "Asennetaanko nämä %d pakettia?"
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Peruuta"
-#: ../urpmi:648
+#: ../urpmi:633
#, c-format
msgid "Press Enter when mounted..."
msgstr "Paina Enter liittämisen jälkeen..."
@@ -3249,6 +3252,12 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Muutoslokia ei löytynyt\n"
+#~ msgid "examining %s file"
+#~ msgstr "tutkitaan %s-tiedostoa"
+
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "löydettiin synthesis-tiedosto nimellä %s"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - luo päivitysmedia\n"
diff --git a/po/fr.po b/po/fr.po
index e3e7dd2d..4bec6a7e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -24,7 +24,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2008-09-20 18:55+0200\n"
"Last-Translator: Christophe Berthelé <cpjc@free.fr>\n"
"Language-Team: French <cooker-i18n@mandrivalinux.org>\n"
@@ -44,7 +44,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:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -113,7 +113,7 @@ msgstr "_Installer"
msgid "_Save"
msgstr "_Sauver"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Annuler"
@@ -145,9 +145,8 @@ msgstr ""
msgid "Options:"
msgstr "Options :"
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../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"
@@ -188,20 +187,20 @@ msgstr ""
# Les espaces supplémentaires sur la seconde ligne
# sont volontaires
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../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\n"
" virgules).\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../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"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
@@ -246,7 +245,22 @@ msgstr "Veuillez patienter ..."
msgid "Must be root"
msgstr "Vous devez être administrateur"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "distribution de %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Installation du paquetage ..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Installation du paquetage ..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -262,37 +276,37 @@ msgstr ""
msgid "Warning"
msgstr "Attention"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (à mettre à jour)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (à installer)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Choix d'un paquetage"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Un des paquetages suivants est nécessaire :"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Abandonner"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -304,63 +318,58 @@ msgstr ""
"%s\n"
"Continuer quand même l'installation ?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, 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é :"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, 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"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d paquetage, %d Mo)"
msgstr[1] "(%d paquetages, %d Mo)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Installation du paquetage ..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "impossible de récupérer les paquetages de sources, abandon"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Préparation ..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Installation du paquetage « %s » (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Veuillez insérer le média nommé « %s »"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Téléchargement du paquetage %s ..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Fini"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -371,28 +380,28 @@ msgstr ""
"%s\n"
"Vous devriez mettre à jour votre base de données urpmi."
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "L'installation a échoué :"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Tous les paquetages sont déjà installés"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "L'installation est terminée"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "désinstallation de %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "Redémarrage de urpmi"
@@ -433,7 +442,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:281
+#: ../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"
@@ -443,134 +452,143 @@ msgstr "Seul l'administrateur système (root) peut installer des paquetages"
msgid "Running urpmi in restricted mode..."
msgstr "Exécution d'urpmi en mode restreint..."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, c-format
msgid "fail to create directory %s"
msgstr "échec de création du répertoire %s"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr "propriétaire invalide pour le répertoire %s"
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, c-format
msgid "Can not download packages into %s"
msgstr "Impossible de télécharger dans %s"
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr "Le répertoire d'environnement %s n'existe pas"
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "avec environnement spécifique sur %s\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "impossible d'ouvrir la base de donnée rpm"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "le nom du fichier rpm est invalide [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "récupération des fichiers rpm [%s]..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "... récupération effectuée"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "... échec de la récupération : %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "impossible d'accéder au fichier rpm [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "impossible d'analyser le fichier spec %s [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "impossible de référencer le fichier rpm"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Architecture incompatible pour le paquetage [%s]"
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "erreur lors de l'inscription des paquetages locaux"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Cette opération est interdite en mode restreint"
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, 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:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "expression inattendue %s"
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "expression manquante avant %s"
-#: ../urpm/args.pm:382
+#: ../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:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "pas d'expression à fermer"
-#: ../urpm/args.pm:395
+#: ../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 »"
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "le répertoire chroot n'existe pas"
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr "Impossible d'utiliser %s sans %s"
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr "Impossible d'utiliser %s avec %s"
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr "Trop d'arguments\n"
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "La copie a échoué"
@@ -619,122 +637,122 @@ msgstr "le média « %s » est défini deux fois, interruption"
msgid "unable to write config file [%s]"
msgstr "impossible d'écrire le fichier de configuration [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "%s n'est pas disponible, utilisation de %s"
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr "impossible de lire les paramètres proxy (droits insuffisants sur %s)"
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Veuillez entrer vos données d'accès pour le proxy\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Nom d'utilisateur :"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Mot de passe :"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr "webfetch « %s » inconnu !!!\n"
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr "%s a échoué : sortie sur signal %d"
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr "%s a échoué : sortie avec %d"
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, c-format
msgid "copy failed"
msgstr "la copie a échoué"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, c-format
msgid "wget is missing\n"
msgstr "wget est manquant\n"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, c-format
msgid "curl is missing\n"
msgstr "curl est manquant\n"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr "échec de curl : téléchargement annulé\n"
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr "rsync est manquant\n"
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr "ssh est manquant\n"
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr "prozilla est manquant\n"
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr "Exécution de prozilla impossible\n"
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, c-format
msgid "aria2 is missing\n"
msgstr "aria2 est manquant\n"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr " %s%% de %s terminé, ETA = %s, débit = %s"
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr " %s%% terminé, débit = %s"
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, c-format
msgid "retrieving %s"
msgstr "récupération de %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, c-format
msgid "retrieved %s"
msgstr "%s récupéré"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "protocole inconnu défini pour %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "%s n'est pas disponible, utilisation de %s"
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, 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:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "impossible d'utiliser le protocole : %s"
@@ -754,12 +772,12 @@ msgstr "paquetage %s non trouvé."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "récupération des fichiers rpm à partir de « %s »..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr "[regénération]"
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -767,47 +785,47 @@ msgstr ""
"transaction créée pour l'installation sur %s (remove=%d, install=%d, upgrade="
"%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "impossible de créer la transaction"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "impossible d'extraire le rpm du paquetage delta-rpm %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "impossible d'installer le paquetage %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "suppression des paquetages bogués (%s) de %s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, c-format
msgid "removing %s failed: %s"
msgstr "la suppression de %s a échouée : %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, c-format
msgid "Removing package %s"
msgstr "Désinstallation du paquetage %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "désinstallation du paquetage %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "suppression des paquetages installés (%s) de %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Plus d'information sur le paquetage %s"
@@ -852,18 +870,18 @@ msgstr "abandon"
msgid "%s database is locked (another program is already using it)"
msgstr "la base de donnée %s est verrouillée (un autre programme l'utilise)"
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "L'installation a échoué"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr "Essayer de continuer néanmoins ? (o/N) "
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -872,73 +890,63 @@ msgstr ""
"L'installation a échoué à cause de paquets bogués :\n"
"%s"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, c-format
msgid "The following package has bad signature"
msgstr "Le paquetage suivant a une signature invalide"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Les paquetages suivants ont des signatures non valides"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Voulez-vous continuer l'installation ?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, c-format
msgid "removing installed rpms (%s)"
msgstr "suppression des paquetages installés (%s)"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "distribution de %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "installation de %s depuis %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "installation de %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Essayer d'installer sans vérifier les dépendances ? (o/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Essayer de forcer l'installation (--force) ? (o/N) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr "Les paquetages sont à jour"
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "L'installation est possible"
#: ../urpm/md5sum.pm:26
#, c-format
-msgid "examining %s file"
-msgstr "examen du fichier [%s]"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr "fichier MD5SUM invalide"
-
-#: ../urpm/md5sum.pm:28
-#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "attention : le MD5 pour %s est indisponible dans le fichier MD5SUM"
@@ -1011,230 +1019,230 @@ msgstr "effectuerait une installation plutôt qu'une mise à jour de %s"
msgid "medium \"%s\" already exists"
msgstr "le média « %s » existe déjà"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr "(ignoré par défaut)"
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "ajout du média « %s » avant le média distant « %s »"
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, c-format
msgid "adding medium \"%s\""
msgstr "ajout du média « %s »"
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr "le répertoire %s n'existe pas"
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "cet emplacement ne semble pas contenir de distribution"
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, c-format
msgid "unable to parse media.cfg"
msgstr "impossible d'analyser media.cfg"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, 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é)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr "média « %s » ignoré car incompatible (pour %s)"
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, c-format
msgid "retrieving media.cfg file..."
msgstr "récupération du fichier media.cfg..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "essai de sélection du média inexistant « %s »"
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "sélection de plusieurs médias : %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "suppression du média « %s »"
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "reconfiguration de urpmi pour le média « %s »..."
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "... la reconfiguration a échoué"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "reconfiguration effectuée"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Erreur de génération du fichier names : dépendance %d non trouvée"
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "le média « %s » est à jour"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "examen de la liste de synthèse [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
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:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "copie en cours [%s] pour le média « %s »..."
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "... copie impossible"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "copie du fichier description de « %s »..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "... copie effectuée"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "La copie de [%s] a échoué (le fichier est étrangement petit)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "calcul de la somme de contrôle MD5 du fichier synthesis"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "échec de la récupération de [%s] (inégalité md5sum)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, c-format
msgid "genhdlist2 failed on %s"
msgstr "échec de genhdlist2 sur [%s]"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, c-format
msgid "comparing %s and %s"
msgstr "comparaison de %s et de %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "fichier hdlist %s invalide pour le média « %s »"
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "copie du fichier MD5SUM de « %s »..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "fichier MD5SUM invalide (téléchargé sur %s)"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
+#, fuzzy, c-format
+msgid "no metadata found for medium \"%s\""
+msgstr "pas de fichier synthesis trouvé pour le média « %s »"
+
+#: ../urpm/media.pm:1475
#, c-format
msgid "retrieving source synthesis of \"%s\"..."
msgstr "récupération du fichier synthesis de « %s »..."
-#: ../urpm/media.pm:1478
-#, c-format
-msgid "found probed synthesis as %s"
-msgstr "fichier synthesis localisé en tant que %s"
-
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
-#, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "pas de fichier synthesis trouvé pour le média « %s »"
-
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "examen du fichier de la clé publique de « %s »..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "... clé %s importée à partir du fichier de la clé publique de « %s »"
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "impossible d'importer le fichier de la clé publique de « %s »"
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "pas de fichier synthesis trouvé pour le média « %s »"
+
+#: ../urpm/media.pm:1612
#, c-format
msgid "updated medium \"%s\""
msgstr "média « %s » mis à jour"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr "échec de la récupération de [%s]"
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr "nouvel essai avec le miroir %s"
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr "Impossible de trouver un mirror depuis la liste de mirroirs %s"
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr "géolocalisation trouvée %s %.2f %.2f du fuseau horaire %s"
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, c-format
msgid "getting mirror list from %s"
msgstr "récupération de la liste des miroirs depuis %s"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1305,7 +1313,7 @@ msgstr "Go"
msgid "TB"
msgstr "To"
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1685,11 +1693,6 @@ msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
"Format incorrect : vous ne pouvez utiliser qu'une seule option multi-valeur"
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "avec environnement spécifique sur %s\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1705,13 +1708,13 @@ msgstr "pas de fichier synthesis disponible pour le média « %s »"
msgid "no xml-info available for medium \"%s\""
msgstr "pas de fichier xml-info disponible pour le média « %s »"
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, 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"
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
@@ -1719,107 +1722,127 @@ msgstr ""
"urpmi a été relancé et la liste des paquetages prioritaires a changé : %s vs "
"%s"
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Pas de paquetage nommé %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Les paquetages suivants contiennent %s : %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr "Vous pouvez utiliser « -a » pour les sélectionner tous"
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, c-format
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:543
+#: ../urpm/select.pm:538
#, c-format
msgid "Package %s is already installed"
msgstr "Le paquetage %s est déjà installé"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, c-format
msgid "Packages %s are already installed"
msgstr "Les paquetages %s sont déjà installés"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "en raison du manque de %s"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, c-format
msgid "due to already installed %s"
msgstr "car le paquetage %s est déjà installé"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "car %s est non satisfait"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "Tentative de promouvoir %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "afin de garder %s"
#: ../urpm/select.pm:607
#, 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"
+"%s"
+
+#: ../urpm/select.pm:608
+#, 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"
+"%s"
+
+#: ../urpm/select.pm:635
+#, c-format
msgid "in order to install %s"
msgstr "pour installer le paquetage %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "en raison de conflit avec %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Signature incorrecte (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Identifiant de clef incorrect (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Signature absente (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr "système"
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr "Vous devriez relancer %s pour %s"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't write file"
msgstr "Ne peut créer le fichier"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't open file"
msgstr "Ne peut ouvrir le fichier"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, c-format
msgid "Can't move file %s to %s"
msgstr "Impossible de déplacer %s vers %s"
@@ -1866,7 +1889,7 @@ msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
" --parallel - urpmi distribué sur plusieurs machines de l'alias.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Réempaqueter les fichiers avant effacement\n"
@@ -1900,7 +1923,7 @@ msgstr ""
" distribution, utile pour (dés)installer un chroot avec\n"
" l'option --root.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - mode verbeux.\n"
@@ -1971,7 +1994,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "Supprimer %d paquetage ?"
msgstr[1] "Supprimer %d paquetages ?"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (o/N) "
@@ -2248,17 +2271,22 @@ msgstr ""
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - ne pas exécuter les scripts d'installation\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - afficher les conflits.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - paquetages dont l'installation doit être ignorée\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --prefer - paquetages qui doivent être favorisés\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2268,49 +2296,49 @@ msgstr ""
"plus\n"
" de choix que par défaut.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - ne pas verrouiller la base rpm.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
" --strict-arch - mettre à jour uniquement les paquetages avec la même\n"
" architecture.\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
" -a - sélectionner toutes les correspondances de la ligne de\n"
" commande.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - mode silencieux.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --debug - mode de déboguage.\n"
-#: ../urpmi:154
+#: ../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"
-#: ../urpmi:182
+#: ../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"
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2319,30 +2347,30 @@ msgstr ""
"Erreur : pour générer un rapport d'anomalie, précisez les arguments de la\n"
"ligne de commande accompagnés de --bug.\n"
-#: ../urpmi:219
+#: ../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"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr "Vous ne pouvez pas installer des fichiers spec"
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr "repli vers --buildrequires"
-#: ../urpmi:232
+#: ../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"
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2351,17 +2379,12 @@ msgstr ""
"Le répertoire [%s] existe déjà, merci d'en utiliser un autre pour le rapport "
"d'anomalie, ou de l'effacer."
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Impossible de créer le répertoire [%s] pour le rapport d'anomalie"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr "Le répertoire d'environnement %s n'existe pas"
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2370,36 +2393,36 @@ msgstr ""
"Erreur : %s semble être monté en lecture seule.\n"
"Utilisez --allow-force afin de forcer l'opération."
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr "Mise à jour des médias...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s : %s (à mettre à jour)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (à mettre à jour)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s : %s (à installer)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (à installer)"
-#: ../urpmi:462
+#: ../urpmi:450
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2408,12 +2431,12 @@ msgstr ""
"Afin de satisfaire les dépendances de « %s », un des paquetages suivants est "
"nécessaire :"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Que choisissez-vous ? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2424,7 +2447,7 @@ msgstr ""
"de paquetage qui sont plus anciens que la version installée :\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2435,7 +2458,7 @@ msgstr ""
"de paquetages qui sont plus anciens que les versions installées :\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2444,12 +2467,12 @@ msgstr ""
"\n"
"Désirez-vous tout de même continuer ?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (O/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2458,7 +2481,7 @@ msgstr ""
"Le paquetage demandé ne peut pas être installé :\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2467,12 +2490,12 @@ msgstr ""
"Certains paquetages demandés ne peuvent pas être installés :\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "La désinstallation du paquetage %s rendra votre système instable"
-#: ../urpmi:551
+#: ../urpmi:538
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2483,7 +2506,7 @@ msgstr ""
"doit être désinstallé :\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2494,32 +2517,12 @@ msgstr ""
"doivent être désinstallés :\n"
"%s\n"
-#: ../urpmi:560
-#, 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"
-"%s"
-
-#: ../urpmi:561
-#, 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"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(test uniquement, la suppression ne sera pas effectuée)"
-#: ../urpmi:583
+#: ../urpmi:568
#, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2530,46 +2533,46 @@ msgstr ""
"dépendances suivantes :\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "Le paquetage orphelin suivant va être désinstallé."
msgstr[1] "Les paquetages orphelins suivants vont être désinstallés."
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(test uniquement, l'installation ne sera pas effectuée)"
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr "un espace additionnel de %s sera utilisé."
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr "un espace de %s sera libéré."
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr "%s de paquets seront récupérés."
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
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:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Annuler"
-#: ../urpmi:648
+#: ../urpmi:633
#, c-format
msgid "Press Enter when mounted..."
msgstr "Veuillez sur appuyez sur « Entrée » une fois le média monté ..."
@@ -3368,3 +3371,12 @@ msgstr ""
#, c-format
msgid "No changelog found\n"
msgstr "Aucun Changelog trouvé\n"
+
+#~ msgid "examining %s file"
+#~ msgstr "examen du fichier [%s]"
+
+#~ msgid "invalid MD5SUM file"
+#~ msgstr "fichier MD5SUM invalide"
+
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "fichier synthesis localisé en tant que %s"
diff --git a/po/fur.po b/po/fur.po
index 6c58f518..9cd86c72 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+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"
@@ -29,7 +29,7 @@ msgstr "Instalazion dal pachet..."
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -95,7 +95,7 @@ msgstr "Instale"
msgid "_Save"
msgstr "Salve"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Scancele"
@@ -127,9 +127,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - stampe chist mes di jutori.\n"
@@ -165,18 +164,18 @@ msgstr ""
" --verify-rpm - verifiche le firme RPM prin de instalazion\n"
" (--no-verify-rpm le disabilite, predefinide abilitade).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - dopre dome les fonts te liste, disseparadis di virgulis.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - consint le ricercje tra i provides dal pachet.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - no sta a cirî tai provides par cjatâ il pachet.\n"
@@ -217,7 +216,22 @@ msgstr "Par plasè spiete."
msgid "Must be root"
msgstr ""
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "distribuzion di %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Instalazion dal pachet..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Instalazion dal pachet..."
+
+#: ../gurpmi2:111
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -232,37 +246,37 @@ msgstr ""
msgid "Warning"
msgstr "Avertence"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr ""
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, fuzzy, c-format
msgid " (to install)"
msgstr "Instalazion Automatiche"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Al covente un di chiscj pachets:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, fuzzy, c-format
msgid "_Abort"
msgstr "Informazions"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -272,63 +286,58 @@ msgstr ""
"I pachets listâts e an di sedi rimovûts par podê atualizâ altris:\n"
"%s"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
"Par sodisfâ les dipindincis, %d pachets e stan par sedi instalâts (%d MB)"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
"Par sodisfâ les dipindincis, %d pachets e stan par sedi instalâts (%d MB)"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Instalazion dal pachet..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "no rivi a recuperâ i pachets sorzint, o fermi"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "In preparazion..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Instalazion dal pachet `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Par plasè insede le font clamade \"%s\" te periferiche [%s]"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "O stoi scjariant il pachet '%s'..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, fuzzy, c-format
msgid "_Done"
msgstr "Fat"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -339,28 +348,28 @@ msgstr ""
"%s\n"
"Tu podaressis ve voe di atualizâ il to database urpmi"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Instalazion falade"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Al è dut dizà instalât"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Instalazion finide"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "rimozion di %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "rinviament di urpmi"
@@ -400,7 +409,7 @@ msgstr " il valôr predefinît al è %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -g - stampe grops ancje cul non\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Dome il superutent al po instalâ pachets"
@@ -410,134 +419,143 @@ msgstr "Dome il superutent al po instalâ pachets"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "no rivi a creâ le cartele [%s] par il bug report"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "O stoi scjariant il pachet '%s'..."
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "o dopri les variabilis di ambient su %s\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "no rivi a vierzi il database rpm"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "non dal file rpm no valevul [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "o recuperi il file rpm [%s] ..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...copie finide"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...copie falade: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "no rivi a acedi al file rpm [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "no rivi a analizâ \"%s\" tal file [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "no rivi a regjstrâ il file rpm"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "fal te regjistrazion dai pachets locâi"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "declarazion di proxy falade doprant le rie di comant\n"
-#: ../urpm/args.pm:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Firme mancjant (%s)"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Copie falade"
@@ -584,122 +602,122 @@ msgstr ""
msgid "unable to write config file [%s]"
msgstr "no rivi a scrivi tal file di configurazion [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr ""
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr ""
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr ""
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Password:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr ""
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr ""
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, fuzzy, c-format
msgid "copy failed"
msgstr "Copie falade"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, fuzzy, c-format
msgid "wget is missing\n"
msgstr "cause cal mancje %s"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, fuzzy, c-format
msgid "curl is missing\n"
msgstr "cause cal mancje %s"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr ""
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr ""
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr ""
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr ""
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr ""
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "cause cal mancje %s"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr ""
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, fuzzy, c-format
msgid "retrieving %s"
msgstr "rimozion di %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...copie falade: %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "protocol no cognosût definît par %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr ""
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, 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:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "no rivi a gjestî il protocol: %s"
@@ -719,12 +737,12 @@ msgstr "il pachet %s no l'è stât cjatât."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "o recuperi il file rpm de font \"%s\"..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -732,47 +750,47 @@ msgstr ""
"e je stade creade le transazion par instalâ su %s (rimôf=%d, instale=%d, "
"atualize=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "no rivi a creâ le transazion"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "no rivi a rimovi il pachet %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "no rivi a instalâ il pachet %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "instalazion di %s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "...copie falade: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "rimozion dal pachet %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "rimozion dal pachet %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "instalazion di %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, fuzzy, c-format
msgid "More information on package %s"
msgstr "Plui informazions sul pachet..."
@@ -817,92 +835,82 @@ msgstr "Avertence"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Instalazion falade"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Instalazion falade"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Chiscj pachets e an firmis no valevulis"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Chiscj pachets e an firmis no valevulis"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Âstu voie di continuâ le instalazion?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "instalazion di %s"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "distribuzion di %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "instalazion di %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "instalazion di %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Provjo a instalâ cence controlâ les dipendencis? (s/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr ""
"Ajo di provâ le instalazion in maniere ancjimò plui sfuarçâde (--force)? (s/"
"N) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Le instalazion e je pussibil"
#: ../urpm/md5sum.pm:26
-#, fuzzy, c-format
-msgid "examining %s file"
-msgstr "O esamini il file MD5SUM"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr ""
@@ -976,230 +984,230 @@ msgstr "e instalares il pachet invezit di atualizalu %s"
msgid "medium \"%s\" already exists"
msgstr "le font \"%s\" e esist dizà"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "o stoi leint les intestaduris de font \"%s\""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "o rimôf le font \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr ""
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "no rivi a vierzi il database rpm"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"no rivi a acedi a le prime font di instalazion (no ai cjatât nissun file "
"hdlists)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "o recuperi il file hdlist..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "o cîr di selezionâ une font che no esist \"%s\""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "o stoi selezionant plui fonts: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "o rimôf le font \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "o recuperi il file rpm de font \"%s\"..."
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "Configurazion dal menu salvade"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "Configurazion Server"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "le font \"%s\" no je selezionade"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "o esamini il file synthesis [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "probleme leint il file synthesis o le font \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "o scrîf le liste pe font \"%s\""
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...copie falade"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "o copii il file di descrizion di \"%s\"..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...copie finide"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "copie di [%s] falade (il file al è piçul in maniere suspiete)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "o calcoli md5sum dal file hdlist (o synthesis) scjariât"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "copie di [%s] falade (md5sum no valevul)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "o esamini il file hdlist [%s]"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "instalazion di %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "nissun file hdlist cjatât pe font \"%s\""
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "o copii il file di descrizion di \"%s\"..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "non dal file rpm no valevul [%s]"
-#: ../urpm/media.pm:1461
-#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "o recuperi il file hdlist (o synthesis) di \"%s\"..."
-
-#: ../urpm/media.pm:1478
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "o ai cjatât le hdlist (o synthesis) analizade sicu %s"
+msgid "no metadata found for medium \"%s\""
+msgstr "nissun file hdlist cjatât pe font \"%s\""
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "nissun file hdlist cjatât pe font \"%s\""
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "o recuperi il file hdlist (o synthesis) di \"%s\"..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "o controli il file pubkey di \"%s\"..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...impuartade le clâf %s dal file pubkey di \"%s\""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "no rivi a impuartâ il file pubkey di \"%s\""
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "nissun file hdlist cjatât pe font \"%s\""
+
+#: ../urpm/media.pm:1612
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "font zontade %s"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "o stoi leint i file rpm di [%s]"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1270,7 +1278,7 @@ msgstr ""
msgid "TB"
msgstr ""
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1647,11 +1655,6 @@ msgstr " -f - stampe version, release e architeture cun non.\n"
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "o dopri les variabilis di ambient su %s\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1667,118 +1670,136 @@ msgstr "o ai creât il file synthesis pe font \"%s\""
msgid "no xml-info available for medium \"%s\""
msgstr "o scrîf le liste pe font \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Nissun pachet clamât %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "I pachets seguints e contegnin %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Al è dut dizà instalât"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Al è dut dizà instalât"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Al è dut dizà instalât"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "cause cal mancje %s"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "Al è dut dizà instalât"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "cause che %s no l'è sodisfat"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "ricercje dal miôr pachet %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "par tignî %s"
#: ../urpm/select.pm:607
+#, fuzzy, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"I pachets listâts e an di sedi rimovûts par podê atualizâ altris:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"I pachets listâts e an di sedi rimovûts par podê atualizâ altris:\n"
+"%s"
+
+#: ../urpm/select.pm:635
#, c-format
msgid "in order to install %s"
msgstr "par instalâ %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "cause di conflits cun %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Firme no valevule (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Clâf ID (%s) no valevule"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Firme mancjant (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "no rivi a scrivi tal file di configurazion [%s]"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "Copie falade"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "Copie falade"
@@ -1821,7 +1842,7 @@ msgstr ""
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - urpmi distribuît tra diferentis machinis.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - mostre le clâf packager: assembladôr dal pachet.\n"
@@ -1851,7 +1872,7 @@ msgstr ""
" --use-distrib - configure urpmi dal lamp di un arbul distribuît, zovevul\n"
" par (dis)instalâ un pachet chroot cun opzion --root.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - modalitât fetôse.\n"
@@ -1917,7 +1938,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "rimozion dal pachet %s"
msgstr[1] "rimozion dal pachet %s"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (s/N) "
@@ -2184,92 +2205,99 @@ msgstr " --url - stampe il tag url: url.\n"
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - stampe il tag description: descrizion dal pachet.\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr ""
+" --conflicts - stampe il tag conflicts: ducj i conflits rilevâts par il "
+"pachet.\n"
+
+#: ../urpmi:143
#, fuzzy, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
" --test - verifiche se le instalazion e po sedi fate coretementri.\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, fuzzy, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr ""
" --test - verifiche se le instalazion e po sedi fate coretementri.\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:146
+#: ../urpmi:147
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - ten i rpm no doprâs te cache.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
" -a - selezione dutis les corispondencis te rie di comant.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - maniere cidine.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --verbose - modalitât fetôse.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " i nons o file rpm scrits te linie di comant e vignaran instalâts\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
"Ce puedial sedi fat cun i file binaris rpm cuant che al ven doprât --install-"
"src"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2278,65 +2306,60 @@ msgstr ""
"Le cartele [%s] e esist dizà, par plasè dopre une altre cartele par il bug "
"report o scancelile"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "no rivi a creâ le cartele [%s] par il bug report"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr ""
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "Instalazion Automatiche"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "Instalazion Automatiche"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "Par sodisfâ les dipendencis, e saran rimovûts chescj pachets (%d MB)"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Cuale ise le to sielte? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2344,7 +2367,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2352,19 +2375,19 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Continue distès?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (s/N) "
-#: ../urpmi:524
+#: ../urpmi:512
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2373,7 +2396,7 @@ msgstr ""
"Cualchidun dai pachets domandâts no puedin sedi instalât:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2382,12 +2405,12 @@ msgstr ""
"Cualchidun dai pachets domandâts no puedin sedi instalât:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "rimovi il pachet %s al prejudicarâ il to sisteme"
-#: ../urpmi:551
+#: ../urpmi:538
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2398,7 +2421,7 @@ msgstr ""
"e an di sedi rimovûts par atualizâ altris:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2409,30 +2432,12 @@ msgstr ""
"e an di sedi rimovûts par atualizâ altris:\n"
"%s\n"
-#: ../urpmi:560
-#, fuzzy, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"I pachets listâts e an di sedi rimovûts par podê atualizâ altris:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"I pachets listâts e an di sedi rimovûts par podê atualizâ altris:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2442,7 +2447,7 @@ msgstr ""
"Tu âs di sedi root par podê instalâ chestis dipendencis: \n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
@@ -2451,39 +2456,39 @@ msgstr[0] ""
msgstr[1] ""
"Par sodisfâ les dipendencis, e saran rimovûts chescj pachets (%d MB)"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Scancele"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Frache Enter cuant che tu sês pront..."
@@ -3234,6 +3239,14 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Nissun changelog cjatât\n"
+#, fuzzy
+#~ msgid "examining %s file"
+#~ msgstr "O esamini il file MD5SUM"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "o ai cjatât le hdlist (o synthesis) analizade sicu %s"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - cree une font di atualizazion.\n"
diff --git a/po/ga.po b/po/ga.po
index ce99901a..d955a550 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+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"
@@ -27,7 +27,7 @@ msgstr "Ag Ullmhaigh feistiú"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, fuzzy, c-format
msgid "_Ok"
msgstr "Ceart go Leor"
@@ -75,7 +75,7 @@ msgstr "Ag Feistiú:"
msgid "_Save"
msgstr "_Sábháil"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Cealaigh"
@@ -101,9 +101,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr ""
@@ -134,17 +133,17 @@ msgid ""
" (--no-verify-rpm disables it, default is enabled).\n"
msgstr ""
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
@@ -182,7 +181,22 @@ msgstr "Fan go fóill, le do thoil..."
msgid "Must be root"
msgstr "Gaireas luchóige"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "ag feistiú %s\n"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Ag Ullmhaigh feistiú"
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Ag Ullmhaigh feistiú"
+
+#: ../gurpmi2:111
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -195,37 +209,37 @@ msgstr "tá gach rud ann cheana féin"
msgid "Warning"
msgstr "Rabhadh"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Ceart go Leor"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr ""
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, fuzzy, c-format
msgid " (to install)"
msgstr "Eirigh as Feistiú"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Tá ceann de na pacáistí seo de dhíth:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, fuzzy, c-format
msgid "_Abort"
msgstr "Tobscoir"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -233,63 +247,58 @@ msgid ""
"Continue installation anyway?"
msgstr "Tá %s ins na pacáistí a leanas: %s \n"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Tá ceann de na pacáistí seo de dhíth:"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Tá ceann de na pacáistí seo de dhíth:"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, fuzzy, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "%d pacáistí"
msgstr[1] "%d pacáistí"
-#: ../gurpmi2:250
-#, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Ag Ullmhaigh feistiú"
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr ""
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Á Ullmhú..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, fuzzy, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr ""
"Ag feisteáil pacáiste %s\n"
"%d%%"
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr ""
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, fuzzy, c-format
msgid "Downloading package `%s'..."
msgstr "Ag feistiál pacáiste %s"
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, fuzzy, c-format
msgid "_Done"
msgstr "Críochnithe"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -297,28 +306,28 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Theip ag feistiú"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "tá gach rud ann cheana féin"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, fuzzy, c-format
msgid "Installation finished"
msgstr "Theip ag feistiú"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, fuzzy, c-format
msgid "removing %s"
msgstr "ag feistiú %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr ""
@@ -355,7 +364,7 @@ msgstr ""
msgid " -f - output rpm full name (NVRA)\n"
msgstr ""
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr ""
@@ -365,134 +374,143 @@ msgstr ""
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "Téip ag oscailt comhad: %s\n"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "Ag feistiál pacáiste %s"
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr ""
+
+#: ../urpm.pm:305
#, fuzzy, c-format
msgid "unable to open rpmdb"
msgstr "Téip ag oscailt comhad: %s\n"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "Tá droch ainmchomad rpm [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, fuzzy, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "Tá droch ainmchomad rpm [%s]"
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr ""
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, fuzzy, c-format
msgid "...retrieving failed: %s"
msgstr "Theip ar uathathmhéadú FAT: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, fuzzy, c-format
msgid "unable to access rpm file [%s]"
msgstr "Téip ag oscailt comhad: %s\n"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "Téip ag oscailt comhad: %s\n"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, fuzzy, c-format
msgid "unable to register rpm file"
msgstr "Téip ag oscailt comhad: %s\n"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr ""
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr ""
-#: ../urpm/args.pm:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr ""
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, fuzzy, c-format
msgid "Copying failed"
msgstr "theip ar feistiú"
@@ -539,122 +557,122 @@ msgstr ""
msgid "unable to write config file [%s]"
msgstr "Téip ag oscailt comhad: %s\n"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr ""
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr ""
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Ainm úsáideora:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Focal Faire:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr ""
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr ""
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, fuzzy, c-format
msgid "copy failed"
msgstr "theip ar feistiú"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, fuzzy, c-format
msgid "wget is missing\n"
msgstr "kdesu ar iarraidh"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, fuzzy, c-format
msgid "curl is missing\n"
msgstr "kdesu ar iarraidh"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr ""
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr ""
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr ""
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr ""
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr ""
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "kdesu ar iarraidh"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr ""
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, fuzzy, c-format
msgid "retrieving %s"
msgstr "ag feistiú %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "Theip ar uathathmhéadú FAT: %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr ""
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr ""
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr ""
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, fuzzy, c-format
msgid "unable to handle protocol: %s"
msgstr "Ag feistiál pacáiste %s"
@@ -674,58 +692,58 @@ msgstr "tá gach rud ann cheana féin"
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, fuzzy, c-format
msgid "unable to create transaction"
msgstr "Tá droch ainmchomad rpm [%s]"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "Téip ag oscailt comhad: %s\n"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, fuzzy, c-format
msgid "unable to install package %s"
msgstr "Ag feistiál pacáiste %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "ag feistiú %s\n"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "Theip ar uathathmhéadú FAT: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "Ag feistiál pacáiste %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, fuzzy, c-format
msgid "removing package %s"
msgstr "Ag feistiál pacáiste %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "ag feistiú %s\n"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, fuzzy, c-format
msgid "More information on package %s"
msgstr "Eolais Cuimhne"
@@ -770,90 +788,80 @@ msgstr "Rabhadh"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Theip ag feistiú"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Theip ag feistiú"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, 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:140
+#: ../urpm/main_loop.pm:143
#, 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:141
+#: ../urpm/main_loop.pm:144
#, 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:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "ag feistiú %s\n"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, fuzzy, c-format
msgid "distributing %s"
msgstr "ag feistiú %s\n"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "ag feistiú %s\n"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, fuzzy, c-format
msgid "installing %s"
msgstr "ag feistiú %s\n"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, fuzzy, c-format
msgid "Installation is possible"
msgstr "Theip ag feistiú"
#: ../urpm/md5sum.pm:26
-#, fuzzy, c-format
-msgid "examining %s file"
-msgstr "léamh depslist comhad [%s]"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr ""
@@ -925,228 +933,228 @@ msgstr "Ag feistiál pacáiste %s"
msgid "medium \"%s\" already exists"
msgstr "Tá an próifíl \"%s\" ann cheana!"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr ""
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "Téip ag oscailt comhad: %s\n"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "Tá droch ainmchomad rpm [%s]"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, fuzzy, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, fuzzy, c-format
msgid "selecting multiple media: %s"
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, fuzzy, c-format
msgid "removing medium \"%s\""
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "Cumraigh 'fetchmail'"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "Cumraíocht Xorg"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr ""
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, fuzzy, c-format
msgid "examining synthesis file [%s]"
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, fuzzy, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, fuzzy, c-format
msgid "...copying failed"
msgstr "Theip ar feistiú"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, fuzzy, c-format
msgid "copying description file of \"%s\"..."
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, fuzzy, c-format
msgid "...copying done"
msgstr "Theip ar feistiú"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "Téip cóip do [%s]"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "Téip cóip do [%s]"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "ag feistiú %s\n"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "Tá droch ainmchomad rpm [%s]"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
+msgid "no metadata found for medium \"%s\""
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1478
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "léamh depslist comhad [%s]"
-
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
-#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
+msgid "retrieving source synthesis of \"%s\"..."
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, fuzzy, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, fuzzy, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "Tá droch ainmchomad rpm [%s]"
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, fuzzy, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "Téip ag oscailt comhad: %s\n"
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "léamh depslist comhad [%s]"
+
+#: ../urpm/media.pm:1612
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "Téip ag oscailt comhad: %s\n"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "Tá droch ainmchomad rpm [%s]"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1217,7 +1225,7 @@ msgstr ""
msgid "TB"
msgstr ""
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1565,11 +1573,6 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr ""
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1585,118 +1588,132 @@ msgstr "léamh depslist comhad [%s]"
msgid "no xml-info available for medium \"%s\""
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Pacáiste ar bith den ainm %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, fuzzy, c-format
msgid "The following packages contain %s: %s"
msgstr "Tá ceann de na pacáistí seo de dhíth:"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "tá gach rud ann cheana féin"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "tá gach rud ann cheana féin"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "tá gach rud ann cheana féin"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "kdesu ar iarraidh"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "tá gach rud ann cheana féin"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, fuzzy, c-format
msgid "due to unsatisfied %s"
msgstr "kdesu ar iarraidh"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr ""
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, fuzzy, c-format
msgid "in order to keep %s"
msgstr "téama le haighaidh taobh an fuinneog"
#: ../urpm/select.pm:607
#, 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:608
+#, 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:635
+#, fuzzy, c-format
msgid "in order to install %s"
msgstr "téama le haighaidh taobh an fuinneog"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "kdesu ar iarraidh"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr ""
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr ""
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr ""
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "Téip ag oscailt comhad: %s\n"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "theip ar feistiú"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "theip ar feistiú"
@@ -1732,7 +1749,7 @@ msgstr ""
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr ""
@@ -1759,7 +1776,7 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr ""
@@ -1823,7 +1840,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "Ag feistiál pacáiste %s"
msgstr[1] "Ag feistiál pacáiste %s"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, fuzzy, c-format
msgid " (y/N) "
msgstr " (T/n) "
@@ -2057,152 +2074,152 @@ msgstr ""
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr ""
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr "Modúl Cumraíochta Konsole"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr ""
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr ""
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr ""
-#: ../urpmi:153
+#: ../urpmi:154
#, c-format
msgid " --debug - very verbose mode.\n"
msgstr ""
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr ""
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr ""
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr ""
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "Eirigh as Feistiú"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "Eirigh as Feistiú"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "Tá ceann de na pacáistí seo de dhíth:"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Céard é do rogha? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2210,7 +2227,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2218,38 +2235,38 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Lean ar aghaidh ar aon nós?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (T/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
"%s"
msgstr "tá gach rud ann cheana féin"
-#: ../urpmi:525
+#: ../urpmi:513
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s"
msgstr "tá gach rud ann cheana féin"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr ""
-#: ../urpmi:551
+#: ../urpmi:538
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2257,7 +2274,7 @@ msgid ""
"%s\n"
msgstr "Tá %s ins na pacáistí a leanas: %s \n"
-#: ../urpmi:553
+#: ../urpmi:540
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2265,26 +2282,12 @@ msgid ""
"%s\n"
msgstr "Tá %s ins na pacáistí a leanas: %s \n"
-#: ../urpmi:560
-#, 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"
-
-#: ../urpmi:561
-#, 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"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:583
+#: ../urpmi:568
#, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2292,46 +2295,46 @@ msgid ""
"%s\n"
msgstr ""
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "Tá ceann de na pacáistí seo de dhíth:"
msgstr[1] "Tá ceann de na pacáistí seo de dhíth:"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Cealaigh"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Brú Enter nuair atá sin déanta agat..."
@@ -3014,6 +3017,14 @@ msgid "No changelog found\n"
msgstr ""
#, fuzzy
+#~ msgid "examining %s file"
+#~ msgstr "léamh depslist comhad [%s]"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "léamh depslist comhad [%s]"
+
+#, fuzzy
#~ msgid "%d installation transaction failed"
#~ msgid_plural "%d installation transactions failed"
#~ msgstr[0] "Theip ag feistiú"
diff --git a/po/gl.po b/po/gl.po
index b1be10d6..8473f84a 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-gl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2008-04-15 18:06+0100\n"
"Last-Translator: Leandro Regueiro <leandro DOT regueiro AT gmail DOT com>\n"
"Language-Team: Galician <proxecto@trasno.net>\n"
@@ -30,7 +30,7 @@ msgstr "Instalación de RPMs"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Erro: non foi posible atopar o ficheiro %s, cancelarase a operación"
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Aceptar"
@@ -97,7 +97,7 @@ msgstr "_Instalar"
msgid "_Save"
msgstr "_Gardar"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Cancelar"
@@ -128,9 +128,8 @@ msgstr ""
msgid "Options:"
msgstr "Opcións:"
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - amosa esta mensaxe de axuda.\n"
@@ -169,18 +168,18 @@ msgstr ""
" instalalo (--no-verify-rpm desactívaa, por\n"
" defecto está activada).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - usar só os soportes dados, separados por comas.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - permite buscar en proporciona para atopar o paquete.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - non buscar en proporciona para atopar o paquete.\n"
@@ -222,7 +221,22 @@ msgstr "Agarde..."
msgid "Must be root"
msgstr "Debe ser root"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "distribuíndo %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Instalación de paquetes..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Instalación de paquetes..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -238,37 +252,37 @@ msgstr ""
msgid "Warning"
msgstr "Advertencia"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Aceptar"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr "(para actualizar)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr "(para instalar)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Selección de paquetes"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Necesítase un dos seguintes paquetes:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Abortar"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -279,61 +293,56 @@ msgstr ""
"%s\n"
"Desexa continuar a instalación de tódolos xeitos?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Para satisface-las dependencias, vaise instala-lo seguinte paquete"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Para satisface-las dependencias, vanse instala-los seguintes paquetes"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d paquete, %d MB)"
msgstr[1] "(%d paquetes, %d MB)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Instalación de paquetes..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "Non foi posible consegui-los paquetes fonte, abortando"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Preparando..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Instalando o paquete `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Insira o soporte chamado \"%s\""
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Descargando o paquete `%s'..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Feito"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -344,28 +353,28 @@ msgstr ""
"%s\n"
"Pode ser que desexe actualizar a base de datos do seu urpmi"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "A instalación fallou:"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Xa está todo instalado"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Instalación rematada"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "eliminando %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "reiniciando urpmi"
@@ -404,7 +413,7 @@ msgstr " por defecto é %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - nome completo do rpm de saída (NVRA)\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Só o superusuario pode instalar paquetes"
@@ -414,136 +423,145 @@ msgstr "Só o superusuario pode instalar paquetes"
msgid "Running urpmi in restricted mode..."
msgstr "Executando urpmi en modo restrinxido..."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, c-format
msgid "fail to create directory %s"
msgstr "fallo ó crear o directorio %s"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr "dono incorrecto para o directorio %s"
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "Non se puido escribir no directorio de reempacamento [%s]\n"
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr "O directorio de ambiente %s non existe"
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "usando ambiente específico en %s\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "non foi posible abrir rpmdb"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nome de ficheiro rpm incorrecto [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "obtendo o ficheiro rpm [%s] ..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...obtención rematada"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...fallo ó obter: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "non foi posible acceder ó ficheiro rpm [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "non foi posible analisar o ficheiro spec %s [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "non foi posible rexistrar o ficheiro rpm"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Arquitectura incompatible para rpm [%s]"
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "erro ó rexistra-los paquetes locais"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
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:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, 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:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, fuzzy, c-format
msgid "unexpected expression %s"
msgstr "Expresións patrón:\n"
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Falta a sinatura (%s)"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, fuzzy, c-format
msgid "no expression to close"
msgstr "Expresións patrón:\n"
-#: ../urpm/args.pm:395
+#: ../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:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "o directorio de chroot non existe"
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr "Non se pode usar %s sen %s"
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr "Non se pode usar %s con %s"
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr "Demasiados argumentos\n"
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Fallo ó copiar"
@@ -592,122 +610,122 @@ msgstr "o soporte `%s' está definido dúas veces, abortando"
msgid "unable to write config file [%s]"
msgstr "non foi posible escribir o ficheiro de configuración [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "non está dispoñible %s, volvendo a %s"
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Introduza as súas credenciais para acceder ó proxy\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Nome de usuario:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Contrasinal:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr "%s fallou: saiu co sinal %d"
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr "%s fallou: saiu con %d"
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, c-format
msgid "copy failed"
msgstr "fallo ó copiar"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, c-format
msgid "wget is missing\n"
msgstr "falta wget\n"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, c-format
msgid "curl is missing\n"
msgstr "falta curl\n"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr "curl fallou: cancelouse a descarga\n"
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr "falta rsync\n"
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr "falta ssh\n"
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr "falta prozilla\n"
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr "Non se puido executar prozilla\n"
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, c-format
msgid "aria2 is missing\n"
msgstr "falta aria2\n"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr " %s%% de %s completado, TME = %s, velocidade = %s"
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr " %s%% completado, velocidade = %s"
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, c-format
msgid "retrieving %s"
msgstr "obtendo %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, c-format
msgid "retrieved %s"
msgstr "obteuse %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "protocolo descoñecido definido por %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "non está dispoñible %s, volvendo a %s"
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr ""
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "non foi posible manexar o protocolo: %s"
@@ -727,12 +745,12 @@ msgstr "non se atopou o paquete %s."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "recuperando ficheiros rpm do medio \"%s\"..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, fuzzy, c-format
msgid "[repackaging]"
msgstr "[reempaquetando]"
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -740,47 +758,47 @@ msgstr ""
"creouse unha transacción para instalar en %s (eliminar=%d, instalar=%d, "
"actualizar=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "non se puido crear a transacción"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "non foi posible extraer o rpm dende o paquete delta-rpm %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "non foi posible instalar o paquete %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, c-format
msgid "removing bad rpm (%s) from %s"
msgstr ""
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, c-format
msgid "removing %s failed: %s"
msgstr "fallo ó eliminar %s: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, c-format
msgid "Removing package %s"
msgstr "Eliminando o paquete %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "eliminando o paquete %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr ""
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Máis información no paquete %s"
@@ -825,18 +843,18 @@ msgstr "abortando"
msgid "%s database is locked (another program is already using it)"
msgstr "A base de datos de %s está bloqueada (xa a está usando outro programa)"
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "A instalación fallou"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -845,73 +863,63 @@ msgstr ""
"Fallou a instalación, rpms incorrectos:\n"
"%s"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, c-format
msgid "The following package has bad signature"
msgstr "O seguinte paquete ten unha sinatura incorrecta"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Os seguintes paquetes teñen sinaturas incorrectas"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "¿Desexa continuar ca instalación?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, c-format
msgid "removing installed rpms (%s)"
msgstr "eliminando os rpms instalados (%s)"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "distribuíndo %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "instalando %s dende %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "instalando %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "¿Probar a instalación sen comprobar as dependencias? (s/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "¿Probar a instalación con menos comprobacións (--force)? (s/N) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr "Os paquetes están actualizados"
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "A instalación é viable"
#: ../urpm/md5sum.pm:26
#, c-format
-msgid "examining %s file"
-msgstr "examinando o ficheiro %s"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
-#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "advertencia: o md5sum para %s non está dispoñible no ficheiro MD5SUM"
@@ -986,230 +994,230 @@ msgstr "instalaría no canto de actualizar o paquete %s"
msgid "medium \"%s\" already exists"
msgstr "o soporte \"%s\" xa existe"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr "(ignorado por defecto)"
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "engadindo o soporte \"%s\" antes do soporte remoto \"%s\""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, c-format
msgid "adding medium \"%s\""
msgstr "engadindo o soporte \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr "o directorio %s non existe"
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "parece que esta localización non contén ningunha distribución"
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, c-format
msgid "unable to parse media.cfg"
msgstr "non foi posible analizar media.cfg"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"non foi posible acceder ó soporte de distribución (non se atopou o ficheiro "
"media.cfg)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, c-format
msgid "retrieving media.cfg file..."
msgstr "obtendo o ficheiro media.cfg..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "intentando seleccionar o soporte inexistente \"%s\""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "seleccionando varios soportes: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "eliminando o soporte \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "reconfigurando urpmi para o soporte \"%s\""
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...fallo ó reconfigurar"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr ""
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Erro ó xerar o ficheiro de nomes: non se atopou a dependencia %d"
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "o soporte \"%s\" está actualizado"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "examinando o ficheiro synthesis [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problema ó ler o ficheiro synthesis do soporte \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr ""
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...fallo ó copiar"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "copiando o ficheiro de descrición de \"%s\"..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...copiado"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "fallo ó copiar [%s] (o ficheiro é sospeitosamente pequeno)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "calculando o md5sum do hdlist (ou synthesis) fonte recuperado"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "fallo ó obter [%s] (os md5sum non coinciden)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, c-format
msgid "genhdlist2 failed on %s"
msgstr "genhdlist2 fallou en %s"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, c-format
msgid "comparing %s and %s"
msgstr "comparando %s e %s..."
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ficheiro hdlist %s incorrecto no soporte \"%s\""
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "copiando o ficheiro MD5SUM de \"%s\"..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "nome de ficheiro rpm incorrecto [%s]"
-#: ../urpm/media.pm:1461
-#, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr ""
+#: ../urpm/media.pm:1443
+#, fuzzy, c-format
+msgid "no metadata found for medium \"%s\""
+msgstr "non se atopou un ficheiro synthesis para o soporte \"%s\""
-#: ../urpm/media.pm:1478
+#: ../urpm/media.pm:1475
#, c-format
-msgid "found probed synthesis as %s"
+msgid "retrieving source synthesis of \"%s\"..."
msgstr ""
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
-#, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "non se atopou un ficheiro synthesis para o soporte \"%s\""
-
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "examinando o ficheiro pubkey de \"%s\"..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...importouse a clave %s dende o ficheiro pubkey de \"%s\""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "non foi posible importar o ficheiro pubkey de \"%s\""
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "non se atopou un ficheiro synthesis para o soporte \"%s\""
+
+#: ../urpm/media.pm:1612
#, c-format
msgid "updated medium \"%s\""
msgstr "actualizouse o soporte \"%s\""
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr "fallou a obtención de [%s]"
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr "intentando de novo co sitio espello %s"
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr "Non se puido atopar un sitio espello da lista de sitios espello %s"
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr "atopouse a xeolocalización %s %.2f %.2f para a zona horaria %s"
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, c-format
msgid "getting mirror list from %s"
msgstr "obtendo a lista de sitios espello dende %s"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1280,7 +1288,7 @@ msgstr "GB"
msgid "TB"
msgstr "TB"
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1651,11 +1659,6 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Formato incorrecto: só pode usar unha etiqueta multivaluada"
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "usando ambiente específico en %s\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1671,119 +1674,137 @@ msgstr "non hai un synthesis dispoñible para o soporte \"%s\""
msgid "no xml-info available for medium \"%s\""
msgstr "non hai xml-info dispoñible para o soporte \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr "urpmi reiniciouse, e a lista de paquetes prioritarios non cambiou"
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
"urpmi reiniciouse, e a lista de paquetes prioritarios cambiou: %s vs %s"
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Non hai ningún paquete que se chame %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Os seguintes paquetes conteñen %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Non se poden instalar os paquetes %s"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, c-format
msgid "Package %s is already installed"
msgstr "O paquete %s xa está instalado"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, c-format
msgid "Packages %s are already installed"
msgstr "Os paquetes %s xa están instalados"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "debido a que falta %s"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, c-format
msgid "due to already installed %s"
msgstr "debido ó %s xa instalado"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "debido a %s non satisfeitas"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr ""
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "para manter %s"
#: ../urpm/select.pm:607
#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Teñe que eliminarse o seguinte paquete para poder actualizar outros:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Teñen que eliminarse os seguintes paquetes para poder actualizar outros:\n"
+"%s"
+
+#: ../urpm/select.pm:635
+#, c-format
msgid "in order to install %s"
msgstr "para instalar %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "debido a conflictos con %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Sinatura incorrecta (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr ""
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Falta a sinatura (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't write file"
msgstr "Non se puido escribir o ficheiro"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't open file"
msgstr "Non se puido abrir o ficheiro"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, c-format
msgid "Can't move file %s to %s"
msgstr "Non se puido mover o ficheiro %s a %s"
@@ -1827,7 +1848,7 @@ msgstr ""
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Reempaquetar os ficheiros antes de eliminar\n"
@@ -1856,7 +1877,7 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - modo detallado.\n"
@@ -1922,7 +1943,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "Desexa eliminar %d paquete?"
msgstr[1] "Desexa eliminar %d paquetes?"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (s/N) "
@@ -2192,17 +2213,22 @@ msgstr ""
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr ""
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - mostra os conflitos.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - omitir a instalación destes paquetes.\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr ""
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2211,42 +2237,42 @@ msgstr ""
" --more-choices - cando se atopan varios paquetes, propoñer máis eleccións\n"
" ademais da predeterminada.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - non bloquear a base de datos rpm.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - actualizar só paquetes ca mesma arquitectura.\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - modo silencioso.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --debug - modo moi detallado.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " nomes ou ficheiros rpm dados na liña de comandos instalaranse.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr "Erro: non se pode usar --auto-select cunha lista de paquetes.\n"
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2255,28 +2281,28 @@ msgstr ""
"Erro: Para xerar un informe de erro, especifique os argumentos de\n"
"liña de comandos normais xunta con --bug.\n"
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "Non pode instalar ficheiros rpm de binarios cando usa --install-src"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr "Non pode instalar ficheiros spec"
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2285,17 +2311,12 @@ msgstr ""
"O directorio [%s] xa existe, use outro directorio para a comunicación de "
"erros ou elimíneo"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Non foi posible crear o directorio [%s] para a comunicación de erros"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr "O directorio de ambiente %s non existe"
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2304,36 +2325,36 @@ msgstr ""
"Erro: semella que %s se montou coma de só lectura.\n"
"Use --allow-force para forzar a operación."
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr "Actualizando soporte...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (para actualizar)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (para actualizar)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (para instalar)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (para instalar)"
-#: ../urpmi:462
+#: ../urpmi:450
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2341,12 +2362,12 @@ msgid ""
msgstr ""
"Para satisfacer a dependencia de '%s', fai falta un dos seguintes paquetes:"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "¿Cal é a súa elección? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2357,7 +2378,7 @@ msgstr ""
"que son máis antigos cós instalados:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2368,7 +2389,7 @@ msgstr ""
"que son máis antigos cós instalados:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2377,12 +2398,12 @@ msgstr ""
"\n"
"¿Continuar a instalación de tódolos xeitos?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (S/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2391,7 +2412,7 @@ msgstr ""
"Non se puido instalar un paquete solicitado:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2400,12 +2421,12 @@ msgstr ""
"Algún dos paquetes solicitados non se puido instalar:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "Se se elimina o paquete %s o sistema estropearase"
-#: ../urpmi:551
+#: ../urpmi:538
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2416,7 +2437,7 @@ msgstr ""
"paquete para para poder actualizar outros:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2427,30 +2448,12 @@ msgstr ""
"paquetes para para poder actualizar outros:\n"
"%s\n"
-#: ../urpmi:560
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Teñe que eliminarse o seguinte paquete para poder actualizar outros:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Teñen que eliminarse os seguintes paquetes para poder actualizar outros:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(só probar, a eliminación non se fará agora mesmo)"
-#: ../urpmi:583
+#: ../urpmi:568
#, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2461,7 +2464,7 @@ msgstr ""
"seguintes dependencias:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
@@ -2469,39 +2472,39 @@ msgstr[0] "Para satisfacer as dependencias, vaise eliminar o seguinte paquete"
msgstr[1] ""
"Para satisfacer as dependencias, vanse eliminar os seguintes paquetes"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(só probar, a instalación non se fará agora mesmo)"
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr "vanse usar %s de espazo adicional no disco."
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr "vanse liberar %s de espazo no disco."
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr "vanse obter %s de paquetes."
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
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:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Cancelar"
-#: ../urpmi:648
+#: ../urpmi:633
#, c-format
msgid "Press Enter when mounted..."
msgstr "Prema Enter cando estea montado..."
@@ -3260,6 +3263,9 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Non se atopou o changelog\n"
+#~ msgid "examining %s file"
+#~ msgstr "examinando o ficheiro %s"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - crear un soporte de actualización.\n"
diff --git a/po/he.po b/po/he.po
index ad27418b..1ff4ddc9 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2008-03-22 15:41+0200\n"
"Last-Translator: Dotan Kamber <kamberd@yahoo.com>\n"
"Language-Team: Hebrew\n"
@@ -34,7 +34,7 @@ msgstr "התקנת חבילות תוכנה"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "שגיאה: לא ניתן למצוא את הקובץ %s, הפעולה תבוטל"
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_המשך"
@@ -100,7 +100,7 @@ msgstr "_התקנה"
msgid "_Save"
msgstr "_שמירה"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_ביטול"
@@ -132,9 +132,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - הצגת הודעת עזרה זו.\n"
@@ -168,17 +167,17 @@ msgstr ""
" --verify-rpm - בדוק את חתימת החבילה לפני ההתקנה\n"
" (--no-verify-rpm מבטל זאת, ברירת המחדל היא להפעיל\").\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - שימוש רק במקורות המסופקים, מופרדים ע\"י פסיק\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - allow search in provides to find package.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - do not search in provides to find package.\n"
@@ -216,7 +215,22 @@ msgstr "נא להמתין..."
msgid "Must be root"
msgstr "עליך להיות בעל הרשאות מנהל מערכת"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "מפיץ %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "התקנת חבילה..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "התקנת חבילה..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -232,37 +246,37 @@ msgstr ""
msgid "Warning"
msgstr "אזהרה"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "אישור"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (לשדרג)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (להתקין)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "בחירת חבילות"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "אחת החבילות הבאות נדרשת:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_בטל"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -273,61 +287,56 @@ msgstr ""
"%s\n"
"האם להמשיך בכל זאת?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "כדי לספק את התלויות, החבילה הבאה הותקן:"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "כדי לספק את התלויות החבילות הבאות יותקנו:"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(חבילה %d, %d MB)"
msgstr[1] "(%d חבילות, %d MB)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "התקנת חבילה..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "אין אפשרות לקרוא חבילות מהמאגר, הפעולה מתבטלת"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "הכנה..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "מתקין חבילה `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "נא להכניס את המדיה בשם \"%s\""
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "מוריד חבילה `%s'..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_סיום"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -338,28 +347,28 @@ msgstr ""
"%s\n"
"יתכן ועליך לעדכן את מאגר הנתונים של urpmi"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "ההתקנה כשלה:"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "הכל כבר מותקן"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "ההתקנה הסתיימה"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "מסיר %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "מפעיל מחדש את urpmi"
@@ -398,7 +407,7 @@ msgstr " ברירת המחדל היא %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - הצג שם מלא של ה-RPM (NVRA).\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "רק מנהל מערכת מורשה להתקין חבילות"
@@ -408,134 +417,143 @@ msgstr "רק מנהל מערכת מורשה להתקין חבילות"
msgid "Running urpmi in restricted mode..."
msgstr "הפעלת urpmi באופן עבודה מוגבל..."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, c-format
msgid "fail to create directory %s"
msgstr "יצירת הספרייה %s נכשלה"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "מוריד חבילה `%s'..."
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "שימוש בסביבה מסוימת על %s\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "אין אפשרות לפתוח את בסיס הנתונים של החבילות rpmdb"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "שם החבילה [%s] אינו תקין"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "מאחזר קובץ RPM [%s]..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...האחזור הסתיים"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...האיחזור נכשל: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "הגישה לחבילה [%s] נכשלה"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "אין אפשרות לפענח את קובץ המפרט %s [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "אין אפשרות לבצע רישום של החבילה"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "האריכטקטורה אינה תואמת את חבילת התוכנה [%s]"
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "חלה שגיאה בעת רישום חבילות מקומיות"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "פעולה זו אינה מותרת באופן עבודה מוגבל"
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "הכרזת proxy לא תקנית בשורת הפקודה\n"
-#: ../urpm/args.pm:298
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: לא יכול קובץ RPM \"%s\"\n"
-#: ../urpm/args.pm:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "חתימה חסרה (%s)"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "ספרית ה-chroot אינה קיימת"
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr "לא ניתן להשתמש ב-%s ללא %s"
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr "לא ניתן להשתמש ב-%s עם %s"
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr "יותר מדי משתנים\n"
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "ההעתקה נכשלה"
@@ -582,122 +600,122 @@ msgstr "המקור '%s' מוגדר פעמים, נוטש"
msgid "unable to write config file [%s]"
msgstr "כתיבת קובץ ההגדרות [%s] נכשלה"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "%s אינו זמין, נופל חזרה אל %s"
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "עליך להגדיר את פרטי ההתחברות לשרת המתווך\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "שם משתמש:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "ססמה:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr "%s כשל: הסתיים עם אות %d"
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr "%s כשל: הסתיים עם %d"
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, c-format
msgid "copy failed"
msgstr "העתקה נכשלה"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, c-format
msgid "wget is missing\n"
msgstr "wget חסר\n"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, c-format
msgid "curl is missing\n"
msgstr "curl חסר\n"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr "curl כשל: ההורדה בוטלה\n"
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr "rsync חסר\n"
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr "ssh חסר\n"
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr "prozilla חסר\n"
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr "לא ניתן להפעיל את prozilla\n"
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, c-format
msgid "aria2 is missing\n"
msgstr ""
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr " %s%% מ-%s הושלמו, זמן נותר = %s, מהירות = %s"
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr " %s%% הורדו, מהירות = %s"
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, c-format
msgid "retrieving %s"
msgstr "מאחזר %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, c-format
msgid "retrieved %s"
msgstr "אוחזרו %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "פרוטוקול לא מזוהה הוגדר עבור %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "%s אינו זמין, נופל חזרה אל %s"
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "לא נמצא webfetch מבין אלו הנתמכים: %s\n"
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "השימוש בפרוטוקול : %s נכשל"
@@ -717,58 +735,58 @@ msgstr "החבילה %s לא נמצאה."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "מעתיק חבילות תוכנה מהמקור \"%s\"..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr "[אורז מחדש]"
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr "יצר עסקה עבור התקנה על %s (הסרה=%d, התקנה=%d, עדכון=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "בלתי אפשרי לעשות עסקה"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "אין אפשרות לחלץ rpm מתוך חבילת delta-rpm ששמה %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "התקנת החבילה %s נכשלה"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "מסיר חבילה תקולה (%s) מתוך %s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, c-format
msgid "removing %s failed: %s"
msgstr "הסרת %s נכשלה: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, c-format
msgid "Removing package %s"
msgstr "מסיר חבילה %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "מסיר חבילה %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "מסיר חבילות מותקנות (%s) מתוך %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "מידע נוסף על החבילה %s"
@@ -813,18 +831,18 @@ msgstr "נוטש"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "ההתקנה נכשלה"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -833,73 +851,63 @@ msgstr ""
"ההתקנה כשלה, חבילות תקולות:\n"
"%s"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, c-format
msgid "The following package has bad signature"
msgstr "לחבילות הבאות יש בעיה בחתימות"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "לחבילות הבאות יש בעיה בחתימות"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "האם להמשיך בתהליך ההתקנה?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, c-format
msgid "removing installed rpms (%s)"
msgstr "מסיר חבילות מותקנות (%s)"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "מפיץ %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "מתקין את %s מתוך %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "מתקין %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "האם לנסות להתקין ללא בדיקת תלויות? (כן/*לא)"
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "האם לנסות להתקין תוך אילוץ תלויות (--force)? (כן/לא) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr "החבילות עדכניות"
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "ניתן לבצע את ההתקנה"
#: ../urpm/md5sum.pm:26
#, c-format
-msgid "examining %s file"
-msgstr "בודק את קובץ %s"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
-#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "אזהרה: חתימת md5sum עבור %s לא זמינה בקובץ MD5SUM"
@@ -972,228 +980,228 @@ msgstr "האם להתקין במקום לשדרג את החבילה %s"
msgid "medium \"%s\" already exists"
msgstr "המאגר \"%s\" כבר קיים"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "מוסיף את המקור \"%s\" לפני המקור המרוחק \"%s\""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, c-format
msgid "adding medium \"%s\""
msgstr "מוסיף את המקור \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr "הספריה %s אינה קיימת"
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, c-format
msgid "unable to parse media.cfg"
msgstr ""
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, c-format
msgid "retrieving media.cfg file..."
msgstr "מאחזר את הקובץ media.cfg..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "ניסיון לבחור במאגר שאינו קיים \"%s\""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "בוחר הרבה מדיה:%s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "מסיר מאגר \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "מגדיר מחדש את urpmi למקור \"%s\""
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...ההגדרה מחדש נכשלה"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "ההגדרה מחדש הושלמה"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "המקור \"%s\" עדכני"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "בודק את קובץ הsynthesis [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "בעיה בקריאת קובץ מיזוג של מאגר \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "מעתיק [%s] עבור המקורר \"%s\"..."
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...ההעתקה נכשלה"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "מעתיק תיאור קובץ של \"%s\"..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...ההעתקה הסתיימה"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "העתקת [%s] נכשלה (הקובץ קטן מהמצופה)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "מחשב חתימות md5sum של קובץ synthesis"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "אחזור [%s] נכשל (חתימת md5sum אינה תואמת)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, c-format
msgid "genhdlist2 failed on %s"
msgstr "genhdlist2 כשל על %s"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, c-format
msgid "comparing %s and %s"
msgstr "מחשב את %s ואת %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "קובץ hdlist %s לא תקף עבור מאגר \"%s\""
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "מעתיק קובץ MD5SUM של \"%s\"..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "שם החבילה [%s] אינו תקין"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
+#, fuzzy, c-format
+msgid "no metadata found for medium \"%s\""
+msgstr "לא נמצא קובץ synthesis עבור מאגר \"%s\""
+
+#: ../urpm/media.pm:1475
#, c-format
msgid "retrieving source synthesis of \"%s\"..."
msgstr "מוריד את קובץ synthesis של \"%s\"..."
-#: ../urpm/media.pm:1478
-#, c-format
-msgid "found probed synthesis as %s"
-msgstr "נמצא synthesis מאובחן כ-%s"
-
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
-#, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "לא נמצא קובץ synthesis עבור מאגר \"%s\""
-
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "בודק קובץ מפתחות ציבורי של \"%s\"..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr ".. מפתח %s מיובא מתוך קובץ ציבורי של \"%s\""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "לא יכול לייבוא קובץ של מפתח ציבורי של \"%s\""
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "לא נמצא קובץ synthesis עבור מאגר \"%s\""
+
+#: ../urpm/media.pm:1612
#, c-format
msgid "updated medium \"%s\""
msgstr "המקור \"%s\" עודכן"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, c-format
msgid "getting mirror list from %s"
msgstr "מייבא רשימת אתרי מראה מ- %s"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1264,7 +1272,7 @@ msgstr "GB"
msgid "TB"
msgstr "TB"
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1621,11 +1629,6 @@ msgstr " -f - הדפסת גרסה, שחרור וארכיון עם
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "שימוש בסביבה מסוימת על %s\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1641,118 +1644,136 @@ msgstr "אין קבצי synthesis עבור המקור \"%s\""
msgid "no xml-info available for medium \"%s\""
msgstr "אין קבצי xml info זמינים עבור המקור \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr "urpmi אותחל ורשימת החבילות הדחופות לא השתנתה"
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr "urpmi אותחל ורשימת החבילות הדחופות השתנתה: %s לעומת %s"
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "לא נמצאה חבילה בשם %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "החבילות הבאות מכילות את %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "לא ניתן להתקין את החבילות %s"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, c-format
msgid "Package %s is already installed"
msgstr "החבילה %s כבר מותקנת"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, c-format
msgid "Packages %s are already installed"
msgstr "החבילות %s כבר מותקנות"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "עקב %s חסר"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, c-format
msgid "due to already installed %s"
msgstr "בגלל החבילה %s שכבר מותקנת"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "עקב תלות %s שלא מולאה"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "מנסה לקדם %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "בכדי לשמור %s"
#: ../urpm/select.pm:607
#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"החבילה הבאה עומדת להימחק כדי שניתן יהיה לשדרג חבילות אחרות: \n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"החבילות הבאות עומדות להימחק בכדי שניתן יהיה לשדרג חבילות אחרות: \n"
+"%s"
+
+#: ../urpm/select.pm:635
+#, c-format
msgid "in order to install %s"
msgstr "בכדי להתקין %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "עקב התנגשות עם %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "חתימה לא תקפה (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "מפתח זהות לא תקין (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "חתימה חסרה (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't write file"
msgstr "לא מצליח לכתוב קובץ"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't open file"
msgstr "לא מצליח לפתוח קובץ"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, c-format
msgid "Can't move file %s to %s"
msgstr "לא מצליח להעביר את הקובץ %s אל %s"
@@ -1794,7 +1815,7 @@ msgstr " --test - בדיקה האם הסרת החבילה יכולה ל
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - הפעלה מבוזרת מול מספר מכונות שתוכנן זהה.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - אריזה מחדש של הקובץ לפני מחיקה\n"
@@ -1823,7 +1844,7 @@ msgstr ""
" --use-distrib - הגדרת urpme בזמן ריצה לפי עץ ההפצה, שימושי\n"
" להוסיף/להסיר מערכת chroot עם האפשרות --root.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr ""
@@ -1887,7 +1908,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "להסיר חבילה %d?"
msgstr[1] "להסיר %d חבילות?"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (כן/*לא) "
@@ -2141,17 +2162,22 @@ msgstr ""
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr ""
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - הדפס את ההתנגשויות.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - חבילות שיש לדלג על ההתקנה שלהן\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr ""
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2160,70 +2186,70 @@ msgstr ""
" --more-choices - כאשר קיימות מספר חבילות מתאימות, הצע מגוון אפשרויות\n"
" ולא רק את ברירת המחדל.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr ""
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - עדכן רק חבילות בעלות אותה ארכיטקטורה.\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - select all matches on command line.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - מצב שקט.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --debug - מצב עם פלט רב.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " שמות או קובצי RPM שניתנו בשורת הפקודה יותקנו.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2231,17 +2257,12 @@ msgid ""
msgstr ""
"הספרייה [%s] כבר קיימת, עליך לבחור ספרייה אחרת לדיווח על תקלה או למחוק אותה"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "יצירת הספרייה. [%s] עבור דיווחי תקלות נכשלה"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2250,48 +2271,48 @@ msgstr ""
"שגיאה: נראה ו-%s עוגן לקריאה בלבד.\n"
"עליך להשתמש ב --allow-force לאלץ פעולה זו."
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr "מעדכן מקור...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (לשדרג)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (לשדרג)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (להתקין)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (להתקין)"
-#: ../urpmi:462
+#: ../urpmi:450
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "בכדי לענות על התלות '%s' דרושה אחת החבילות הבאות:"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "מה היא בחירתך? (1-%d)"
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2302,7 +2323,7 @@ msgstr ""
"מגרסאות קודמות לאלו המותקנות:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2313,7 +2334,7 @@ msgstr ""
"מגרסאות קודמות מאלו המותקנות במחשבך:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2322,12 +2343,12 @@ msgstr ""
"\n"
"האם להמשיך בכל זאת?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr "אישור/ביטול (*כ/ל) "
-#: ../urpmi:524
+#: ../urpmi:512
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2336,7 +2357,7 @@ msgstr ""
"לא ניתן להתקין חבילה מבוקשת:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2345,12 +2366,12 @@ msgstr ""
"לא יכול להתקין כמה חבילות מבוקשות:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "הסרת החבילה %s תגרום נזק למערכת"
-#: ../urpmi:551
+#: ../urpmi:538
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2361,7 +2382,7 @@ msgstr ""
"כדי לשדרג אחרות:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2372,30 +2393,12 @@ msgstr ""
"יש צורך להסיר אותן, בכדי לשדרג את האחרות:\n"
"%s\n"
-#: ../urpmi:560
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"החבילה הבאה עומדת להימחק כדי שניתן יהיה לשדרג חבילות אחרות: \n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"החבילות הבאות עומדות להימחק בכדי שניתן יהיה לשדרג חבילות אחרות: \n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(בדיקה בלבד, ההסרה לא תבוצע למעשה)"
-#: ../urpmi:583
+#: ../urpmi:568
#, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2405,46 +2408,46 @@ msgstr ""
"יש צורך לקרוא ל-urpmi עם --buildrequires תחילה כדי להתקין את התלויות הבאות:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "בכדי לענות על התלויות החבילה הבאה תוסר"
msgstr[1] "כדי לענות על התלויות, %d החבילות הבאות ייוסרו"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(בדיקה בלבד, ההתקנה לא תבוצע למעשה)"
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr "יעשה שימוש ב-%s שטח כונן נוסף."
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr "%s שטח בכונן יפונה."
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr "%s של חבילות יאוחזרו."
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "להמשיך בהתקנת החבילה?"
msgstr[1] "להמשיך בהתקנת %d החבילות?"
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "ביטול"
-#: ../urpmi:648
+#: ../urpmi:633
#, c-format
msgid "Press Enter when mounted..."
msgstr ""
@@ -3159,6 +3162,12 @@ msgstr "אין מידע ב-xml למקור \"%s\", אין כל תוצאה עבו
msgid "No changelog found\n"
msgstr "לא נמצאה רשימת שינויים\n"
+#~ msgid "examining %s file"
+#~ msgstr "בודק את קובץ %s"
+
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "נמצא synthesis מאובחן כ-%s"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - הגדרת מאגר עדכון.\n"
diff --git a/po/hi.po b/po/hi.po
index ad24694e..95d8b6a3 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2005-08-23 20:11+0530\n"
"Last-Translator: धनञ्जय शर्मा (Dhananjaya Sharma)\n"
"Language-Team: Hindi, India\n"
@@ -28,7 +28,7 @@ msgstr "आरपीएम संसाधन"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "ठीक (_O)"
@@ -94,7 +94,7 @@ msgstr "संसाधन (_I)"
msgid "_Save"
msgstr "सुरक्षित (_S)"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "खत्म करें (_C)"
@@ -126,9 +126,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - यह सहायता संदेश मुद्रित करें\n"
@@ -163,20 +162,20 @@ msgstr ""
" --verify-rpm - संसाधन के पहिले, आर०पी०एम० हस्ताक्षर की जाँच करें\n"
" (--no-verify-rpm इसे अयोग्य करता है, डिफ़ॉल्ट जाँच के साथ है).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - सिर्फ़ दिए गए माध्यम का उपयोग करें, छोटे विराम चिह्न के द्वारा अलग "
"किये हुए\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - पूर्वनिर्दिष्टों में पैकेज को पाने के लिए खोज की अनुमति प्रदान करें\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - पूर्वनिर्दिष्टों में पैकेज को पाने के लिए ना खोजे\n"
@@ -216,7 +215,22 @@ msgstr "कृपया प्रतीक्षा करें..."
msgid "Must be root"
msgstr "रूट होना चाहिए"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "%s वितिरण किया जा रहा है"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "पैकेज संसाधित हो रहा है..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "पैकेज संसाधित हो रहा है..."
+
+#: ../gurpmi2:111
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -231,37 +245,37 @@ msgstr ""
msgid "Warning"
msgstr "चेतावनी"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "ओ०के०"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr "(अपग्रेड के लिए)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr "(संसाधन के लिए)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "पैकेज चयन"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "निम्नलिखित पैकेजों में से एक की आवश्यकता है:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "निष्फ़ल (_A)"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -271,14 +285,14 @@ msgstr ""
"अन्य पैकजों को उन्नयन करने के लिए, निम्नलिखित पैकेजों हटाना होगा:\n"
"%sजारी रहा जाएँ?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
"आधीनताओं को सन्तुष्ट करने के लिए, निम्नलिखित पैकेज का संसाधन होने जा रहा है(%d एमबी)"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -286,49 +300,44 @@ msgstr ""
"अधीनताओं को सन्तुष्ट करने के लिए, निम्नलिखित %d पैकेजों का संसाधन होने जा रहा है:\n"
"%s\n"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, fuzzy, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "%d पैकेज"
msgstr[1] "%d पैकेज"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "पैकेज संसाधित हो रहा है..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "स्रोत्र पैकेजों को पाने में असमर्थ, कार्यक्रम विफ़ल किया जा रहा है"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "तैयारी की जा रही है..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "`%s' (%s/%s) पैकेज को संसाधित किया जा रहा है..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "कृपया \"%s\" नामक माध्यम को [%s] साधन पर प्रवेश करें"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "`%s' पैकेज को डॉउनलोड किया जा रहा है..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "किया गया(_D)"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -339,28 +348,28 @@ msgstr ""
"%s\n"
"आपको अपना यू०आर०पी०एम०आई० डाटाबेस को अपडेट करना चाहिए"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "संसाधन असफ़ल"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "सभी कुछ पहिले से ही संसाधित है"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "संसाधन समाप्त"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "%s को हटाया जा रहा है"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "यू०आर०पी०एम०आई० को पुनः आरम्भ किया जा रहा है"
@@ -399,7 +408,7 @@ msgstr " %s डिफ़ाल्ट है ।\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -g - समूहों को नाम के साथ मुद्रित करें\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "सिर्फ़ महाउपयोगकर्ता को ही पैकेजों को संसाधित करने की अनुमति है"
@@ -409,134 +418,143 @@ msgstr "सिर्फ़ महाउपयोगकर्ता को ही
msgid "Running urpmi in restricted mode..."
msgstr "यूआरपीएमआई सीमित विधा में चल रही है..."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "दोष रिपोर्ट के लिए, [%s] निर्देशिका का निर्माण करने में असमर्थ"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "`%s' पैकेज को डॉउनलोड किया जा रहा है..."
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "%s पर विशिष्ट वातावरण का उपयोग करते हुए\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "आर०पी०एम०डी०बी० को खोलने में असमर्थ"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "अवैध आर०पी०एम० संचिका नाम [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "आर०पी०एम० संचिका [%s] को पुनः प्राप्त किया जा रहा है..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...पुनः प्राप्त करने की क्रिया संपन्न"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...पुनः प्राप्त करने में असफ़लता: %s "
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "आर०पी०एम० संचिका [%s] को पाने में असमर्थ"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "\"%s\" का पदभंजन [%s] संचिका में करने में असमर्थ"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "आर०पी०एम० संचिका का पंजीकरण में असमर्थ"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "स्थानीय पैकेजों का पंजीकरण करने में त्रुटि"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "सीमित विधा में चलते समय, इस संक्रिया को मनाही है"
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "निर्देश वाक्य पर निकृष्ट प्रोक्सी की घोषणा\n"
-#: ../urpm/args.pm:298
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: आर०पी०एम० संचिका \"%s\" को नहीं पढ़ सकता है\n"
-#: ../urpm/args.pm:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "विलुप्त हस्ताक्षर (%s)"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "प्रतिलिपि बनना असफ़ल"
@@ -583,122 +601,122 @@ msgstr ""
msgid "unable to write config file [%s]"
msgstr "संरचना-संचिका [%s] को लिखने में असमर्थ"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr ""
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "कृपया प्रोक्सी पर पहुँच पाने के लिए अपने अधिकार-पत्र बताएँ\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "उपयोक्ता नामः"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "पासवर्ड: "
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr ""
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr ""
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, fuzzy, c-format
msgid "copy failed"
msgstr "प्रतिलिपि बनना असफ़ल"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, fuzzy, c-format
msgid "wget is missing\n"
msgstr "%s के ना मिलने के कारण"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, fuzzy, c-format
msgid "curl is missing\n"
msgstr "%s के ना मिलने के कारण"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr ""
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr ""
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr ""
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr ""
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr ""
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "%s के ना मिलने के कारण"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr ""
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, fuzzy, c-format
msgid "retrieving %s"
msgstr "%s को हटाया जा रहा है"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...पुनः प्राप्त करने में असफ़लता: %s "
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "अज्ञात प्रोटोकॉल %s के लिए परिभाषित"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr ""
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "कोई वेबफ़ेच्च नहीं मिला, समर्थित वेबफ़ेच्च है: %s\n"
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "प्रोटोकॉल: %s को काबू करने में असमर्थ"
@@ -718,12 +736,12 @@ msgstr "%s पैकेज नहीं मिला"
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "\"%s\" माध्यम से आर०पी०एम० संचिकाऐं पुनः प्राप्त की जा रही है..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -731,47 +749,47 @@ msgstr ""
"%s पर संसाधन करने के लिए कार्य-संपादन का निर्माण किया गया (हटाना=%d, संसाधन=%d, "
"उन्नयन=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "कार्य संपादन का निर्माण करने में असमर्थ"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "delta-rpm पैकेज %s से आरपीएम को बाहर निकालने में असमर्थ"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "%s पैकेज को संसाधन करने में असमर्थ"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "%s को %s से संसाधित किया जा रहा है"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "...पुनः प्राप्त करने में असफ़लता: %s "
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "%s पैकेज को हटाया जा रहा है"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "%s पैकेज को हटाया जा रहा है"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "%s को %s से संसाधित किया जा रहा है"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "%s पैकेज के बारे में और अधिक सूचना"
@@ -816,90 +834,80 @@ msgstr "चेतावनी"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "संसाधन असफ़ल"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "संसाधन असफ़ल"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "निम्नलिखित पैकेजों पर खराब हस्ताक्षार है"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "निम्नलिखित पैकेजों पर खराब हस्ताक्षार है"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "क्या आप संसाधन जारी रखना चाहते है ?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "%s को %s से संसाधित किया जा रहा है"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "%s वितिरण किया जा रहा है"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "%s को %s से संसाधित किया जा रहा है"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "%s का संसाधन किया जा रहा है"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "संसाधन का प्रयास बिना आधिनताओं की जाँच किये हुए किया जाये? (हाँ/ना)(y/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "संसाधन का प्रयास और जोर से (बलपूर्वक) किया जाये (--force)? (हाँ/ना)(y/N) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "संसाधन संभव है"
#: ../urpm/md5sum.pm:26
-#, fuzzy, c-format
-msgid "examining %s file"
-msgstr "एम०डी०५सम (md5sum) संचिका का निरीक्षण किया जा रहा है"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "चेतावनी: एमडी५सम फ़ाइल में %s के लिए एमडी५सम अनुपलब्ध है"
@@ -974,230 +982,230 @@ msgstr "%s को उन्नयन करने की बजाय संस
msgid "medium \"%s\" already exists"
msgstr "\"%s\" माध्यम पहिले से विद्यमान है"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "\"%s\" माध्यम से शीर्षक पढ़े जा रहे है"
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "\"%s\" माध्यम को हटाया जा रहा है"
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr ""
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "आर०पी०एम०डी०बी० को खोलने में असमर्थ"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "प्रथम संसाधन माध्यम को पाने में असमर्थ (कोई हार्डडिस्क सूची संचिका नहीं मिली)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "हार्डडिस्क सूची संचिका को पुनःप्राप्त किया जा रहा है..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "अविद्यमान माध्यम \"%s\" को चयन का प्रयास किया जा रहा है"
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "बहुत सारे माध्यमों का चयन हो रहा है: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "\"%s\" माध्यम को हटाया जा रहा है"
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "\"%s\" माध्यम हेतु यू०आर०पी०एम०आई० को पुनः संरचित किया जा रहा है"
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...पुनःसंरचना प्रक्रिया असफ़ल"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "पुनःसंरचना प्रक्रिया सम्पन्न हुई"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "माध्यम \"%s\" का चयन नहीं किया गया है"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "कृत्रिम संचिका [%s] का निरीक्षण किया जा रहा है"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "\"%s\" माध्यम की कृत्रिम संचिका को पढ़ने में समस्या"
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "\"%s\" माध्यम के लिए संचिका-सूची लिखी जा रही है"
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...प्रतिलिपि बनना असफ़ल"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "\"%s\" संचिका के विवरण की प्रतिलिपि बनायी जा रहीं है..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...प्रतिलिपि बनना सम्पन्न हुआ"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "[%s] की प्रतिलिपि असफ़ल रही (संचिका सन्देहात्मक ढ़ग से छोटी है)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr ""
"पुनः प्राप्त की हुई स्रोत्र हार्डडिस्क सूची (या कृत्रिम रचना) के एम०डी०५सम (md5sum) की "
"गणना की जा रही है"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "[%s] की प्रतिलिपि अयोग्य है (एमडी५सम बेमेल है)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "हार्डडिस्क-सूची संचिका [%s] का निरीक्षण किया जा रहा है"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "%s को %s से संसाधित किया जा रहा है"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "\"%s\" माध्यम के लिए कोई हार्डडिस्क सूची संचिका नहीं मिली"
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "\"%s\" संचिका के विवरण की प्रतिलिपि बनायी जा रहीं है..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "अवैध आर०पी०एम० संचिका नाम [%s]"
-#: ../urpm/media.pm:1461
-#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "\"%s\" की मूल (या कृत्रिम) हार्डडिस्क सूची पुनः प्राप्त की जा रही है..."
-
-#: ../urpm/media.pm:1478
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "खोजी हुई हार्डडिस्क सूची (या कृत्रिम रचना)%s के रूप में मिली"
+msgid "no metadata found for medium \"%s\""
+msgstr "\"%s\" माध्यम के लिए कोई हार्डडिस्क सूची संचिका नहीं मिली"
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "\"%s\" माध्यम के लिए कोई हार्डडिस्क सूची संचिका नहीं मिली"
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "\"%s\" की मूल (या कृत्रिम) हार्डडिस्क सूची पुनः प्राप्त की जा रही है..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "\"%s\" की सामान्यजन कूंजी संचिका का निरीक्षण किया जा रहा है..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...\"%s\" की पब्लिककुंजी संचिका से %s कुंजी आयातित कर ली गई है"
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "\"%s\" की सामान्यजनकुंजी संचिका को आयात करने में असमर्थ"
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "\"%s\" माध्यम के लिए कोई हार्डडिस्क सूची संचिका नहीं मिली"
+
+#: ../urpm/media.pm:1612
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "%s माध्यम को जोड़ा गया"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "[%s] से आर०पी०एम० संचिकाओं को पढ़ा जा रहा है"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1268,7 +1276,7 @@ msgstr ""
msgid "TB"
msgstr ""
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1630,11 +1638,6 @@ msgstr " -f - \tमुद्रित संस्मरण, वि
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "%s पर विशिष्ट वातावरण का उपयोग करते हुए\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1650,118 +1653,136 @@ msgstr "\"%s\" माध्यम के लिए हार्डडिस्
msgid "no xml-info available for medium \"%s\""
msgstr "\"%s\" माध्यम के लिए संचिका-सूची लिखी जा रही है"
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "%s नाम का कोई पैकेज नहीं है"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "निम्नलिखित पैकेज %s को समाहित करते है: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "सभी कुछ पहिले से ही संसाधित है"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "सभी कुछ पहिले से ही संसाधित है"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "सभी कुछ पहिले से ही संसाधित है"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "%s के ना मिलने के कारण"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "सभी कुछ पहिले से ही संसाधित है"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "असन्तुष्ट %s के कारण"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "%s को प्रोत्साहित करने का प्रयास किया जा रहा है"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "%s को रखने के लिए"
#: ../urpm/select.pm:607
+#, fuzzy, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"अन्य पैकजों को उन्नयन करने के लिए, निम्नलिखित पैकेजों हटाना होगा:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"अन्य पैकजों को उन्नयन करने के लिए, निम्नलिखित पैकेजों हटाना होगा:\n"
+"%s"
+
+#: ../urpm/select.pm:635
#, c-format
msgid "in order to install %s"
msgstr "%s को संसाधित के लिए"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "%s के साथ विरोधाभास के कारण"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "अवैध हस्ताक्षर (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "अवैध कुंजी आई०डी० (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "विलुप्त हस्ताक्षर (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "संरचना-संचिका [%s] को निर्माण नहीं कर सकता है"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "प्रतिलिपि बनना असफ़ल"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "प्रतिलिपि बनना असफ़ल"
@@ -1804,7 +1825,7 @@ msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
" --parallel - वितरित यू०आर०पी०एम०आई०, उपनाम वाली प्रणालीयों के बीच में\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - टैग पैकेजर को मुद्रित करना: पैकेजर\n"
@@ -1834,7 +1855,7 @@ msgstr ""
" एक सीएचरूट को --root विकल्प के साथ संसाधित (असंसाधित) करने में "
"उपयोगी।\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - शब्दों का वॄथा प्रयोगिक विधि\n"
@@ -1900,7 +1921,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "%s पैकेज को हटाया जा रहा है"
msgstr[1] "%s पैकेज को हटाया जा रहा है"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr "(हाँ/ना:y/N)"
@@ -2158,17 +2179,22 @@ msgstr " --url - टैग यू०आर०एल० को मु
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - टैग विवरण मुद्रित करें: विवरण\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - टैग के विरोधाभासों को मुद्रित करें: सभी विरोधाभास\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - पैकेजों जिनका संसाधन छोड़ा जाना चाहिए\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, fuzzy, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --skip - पैकेजों जिनका संसाधन छोड़ा जाना चाहिए\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2177,72 +2203,72 @@ msgstr ""
" --more-choices - जब अनेको पैकेज मिल जाते है, तब डिफ़ाल्ट के स्थान पर अनेको "
"विकल्प चयन हेतु प्रस्तावित होते है ।\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - कैश में से आरपीएमों की सफ़ाई ना करना\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - समान संरचना वाले पैकेजों को ही अपग्रेड करें।\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - निर्देश वाक्य पर सभी मिलानों को चयन करें\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - शांत विधि\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --verbose - शब्दों का वॄथा प्रयोगिक विधि\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr "निर्देश वाक्य पर दिये हुए नाम या आर०पी०एम० संचिकाऐं संसाधित की जायेगी\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
"द्विआधारी आर०पी०एम० संचिकाओं के साथ क्या किया जा सकता है, जब --install-src निर्देश "
"का उपयोग किया जा रहा हो"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2251,17 +2277,12 @@ msgstr ""
"[%s] निर्देशिका पहिले से विद्यमान है, कृपया दोष रिपोर्ट के लिए अन्य निर्देशिका का उपयोग "
"करेंया इसे हटा दें ।"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "दोष रिपोर्ट के लिए, [%s] निर्देशिका का निर्माण करने में असमर्थ"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2270,48 +2291,48 @@ msgstr ""
"त्रुटि: सम्भवता %s को सिर्फ़-पढ़ने-के लिए माउन्ट किया गया लगता है ।\n"
"इस प्रक्रिया को बल-पूर्वक करने के लिए --allow-force विकल्प का उपयोग करें ।"
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "(अपग्रेड के लिए)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "(अपग्रेड के लिए)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "(संसाधन के लिए)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "(संसाधन के लिए)"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "अधिनताओं को सन्तुष्ट करने के लिए, निम्नलिखित पैकेजों %d को हटाया जायेगा (%d एमबी)"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "आपकी क्या इच्छा है? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2322,7 +2343,7 @@ msgstr ""
"संसाधित किये जा चुके पैकेजो से पहिले के है:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2333,19 +2354,19 @@ msgstr ""
"संसाधित किये जा चुके पैकेजो से पहिले के है:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "कुछ भी हो जारी रहा जायें?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr "(हाँ/ना:Y/n)"
-#: ../urpmi:524
+#: ../urpmi:512
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2354,7 +2375,7 @@ msgstr ""
"निवेदन किये हुए कुछ पैकेज संसाधित नहीं किये जा सके:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2363,12 +2384,12 @@ msgstr ""
"निवेदन किये हुए कुछ पैकेज संसाधित नहीं किये जा सके:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "%s पैकेज को हटाने से आपकी प्रणाली नष्ट हो जायेगी"
-#: ../urpmi:551
+#: ../urpmi:538
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2379,7 +2400,7 @@ msgstr ""
"निम्नलिखित पैकेजों को हटाना पड़ेगा:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2390,30 +2411,12 @@ msgstr ""
"निम्नलिखित पैकेजों को हटाना पड़ेगा:\n"
"%s\n"
-#: ../urpmi:560
-#, fuzzy, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"अन्य पैकजों को उन्नयन करने के लिए, निम्नलिखित पैकेजों हटाना होगा:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"अन्य पैकजों को उन्नयन करने के लिए, निम्नलिखित पैकेजों हटाना होगा:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2423,7 +2426,7 @@ msgstr ""
"निम्नलिखित आधिनताओं को संसाधित करने लिए, आपको महाउपयोगकर्ता होना चाहिए:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
@@ -2432,39 +2435,39 @@ msgstr[0] ""
msgstr[1] ""
"अधिनताओं को सन्तुष्ट करने के लिए, निम्नलिखित पैकेजों %d को हटाया जायेगा (%d एमबी)"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "निरस्त"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "तैयार होने पर इन्टर (Enter) कुंजी को दबायें..."
@@ -3213,6 +3216,14 @@ msgstr ""
msgid "No changelog found\n"
msgstr "कोई परिवर्तनलॉग नहीं मिला\n"
+#, fuzzy
+#~ msgid "examining %s file"
+#~ msgstr "एम०डी०५सम (md5sum) संचिका का निरीक्षण किया जा रहा है"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "खोजी हुई हार्डडिस्क सूची (या कृत्रिम रचना)%s के रूप में मिली"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - एक अपडेट माध्यम का निर्माण करें\n"
diff --git a/po/hr.po b/po/hr.po
index 835e952d..a2819f50 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2005-01-04 21:27+CET\n"
"Last-Translator: auto\n"
"Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -26,7 +26,7 @@ msgstr "Pripremam instalaciju"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_U redu"
@@ -76,7 +76,7 @@ msgstr "Instaliraj"
msgid "_Save"
msgstr "_Spremi"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Odustani"
@@ -107,9 +107,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - ispiši ovaj tekst s pomoći.\n"
@@ -143,18 +142,18 @@ msgstr ""
" (--no-verify-rpm treba biti isključen, uobičajeno je "
"uključen).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, fuzzy, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --update - koristi samo medije za dogradnju.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - dozvoli pretraživanje u provides kako bi pronašao paket.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
@@ -193,7 +192,22 @@ msgstr "Molim pričekajte..."
msgid "Must be root"
msgstr "Port miša"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "instaliram %s\n"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Pripremam se za instalaciju"
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Pripremam se za instalaciju"
+
+#: ../gurpmi2:111
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -208,37 +222,37 @@ msgstr ""
msgid "Warning"
msgstr "Upozorenje"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "U redu"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "Dogradnja"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, fuzzy, c-format
msgid " (to install)"
msgstr "Izlaz iz instalacije"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Jedan od slijedećih paketa je potreban:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Prekini"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -246,21 +260,21 @@ msgid ""
"Continue installation anyway?"
msgstr "Slijedeći paketi će biti uklonjeni"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
"Kako bi zadovoljili ovisnosti, slijedeći paketi će biti uklonjeni (%d MB)"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
"Kako bi zadovoljili ovisnosti, slijedeći paketi će biti uklonjeni (%d MB)"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, fuzzy, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
@@ -268,42 +282,37 @@ msgstr[0] "%d paketa"
msgstr[1] "%d paketa"
msgstr[2] "%d paketa"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Pripremam se za instalaciju"
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "ne mogu dohvatiti izvorne (source) pakete, prekidam"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Pripremam..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Instaliram paket `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Molim umetnite medij pod nazivom \"%s\" u uređaj [%s]"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, fuzzy, c-format
msgid "Downloading package `%s'..."
msgstr "Instaliram pakete..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, fuzzy, c-format
msgid "_Done"
msgstr "Gotov"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -313,28 +322,28 @@ msgstr ""
"Instalacija neuspješna, neke datoteke nedostaju.\n"
"Možda ćete poželjeti dograditi vašu urpmi bazu"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Instalacija nije uspjela"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "sve je već instalirano"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Instalirano"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, fuzzy, c-format
msgid "removing %s"
msgstr "Uklanjam %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "restartam urpmi"
@@ -375,7 +384,7 @@ msgstr ""
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - ispiši verziju, izdanje i arhitekturu sa imenom.\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Samo je administratoru dozvoljeno da instalira pakete"
@@ -385,134 +394,143 @@ msgstr "Samo je administratoru dozvoljeno da instalira pakete"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "Nije uspjelo stvaranje direktorija %s"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "Instaliram pakete..."
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "koristim posebno okružje na %s\n"
+
+#: ../urpm.pm:305
#, fuzzy, c-format
msgid "unable to open rpmdb"
msgstr "Ne mogu otvoriti datoteku %s\n"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nepravilno ime rpm datoteke [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, fuzzy, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "dohvaćam hdlists datoteku..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...dohvat završen"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...dohvaćanje neuspješno: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "ne mogu pristupiti rpm datoteci [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "ne mogu pristupiti rpm datoteci [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "ne mogu registrirati rpm datoteku"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "greška prilikom registriranja lokalnih paketa"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "pogrešna deklaracija proxyja u komandnom retku\n"
-#: ../urpm/args.pm:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Nedostaje potpis (%s)"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, fuzzy, c-format
msgid "Copying failed"
msgstr "...kopiranje neuspješno"
@@ -559,122 +577,122 @@ msgstr ""
msgid "unable to write config file [%s]"
msgstr "ne mogu zapisati config datoteku [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr ""
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr ""
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Ime korisnika:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Lozinka:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr ""
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr ""
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, fuzzy, c-format
msgid "copy failed"
msgstr "...kopiranje neuspješno"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, fuzzy, c-format
msgid "wget is missing\n"
msgstr "zbog nezadovoljavajućeg %s"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, fuzzy, c-format
msgid "curl is missing\n"
msgstr "zbog nezadovoljavajućeg %s"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr ""
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr ""
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr ""
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr ""
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr ""
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "zbog nezadovoljavajućeg %s"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr ""
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, fuzzy, c-format
msgid "retrieving %s"
msgstr "Uklanjam %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...dohvaćanje neuspješno: %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "definiran je nepoznati protokol za %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr ""
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr ""
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, fuzzy, c-format
msgid "unable to handle protocol: %s"
msgstr "ne mogu pristupiti rpm datoteci [%s]"
@@ -694,12 +712,12 @@ msgstr "paket %s nije pronađen."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "ne mogu pročitati rpm datoteku [%s] sa medija \"%s\""
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -707,47 +725,47 @@ msgstr ""
"Napravljena razmjena za instalaciju na %s (makni=%d, instaliraj=%d, "
"unaprijedi=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, fuzzy, c-format
msgid "unable to create transaction"
msgstr "Ne mogu napraviti ssh identitet"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "Izaberite vaše pakete"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, fuzzy, c-format
msgid "unable to install package %s"
msgstr "Problem prilikom instaliranja paketa %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "instaliram %s\n"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "...dohvaćanje neuspješno: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "Instaliram paket %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, fuzzy, c-format
msgid "removing package %s"
msgstr "Instaliram paket %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "instaliram %s\n"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, fuzzy, c-format
msgid "More information on package %s"
msgstr "Izaberite vaše pakete"
@@ -792,90 +810,80 @@ msgstr "Upozorenje"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Instalacija nije uspjela"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Instalacija nije uspjela"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Slijedeći paketi će biti instalirani"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, fuzzy, c-format
msgid "The following packages have bad signatures"
msgstr "Slijedeći paketi će biti instalirani"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Želite li nastaviti instalaciju?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "instaliram %s\n"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, fuzzy, c-format
msgid "distributing %s"
msgstr "instaliram %s\n"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "instaliram %s\n"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, fuzzy, c-format
msgid "installing %s"
msgstr "instaliram %s\n"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Pokušati instalaciju bez provjere ovisnosti (d/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Pokušati instalaciju još snažnije (--force)? (d/N) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, fuzzy, c-format
msgid "Installation is possible"
msgstr "Problem u instalaciji"
#: ../urpm/md5sum.pm:26
-#, fuzzy, c-format
-msgid "examining %s file"
-msgstr "ispitujem hdlist datoteku [%s]"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr ""
@@ -947,228 +955,228 @@ msgstr "Problem prilikom instaliranja paketa %s"
msgid "medium \"%s\" already exists"
msgstr "medij \"%s\" već postoji"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "uklanjam medij \"%s\""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "uklanjam medij \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr ""
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "Ne mogu otvoriti datoteku %s\n"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "ne mogu pristupiti prvom instalacijskom mediju (nije pronađen hdlists)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "dohvaćam hdlists datoteku..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, fuzzy, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "pokušavam zaobiči postojeći medij \"%s\", izbjegavam"
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, fuzzy, c-format
msgid "selecting multiple media: %s"
msgstr "pokušavam izabrati višestruki medij: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "uklanjam medij \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "Proxy postavke za medij \"%s\""
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "Postavke meni-a spremljene"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "Podešavanje poslužitelja"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "medij \"%s\" nije izabran"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "ispitujem synthesis datoteku [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, fuzzy, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "napravljen hdlist sintezna datoteka za medij \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...kopiranje neuspješno"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopiranje opisne datoteke od \"%s\"..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...kopiranje završeno"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopiranje [%s] neuspješno"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "dohvaćanje hdlist (ili synthesis) izvora neuspješno"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "kopiranje [%s] neuspješno"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "ispitujem hdlist datoteku [%s]"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "instaliram %s\n"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "kopiranje opisne datoteke od \"%s\"..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "nepravilno ime rpm datoteke [%s]"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "dohvaćam hdlist (ili synthesis) izvor od \"%s\"..."
-
-#: ../urpm/media.pm:1478
-#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "pronašao sam ispitani hdlist (ili synthesis) kao %s"
+msgid "no metadata found for medium \"%s\""
+msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "nije pronađena hdlist datoteka za medij \"%s\""
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "dohvaćam hdlist (ili synthesis) izvor od \"%s\"..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, fuzzy, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "kopiranje opisne datoteke od \"%s\"..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, fuzzy, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "ne mogu zapisati list datoteku za \"%s\""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, fuzzy, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "ne mogu zapisati list datoteku za \"%s\""
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "nije pronađena hdlist datoteka za medij \"%s\""
+
+#: ../urpm/media.pm:1612
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "dodan medij %s"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "nisu pronađene rpm datoteke u [%s]"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1239,7 +1247,7 @@ msgstr ""
msgid "TB"
msgstr ""
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1610,11 +1618,6 @@ msgstr " -f - ispiši verziju, izdanje i arhitekturu sa imenom.\n"
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "koristim posebno okružje na %s\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1630,118 +1633,132 @@ msgstr "napravljen hdlist sintezna datoteka za medij \"%s\""
msgid "no xml-info available for medium \"%s\""
msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Ne postoji paket pod nazivom %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Slijedeći paketi sadrže %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "sve je već instalirano"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "sve je već instalirano"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "sve je već instalirano"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "zbog nezadovoljavajućeg %s"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "sve je već instalirano"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "zbog nezadovoljavajućeg %s"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "odabirem %s izabiranjem datoteka"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "kako bi se zadržalo %s"
#: ../urpm/select.pm:607
#, 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:608
+#, 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:635
+#, fuzzy, c-format
msgid "in order to install %s"
msgstr "kako bi se zadržalo %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "zbog sukoba sa %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Neispravan potpis (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Neispravan ID ključa (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Nedostaje potpis (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "ne mogu zapisati config datoteku [%s]"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "...kopiranje neuspješno"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "...kopiranje neuspješno"
@@ -1782,7 +1799,7 @@ msgstr " --test - potvrdi da instalacija može biti dostignuta točno.\n
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --group -ispisuje oznaku group: grupu."
@@ -1809,7 +1826,7 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " -v - opširan mod.\n"
@@ -1880,7 +1897,7 @@ msgstr[0] "Instaliram paket %s"
msgstr[1] "Instaliram paket %s"
msgstr[2] "Instaliram paket %s"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (d/N) "
@@ -2143,142 +2160,143 @@ msgstr " --help - ispiši ovaj tekst s pomoći.\n"
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - ispisuje oznaku description: opis."
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr ""
+" --conflicts - ispisuje oznaku conflicts: sve konflikte (više linija)."
+
+#: ../urpmi:143
#, fuzzy, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --test - potvrdi da instalacija može biti dostignuta točno.\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, fuzzy, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --test - potvrdi da instalacija može biti dostignuta točno.\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:146
+#: ../urpmi:147
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - zadrži rpm koji nije korišten u međuspremniku.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - odabire sve odgovarajuće na komandnoj liniji.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - tihi mod.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " -v - opširan mod.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, fuzzy, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " imena ili rpm datoteke dane na komandnoj liniji se ispituju.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
"Što može biti učinjeno s binarnim rpm datotekama kad se korsiti opcija --"
"install-src"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, fuzzy, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr "Grupa već postoji, molimo odaberite drugo ime grupe"
-#: ../urpmi:253
+#: ../urpmi:254
#, fuzzy, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Nije uspjelo stvaranje direktorija %s"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "Dogradnja"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "Dogradnja"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "Izlaz iz instalacije"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "Izlaz iz instalacije"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2286,12 +2304,12 @@ msgid ""
msgstr ""
"Kako bi zadovoljili ovisnosti, slijedeći paketi će biti uklonjeni (%d MB)"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Izaberite jedan? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2299,7 +2317,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2307,19 +2325,19 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Da ipak nastavim?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (D/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2328,7 +2346,7 @@ msgstr ""
"Naki traženi paketi ne mogu biti instalirani:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2337,12 +2355,12 @@ msgstr ""
"Naki traženi paketi ne mogu biti instalirani:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, fuzzy, c-format
msgid "removing package %s will break your system"
msgstr "uklanjanje paketa %s će pokvariti vaš sustav\n"
-#: ../urpmi:551
+#: ../urpmi:538
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2352,7 +2370,7 @@ msgstr ""
"neki paketi moraju biti uklonjeni da bi mogli biti nadograđeni, ovo još "
"uvijek nije podržano\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2362,26 +2380,12 @@ msgstr ""
"neki paketi moraju biti uklonjeni da bi mogli biti nadograđeni, ovo još "
"uvijek nije podržano\n"
-#: ../urpmi:560
-#, 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"
-
-#: ../urpmi:561
-#, 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"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2391,7 +2395,7 @@ msgstr ""
"Morate biti administrator(root) kako bi instalirali slijedeće ovisnosti:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
@@ -2402,27 +2406,27 @@ msgstr[1] ""
msgstr[2] ""
"Kako bi zadovoljili ovisnosti, slijedeći paketi će biti uklonjeni (%d MB)"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2430,12 +2434,12 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Odustani"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Pritisnite Enter kada ste gotovi..."
@@ -3171,6 +3175,14 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Nije pronađena ni jedna slika"
+#, fuzzy
+#~ msgid "examining %s file"
+#~ msgstr "ispitujem hdlist datoteku [%s]"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "pronašao sam ispitani hdlist (ili synthesis) kao %s"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - napravi medij za dogradnju.\n"
diff --git a/po/hu.po b/po/hu.po
index a22e5200..a948cd17 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-2009.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2008-09-05 09:11+0100\n"
"Last-Translator: Lónyai Gergely <aleph@mandriva.org>\n"
"Language-Team: Hungarian <aleph@mandriva.org>\n"
@@ -24,8 +24,7 @@ msgstr ""
"X-Poedit-Country: HUNGARY\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: ../gurpmi:31
-#: ../gurpmi2:74
+#: ../gurpmi:31 ../gurpmi2:74
#, c-format
msgid "RPM installation"
msgstr "RPM-telepítés"
@@ -35,9 +34,7 @@ msgstr "RPM-telepítés"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Hiba: %s nevű fájl nem található - a művelet megszakítva"
-#: ../gurpmi:46
-#: ../gurpmi2:175
-#: ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_OK"
@@ -49,7 +46,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 ""
@@ -62,8 +60,7 @@ msgstr ""
"\n"
"Mit szeretne tenni?"
-#: ../gurpmi:74
-#: ../gurpmi:85
+#: ../gurpmi:74 ../gurpmi:85
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -103,8 +100,7 @@ msgstr "_Telepítés"
msgid "_Save"
msgstr "M_entés"
-#: ../gurpmi:100
-#: ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Mégsem"
@@ -114,13 +110,13 @@ msgstr "_Mégsem"
msgid "Choose location to save file"
msgstr "Válasszon helyet a fájlnak"
-#: ../gurpmi.pm:39
-#: ../urpmi:67
+#: ../gurpmi.pm:39 ../urpmi:67
#, c-format
msgid ""
"urpmi version %s\n"
"Copyright (C) 1999-2008 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 ""
@@ -135,45 +131,36 @@ msgstr ""
msgid "Options:"
msgstr "Opciók:"
-#: ../gurpmi.pm:46
-#: ../urpm/search.pm:35
-#: ../urpme:46
-#: ../urpmf:35
-#: ../urpmi:72
-#: ../urpmi.addmedia:54
-#: ../urpmi.recover:33
-#: ../urpmi.removemedia:40
-#: ../urpmi.update:32
-#: ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - jelen segítség megjelenítése\n"
-#: ../gurpmi.pm:47
-#: ../urpmi:79
+#: ../gurpmi.pm:47 ../urpmi:79
#, c-format
-msgid " --auto - non-interactive mode, assume default answers to questions.\n"
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions.\n"
msgstr ""
" --auto - nem-interaktív mód, a kérdésekre az alapértelmezett\n"
" válaszok lesznek feltételezve\n"
-#: ../gurpmi.pm:48
-#: ../urpmi:80
-#: ../urpmq:52
+#: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - automatikusan kiválasztja a frissíthető csomagokat\n"
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - automatikusan kiválasztja a frissíthető csomagokat\n"
-#: ../gurpmi.pm:49
-#: ../urpme:50
-#: ../urpmi:103
-#: ../urpmq:66
+#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - végrehajtás akkor is, ha néhány csomag nem elérhető\n"
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - végrehajtás akkor is, ha néhány csomag nem elérhető\n"
-#: ../gurpmi.pm:50
-#: ../urpmi:133
+#: ../gurpmi.pm:50 ../urpmi:133
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -182,46 +169,40 @@ msgstr ""
" --verify-rpm - RPM-aláírás ellenőrzése telepítés előtt (kikapcsolás:\n"
" --no-verify-rpm; alapértelmezés: bekapcsolt állapot)\n"
-#: ../gurpmi.pm:52
-#: ../urpm/search.pm:41
-#: ../urpmf:41
-#: ../urpmi:73
-#: ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - csak a felsorolt (elválasztás: vessző) adatforrások\n"
" használata\n"
-#: ../gurpmi.pm:53
-#: ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - csomag keresése a szolgáltatásjegyzékben\n"
-#: ../gurpmi.pm:54
-#: ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
-msgstr " -P - a csomag ne legyen keresve a szolgáltatásjegyzékben\n"
+msgstr ""
+" -P - a csomag ne legyen keresve a szolgáltatásjegyzékben\n"
-#: ../gurpmi.pm:55
-#: ../urpmi:110
-#: ../urpmq:69
+#: ../gurpmi.pm:55 ../urpmi:110 ../urpmq:69
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - másik gyökér használata az RPM-csomagtelepítéshez\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"
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
msgstr " --test - csak ellenőrzés, hogy a telepítés végrehajtható-e\n"
-#: ../gurpmi.pm:57
-#: ../urpmi:76
+#: ../gurpmi.pm:57 ../urpmi:76
#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
" --searchmedia - csak a megadott adatforrások használata a kért csomagok\n"
" kereséséhez\n"
@@ -241,7 +222,22 @@ msgstr "Kis türelmet..."
msgid "Must be root"
msgstr "Rendszergazdai jogosultság szükséges"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "%s elosztása"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Csomagtelepítés..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Csomagtelepítés..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -257,107 +253,98 @@ msgstr ""
msgid "Warning"
msgstr "Figyelmeztetés"
-#: ../gurpmi2:134
-#: ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "OK"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (frissítés)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (telepítés)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Csomagválasztás"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "A következő csomagok valamelyikére szükség van:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Megszakítás"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
"%s\n"
"Continue installation anyway?"
msgstr ""
-"A következő csomagokat el kell távolítani, hogy más csomagok frissíthetők legyenek:\n"
+"A következő csomagokat el kell távolítani, hogy más csomagok frissíthetők "
+"legyenek:\n"
"%s\n"
"Kívánja folytatni a telepítést?"
-#: ../gurpmi2:241
-#: ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, 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 "A függőségek feloldásához a következő csomag telepítésre kerül:"
-#: ../gurpmi2:242
-#: ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
msgstr "A függőségek feloldásához a következő csomagok telepítésre kerülnek:"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d csomag, %d MB)"
msgstr[1] "(%d csomag, %d MB)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Csomagtelepítés..."
-
-#: ../gurpmi2:252
-#: ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "a forráscsomagok nem elérhetők, ezért a művelet félbeszakad"
-#: ../gurpmi2:266
-#: ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Előkészítés..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "A(z) '%s' (%s/%s) csomag telepítése..."
-#: ../gurpmi2:287
-#: ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Kérem helyezze be a(z) \"%s\" nevű adathordozót"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "A(z) '%s' csomag letöltése folyik..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Kész"
-#: ../gurpmi2:332
-#: ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -368,33 +355,28 @@ msgstr ""
"%s\n"
"Érdemes lehet frissíteni az urpmi adatbázist."
-#: ../gurpmi2:338
-#: ../urpm/main_loop.pm:223
-#: ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259
-#: ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "A telepítés nem sikerült:"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "A csomag(ok) már telepítve van(nak)"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "A telepítés befejeződött"
-#: ../gurpmi2:346
-#: ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "\"%s\" eltávolítása"
-#: ../gurpmi2:354
-#: ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "az urpmi újraindítása"
@@ -435,8 +417,7 @@ msgstr " alapértelmezés: %s\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - az RPM-csomag teljes nevének kiírása (NVRA)\n"
-#: ../rurpmi:11
-#: ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Csomagok telepítéséhez rendszergazdai jogosultság szükséges"
@@ -446,159 +427,164 @@ msgstr "Csomagok telepítéséhez rendszergazdai jogosultság szükséges"
msgid "Running urpmi in restricted mode..."
msgstr "Az Urpmi indítása korlátozott módban..."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, c-format
msgid "fail to create directory %s"
msgstr "nem sikerült a %s könyvtár létrehozása"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr "érvénytelen tulajdonosa van a %s könyvtárnak"
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, c-format
msgid "Can not download packages into %s"
msgstr "Nem sikerült letölteni a csomagot a %s tükörről"
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr "\"%s\" környezeti könyvtár nem létezik"
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "a következő környezet használata: %s\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "az rpmdb megnyitása nem sikerült"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "érvénytelen csomagfájlnév: \"%s\""
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "RPM-fájl behozatala: \"%s\"..."
-#: ../urpm.pm:296
-#: ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...behozatal megtörtént"
-#: ../urpm.pm:299
-#: ../urpm/download.pm:731
-#: ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836
-#: ../urpm/media.pm:1287
-#: ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...a behozatal sikertelen: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "a csomagfájl nem elérhető: \"%s\""
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "nem sikerült elemezni a(z) \"%s\" specifikációs fájlt [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "az RPM-csomagfájl nem regisztrálható"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Az RPM-mel nem kompatibilis architektúra [%s]"
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "hiba a helyi csomagok regisztrálásakor"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
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:145
-#: ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "helytelen proxy-megadás a parancssorban\n"
-#: ../urpm/args.pm:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "váratlan kifejezés: %s"
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "a %s előtt hiányzik a kifejezés"
-#: ../urpm/args.pm:382
+#: ../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:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "nincs a kifejezés lezárárva"
-#: ../urpm/args.pm:395
+#: ../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"
+msgstr ""
+"alapértelmezésben az urpmi egy regexpet vár, ezt megerősítheti a \"--literal"
+"\" opcióval"
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot-könyvtár nem létezik"
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr "\"%s\" nem használható \"%s\" nélkül"
-#: ../urpm/args.pm:485
-#: ../urpm/args.pm:488
-#: ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr "\"%s\" nem használható ezzel: \"%s\""
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr "Túl sok argumentum\n"
-#: ../urpm/bug_report.pm:51
-#: ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "A másolás sikertelen"
#: ../urpm/cdrom.pm:66
#, c-format
-msgid "You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done automatically)"
-msgstr "Muszáj a CD-ROM-ot kézzel csatlakoztatnia (vagy telepítse a perl-Hal-Cdroms csomagot az automatikus csatlakoztatáshoz)"
+msgid ""
+"You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+"Muszáj a CD-ROM-ot kézzel csatlakoztatnia (vagy telepítse a perl-Hal-Cdroms "
+"csomagot az automatikus csatlakoztatáshoz)"
#: ../urpm/cdrom.pm:68
#, c-format
msgid "HAL daemon (hald) is not running or not ready"
msgstr "A HAL démon (hald) nem fut vagy nem áll készen"
-#: ../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 "a(z) \"%s\" adatforrás nem elérhető"
@@ -623,129 +609,127 @@ 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:251
-#: ../urpm/media.pm:497
-#: ../urpm/media.pm:503
+#: ../urpm/cfg.pm:251 ../urpm/media.pm:497 ../urpm/media.pm:503
#, c-format
msgid "unable to write config file [%s]"
msgstr "a beállítások mentése nem sikerült: \"%s\""
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "\"%s\" nem elérhető, helyette ez lesz használva: %s"
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr "nem olvasható a proxy beállítás (nincs joga a(z) %s olvasásához)"
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Adja meg az adatait a proxy eléréséhez\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Felhasználónév:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Jelszó:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr "\"%s\": ismeretlen webes letöltő\n"
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr "a(z) %s hibát adott vissza: \"%d\" szignállal lépett ki"
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr "a(z) %s hibát adott vissza: \"%d\" kóddal lépett ki"
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, c-format
msgid "copy failed"
msgstr "a másolás sikertelen"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, c-format
msgid "wget is missing\n"
msgstr "a Wget hiányzik\n"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, c-format
msgid "curl is missing\n"
msgstr "a Curl hiányzik\n"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr "a Curl hibát jelzett, a letöltés meg lett szakítva\n"
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr "az Rsync hiányzik\n"
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr "az SSH hiányzik\n"
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr "a Prozilla hiányzik\n"
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr "Nem sikerült végrehajtani a Prozilla programot\n"
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, c-format
msgid "aria2 is missing\n"
msgstr "aria2 hiányzik\n"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr " %s%% megvan, összesen: %s, hátralevő: %s, sebesség: %s"
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr " %s%% megvan, sebesség: %s"
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, c-format
msgid "retrieving %s"
msgstr "\"%s\" behozatala"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, c-format
msgid "retrieved %s"
msgstr "\"%s\" behozatala megtörtént"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "ismeretlen protokoll van definiálva ehhez: \"%s\""
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "\"%s\" nem elérhető, helyette ez lesz használva: %s"
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, 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:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "protokollkezelés sikertelen: %s"
@@ -765,58 +749,60 @@ msgstr "a csomag nem található: \"%s\""
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "RPM-fájlok behozatala a(z) \"%s\" adatforrásból..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr "[újracsomagolás]"
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "a telepítési műveletek elkezdődtek ide: %s (eltávolítás=%d, telepítés=%d, frissítés=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"a telepítési műveletek elkezdődtek ide: %s (eltávolítás=%d, telepítés=%d, "
+"frissítés=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "egy művelet elvégzése nem sikerült"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "nem sikerült kimásolni az RPM-csomagot a(z) \"%s\" delta-rpm csomagból"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "a(z) \"%s\" csomag telepítése sikertelen"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "hibás RPM-csomagok (%s) eltávolítása innen: %s"
-#: ../urpm/install.pm:218
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, c-format
msgid "removing %s failed: %s"
msgstr "%s eltávolítása sikertelen: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, c-format
msgid "Removing package %s"
msgstr "A(z) %s csomag eltávolítása folyik"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "a(z) %s csomag eltávolítása folyik"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "a telepített RPM-csomagok (%s) eltávolítása innen: %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "További információ a(z) %s csomagról"
@@ -841,8 +827,7 @@ msgstr "Nincs megadva kiszolgáló - hiányzó URI vagy gépnév"
msgid "No base defined"
msgstr "Nincs megadva alap"
-#: ../urpm/ldap.pm:172
-#: ../urpm/ldap.pm:175
+#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
#, c-format
msgid "Cannot connect to ldap uri:"
msgstr "Nem lehet kapcsolódni az LDAP-URI-hoz:"
@@ -862,22 +847,18 @@ msgstr "leállítás"
msgid "%s database is locked (another program is already using it)"
msgstr "a(z) %s adatbázis zárolt (másik program már használja)"
-#: ../urpm/main_loop.pm:110
-#: ../urpm/main_loop.pm:120
-#: ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230
-#: ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "A telepítés nem sikerült"
-#: ../urpm/main_loop.pm:112
-#: ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr "Menjen mindenféleképp? (i/N)"
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -886,81 +867,72 @@ msgstr ""
"A telepítés nem sikerült, hibás RPM-ek:\n"
"%s"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, c-format
msgid "The following package has bad signature"
msgstr "A következő csomag helytelen aláírást tartalmaz:"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "A következő csomagok helytelen aláírást tartalmaznak:"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Szeretné folytatni a telepítést?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, c-format
msgid "removing installed rpms (%s)"
msgstr "telepített RPM-csomagok eltávolítása (%s)"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "%s elosztása"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "%s telepítése innen: %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "%s telepítése folyik"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Próbáljam meg a telepítést a függőségek ellenőrzése nélkül? (i/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Ha problémát okozhat, akkor is legyen telepítés (--force)? (i/N) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr "A csomagok naprakészek"
-#: ../urpm/main_loop.pm:306
-#: ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "A telepítés elvégezhető"
#: ../urpm/md5sum.pm:26
#, c-format
-msgid "examining %s file"
-msgstr "a(z) \"%s\" fájl vizsgálata"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr "érvénytelen MD5SUM fájl"
-
-#: ../urpm/md5sum.pm:28
-#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "figyelmeztetés: a(z) %s ellenőrzőösszege nincs benne az MD5SUM fájlban"
#: ../urpm/media.pm:204
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "a(z) \"%s\" virtuális adatforrás nem tiszta URL-lel rendelkezik, ezért az adatforrás nem kerül feldolgozásra"
+msgstr ""
+"a(z) \"%s\" virtuális adatforrás nem tiszta URL-lel rendelkezik, ezért az "
+"adatforrás nem kerül feldolgozásra"
#: ../urpm/media.pm:206
#, c-format
@@ -970,7 +942,8 @@ msgstr "\"%s\" listafájlja nem elérhető; az adatforrás nem kerül feldolgoz
#: ../urpm/media.pm:213
#, c-format
msgid "unable to access synthesis file of \"%s\", medium ignored"
-msgstr "\"%s\" fejléclistája nem elérhető; az adatforrás nem kerül feldolgozásra"
+msgstr ""
+"\"%s\" fejléclistája nem elérhető; az adatforrás nem kerül feldolgozásra"
#: ../urpm/media.pm:240
#, c-format
@@ -980,10 +953,10 @@ msgstr "a(z) \"%s\" néven létező adatforrás elkerülése - kihagyás"
#: ../urpm/media.pm:456
#, c-format
msgid "failed to migrate removable device, ignoring media"
-msgstr "Sikertelen az eltávolítható eszköz csatlakoztatása. Az adatforrás kihagyva..."
+msgstr ""
+"Sikertelen az eltávolítható eszköz csatlakoztatása. Az adatforrás kihagyva..."
-#: ../urpm/media.pm:499
-#: ../urpm/media.pm:505
+#: ../urpm/media.pm:499 ../urpm/media.pm:505
#, c-format
msgid "wrote config file [%s]"
msgstr "beállítások mentése: \"%s\""
@@ -1000,8 +973,12 @@ msgstr "a hozzárendelt adatforrás használata párhuzamos módhoz: %s"
#: ../urpm/media.pm:572
#, c-format
-msgid "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --update, --use-distrib or --parallel"
-msgstr "a --synthesis nem használható ezekkel: --media, --excludemedia, --sortmedia, --update, --use-distrib, --parallel"
+msgid ""
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update, --use-distrib or --parallel"
+msgstr ""
+"a --synthesis nem használható ezekkel: --media, --excludemedia, --sortmedia, "
+"--update, --use-distrib, --parallel"
#: ../urpm/media.pm:666
#, c-format
@@ -1023,243 +1000,236 @@ msgstr "csomagfrissítés helyett telepítés szükséges: \"%s\""
msgid "medium \"%s\" already exists"
msgstr "\"%s\" adatforrás már létezik"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr "(alapértelmezésben figyelmen kívül hagyva)"
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "\"%s\" adatforrás hozzáadása a(z) \"%s\" távoli adatforrás előtt"
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, c-format
msgid "adding medium \"%s\""
msgstr "\"%s\" adatforrás hozzáadása"
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr "%s könyvtár nem létezik"
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "úgy tűnik, ez a hely nem tartalmaz disztribúciót"
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, c-format
msgid "unable to parse media.cfg"
msgstr "a media.cfg elemzése nem sikerült"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "a disztribúciós adatforrás nem elérhető (media.cfg fájl nem található)"
# N("skipping non compatible media `%s' (for %s)",
# $media, $media_arch)
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr "\"%s\" nevű nem kompatibilis adatforrás kihagyása (architektúra: %s)"
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, c-format
msgid "retrieving media.cfg file..."
msgstr "media.cfg fájl behozatala..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "kísérlet történt nem létező adatforrás (\"%s\") kiválasztására"
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "több adatforrás kijelölése: \"%s\""
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "\"%s\" adatforrás eltávolítása"
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "az urpmi beállításainak módosítása a(z) \"%s\" adatforráshoz"
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...a beállítások módosítása sikertelen"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "a beállítások módosítása megtörtént"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
-msgstr "Nem sikerült elkészíteni a névfájlt - nem található a következő függőség: %d"
+msgstr ""
+"Nem sikerült elkészíteni a névfájlt - nem található a következő függőség: %d"
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "a(z) \"%s\" adatforrás naprakész"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "kiterjesztett függőséglista vizsgálata: \"%s\""
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
-msgstr "probléma a(z) \"%s\" adatforrás kiterjesztett függőséglistájának olvasásakor"
+msgstr ""
+"probléma a(z) \"%s\" adatforrás kiterjesztett függőséglistájának olvasásakor"
-#: ../urpm/media.pm:1176
-#: ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "\"%s\" másolása a(z) \"%s\" adatforrás számára..."
-#: ../urpm/media.pm:1178
-#: ../urpm/media.pm:1233
-#: ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...a másolás sikertelen"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "\"%s\" leírásfájljának másolása..."
-#: ../urpm/media.pm:1231
-#: ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...másolás megtörtént"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "\"%s\" másolása sikertelen (a fájl túl kicsi)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, c-format
msgid "computing md5sum of retrieved source synthesis"
-msgstr "a letöltött kiterjesztett függőséglista MD5-ös összegének kiszámítása folyik"
+msgstr ""
+"a letöltött kiterjesztett függőséglista MD5-ös összegének kiszámítása folyik"
-#: ../urpm/media.pm:1312
-#: ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "\"%s\" megszerzése sikertelen (az MD5-ös összegek nem egyeznek)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, c-format
msgid "genhdlist2 failed on %s"
msgstr "genhdlist2 hibát jelzett \"%s\"-ben"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, c-format
msgid "comparing %s and %s"
msgstr "%s és %s összehasonlítása"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "érvénytelen fejléclista-fájl (%s) a(z) \"%s\" adatforráshoz"
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "\"%s\" leírásfájljának másolása..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "érvénytelen MD5SUM fájl (letöltve a %s tükörről)"
-#: ../urpm/media.pm:1461
-#, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "\"%s\" forrás-fejléclistájának (illetve kiterjesztett függőséglistájának) behozatala..."
-
-#: ../urpm/media.pm:1478
-#, c-format
-msgid "found probed synthesis as %s"
-msgstr "a csomagkezelő fejléclistát (illetve kiterjesztett függőséglistát) talált: %s"
+#: ../urpm/media.pm:1443
+#, fuzzy, c-format
+msgid "no metadata found for medium \"%s\""
+msgstr "a(z) \"%s\" adatforráshoz nem található kiterjesztett függőséglista"
-#: ../urpm/media.pm:1485
-#: ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "a(z) \"%s\" adatforráshoz nem található kiterjesztett függőséglista"
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr ""
+"\"%s\" forrás-fejléclistájának (illetve kiterjesztett függőséglistájának) "
+"behozatala..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "\"%s\" nyilvánoskulcs-fájljának vizsgálata..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...%s kulcs importálva \"%s\" nyilvánoskulcs-fájljából"
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "\"%s\" nyilvánoskulcs-fájlja nem importálható"
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "a(z) \"%s\" adatforráshoz nem található kiterjesztett függőséglista"
+
+#: ../urpm/media.pm:1612
#, c-format
msgid "updated medium \"%s\""
msgstr "\"%s\" adatforrás frissítve"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr "[%s] megszerzése sikertelen"
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr "Ismételt próbálkozás a %s tükörrel."
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr "Nem találok egy tükröt sem a %s tükörlistában."
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
-msgstr "%s %.2f %.2f földrajzi helyet állapítottam meg a(z) %s időzóna alapján."
+msgstr ""
+"%s %.2f %.2f földrajzi helyet állapítottam meg a(z) %s időzóna alapján."
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, c-format
msgid "getting mirror list from %s"
msgstr "tükörlista beolvasása innen: %s"
-#: ../urpm/msg.pm:63
-#: ../urpmi:514
-#: ../urpmi:529
-#: ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64
-#: ../urpme:38
-#: ../urpmi:568
-#: ../urpmi:663
-#: ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1325,18 +1295,25 @@ msgstr "MB"
msgid "GB"
msgstr "GB"
-#: ../urpm/msg.pm:190
-#: ../urpm/msg.pm:199
+#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
#, c-format
msgid "TB"
msgstr "TB"
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
-msgid "The following package is now orphan, use \"urpme --auto-orphans\" to remove it."
-msgid_plural "The following packages are now orphans, use \"urpme --auto-orphans\" to remove them."
-msgstr[0] "A következő csomag elárvult. Használd az \"urpme --auto-orphans\" parancsot az eltávolítására."
-msgstr[1] "A következő csomagok elárvultak. Használd az \"urpme --auto-orphans\" parancsot az eltávolításukra."
+msgid ""
+"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
+"it."
+msgid_plural ""
+"The following packages are now orphans, use \"urpme --auto-orphans\" to "
+"remove them."
+msgstr[0] ""
+"A következő csomag elárvult. Használd az \"urpme --auto-orphans\" parancsot "
+"az eltávolítására."
+msgstr[1] ""
+"A következő csomagok elárvultak. Használd az \"urpme --auto-orphans\" "
+"parancsot az eltávolításukra."
#: ../urpm/parallel.pm:14
#, c-format
@@ -1390,16 +1367,19 @@ msgstr "cp hiba a %s gépen (%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 hiba a %s gépen (lehet, hogy az urpmi nem jó verziója található a gépen?)(kilépési kód: %d)"
+msgid ""
+"%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
+"code: %d)"
+msgstr ""
+"%s hiba a %s gépen (lehet, hogy az urpmi nem jó verziója található a gépen?)"
+"(kilépési kód: %d)"
#: ../urpm/removable.pm:32
#, c-format
msgid "unable to access medium \"%s\"."
msgstr "a(z) \"%s\" adatforrás nem hozzáférhető"
-#: ../urpm/removable.pm:72
-#: ../urpm/removable.pm:90
+#: ../urpm/removable.pm:72 ../urpm/removable.pm:90
#, c-format
msgid "mounting %s"
msgstr "%s csatolása"
@@ -1409,13 +1389,13 @@ msgstr "%s csatolása"
msgid "unmounting %s"
msgstr "%s leválasztása"
-#: ../urpm/search.pm:29
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
"urpmf version %s\n"
"Copyright (C) 2002-2006 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 ""
@@ -1425,480 +1405,430 @@ msgstr ""
"\n"
"Használat: urpmf [opciók] mintakifejezés\n"
-#: ../urpm/search.pm:36
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
msgstr " --version - jelen program verziószámának megjelenítése\n"
-#: ../urpm/search.pm:37
-#: ../urpmf:37
-#: ../urpmi:132
-#: ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - megadott környezet használata (általában hibajelentés\n"
" esetén használatos)\n"
-#: ../urpm/search.pm:38
-#: ../urpmf:38
-#: ../urpmi:74
-#: ../urpmq:49
+#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
" --excludemedia - a felsorolt (elválasztás: vessző) adatforrások\n"
" feldolgozásának mellőzése\n"
-#: ../urpm/search.pm:39
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
#, c-format
-msgid " --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-" --literal, -l - mintaillesztés mellőzése, az argumentum normál szövegként\n"
+" --literal, -l - mintaillesztés mellőzése, az argumentum normál "
+"szövegként\n"
" való kezelése\n"
-#: ../urpm/search.pm:40
-#: ../urpme:54
-#: ../urpmf:40
-#: ../urpmi:111
-#: ../urpmi.addmedia:72
-#: ../urpmi.recover:36
-#: ../urpmi.removemedia:45
-#: ../urpmi.update:48
-#: ../urpmq:70
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
" --urpmi-root - másik gyökér használata az Urpmi-adatbázishoz és az\n"
" RPM-csomagtelepítéshez\n"
-#: ../urpm/search.pm:42
-#: ../urpmf:42
-#: ../urpmi:77
-#: ../urpmq:50
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../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 - az adatforrások sorbarendezése vesszővel elválasztott\n"
" sztringek alapján\n"
-#: ../urpm/search.pm:43
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
#, c-format
msgid " --use-distrib - use the given path to access media\n"
-msgstr " --use-distrib - a megadott útvonal használata az adatforrások eléréséhez\n"
+msgstr ""
+" --use-distrib - a megadott útvonal használata az adatforrások eléréséhez\n"
-#: ../urpm/search.pm:44
-#: ../urpmf:44
-#: ../urpmi:78
-#: ../urpmq:51
+#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
" --synthesis - a megadott kiterjesztett függőséglista használata az\n"
" urpmi-adatbázis helyett\n"
-#: ../urpm/search.pm:45
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
#, c-format
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - az azonos sorok csak egyszer jelenjenek meg\n"
-#: ../urpm/search.pm:46
-#: ../urpmf:46
-#: ../urpmi:75
-#: ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - csak frissítési adatforrás legyen használva\n"
-#: ../urpm/search.pm:47
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
#, c-format
msgid " --verbose - verbose mode.\n"
msgstr " --verbose - részletes információ\n"
-#: ../urpm/search.pm:48
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
#, c-format
msgid " -i - ignore case distinctions in patterns.\n"
msgstr " -i - a minták feldolgozása nem nagybetűérzékeny\n"
-#: ../urpm/search.pm:49
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
#, c-format
msgid " -I - honor case distinctions in patterns (default).\n"
-msgstr " -I - a minták feldolgozása nagybetűérzékeny (alapértelmezés)\n"
+msgstr ""
+" -I - a minták feldolgozása nagybetűérzékeny (alapértelmezés)\n"
-#: ../urpm/search.pm:50
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
#, c-format
msgid " -F<str> - change field separator (defaults to ':').\n"
msgstr " -F<szöveg> - mezőelválasztó módosítása (alapértelmezés: \":\")\n"
-#: ../urpm/search.pm:51
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
#, c-format
msgid "Pattern expressions:\n"
msgstr "Mintakifejezések:\n"
-#: ../urpm/search.pm:52
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
#, c-format
msgid " text - any text is parsed as a regexp, unless -l is used.\n"
msgstr ""
-" szöveg - a szövegek reguláris kifejezésként vannak kezelve, ezt -l\n"
+" szöveg - a szövegek reguláris kifejezésként vannak kezelve, ezt -"
+"l\n"
" opcióval lehet felülbírálni\n"
-#: ../urpm/search.pm:53
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
#, c-format
msgid " -e - include perl code directly as perl -e.\n"
msgstr " -e - Perl kód közvetlen betevése (perl -e)\n"
-#: ../urpm/search.pm:54
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
#, c-format
msgid " -a - binary AND operator.\n"
msgstr " -a - bináris ÉS művelet.\n"
-#: ../urpm/search.pm:55
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
#, c-format
msgid " -o - binary OR operator.\n"
msgstr " -o - bináris VAGY művelet.\n"
-#: ../urpm/search.pm:56
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
#, c-format
msgid " ! - unary NOT.\n"
msgstr " ! - unáris NEM művelet.\n"
-#: ../urpm/search.pm:57
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
#, c-format
msgid " ( ) - left and right parentheses.\n"
msgstr " ( ) - bal illetve jobb oldali zárójel\n"
-#: ../urpm/search.pm:58
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
#, c-format
msgid "List of tags:\n"
msgstr "Címkék listája:\n"
-#: ../urpm/search.pm:59
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
#, c-format
msgid " --qf - specify a printf-like output format\n"
msgstr " --qf - printf-szerű kiírási formátum megadása\n"
-#: ../urpm/search.pm:60
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
#, c-format
msgid " example: '%%name:%%files'\n"
msgstr " példa: '%%name:%%files'\n"
-#: ../urpm/search.pm:61
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
#, c-format
msgid " --arch - architecture\n"
msgstr " --arch - architektúra\n"
-#: ../urpm/search.pm:62
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
#, c-format
msgid " --buildhost - build host\n"
msgstr " --buildhost - a csomagkészítéshez használt gép\n"
-#: ../urpm/search.pm:63
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
#, c-format
msgid " --buildtime - build time\n"
msgstr " --buildtime - a csomagkészítés időpontja\n"
-#: ../urpm/search.pm:64
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
#, c-format
msgid " --conffiles - configuration files\n"
msgstr " --conffiles - beállítási fájlok\n"
-#: ../urpm/search.pm:65
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
#, c-format
msgid " --conflicts - conflict tags\n"
msgstr " --conflicts - \"ütközés\" címkék\n"
-#: ../urpm/search.pm:66
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
#, c-format
msgid " --description - package description\n"
msgstr " --description - csomagleírás\n"
-#: ../urpm/search.pm:67
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
#, c-format
msgid " --distribution - distribution\n"
msgstr " --distribution - disztribúció\n"
-#: ../urpm/search.pm:68
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
#, c-format
msgid " --epoch - epoch\n"
msgstr " --epoch - generáció\n"
-#: ../urpm/search.pm:69
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
#, c-format
msgid " --filename - filename of the package\n"
msgstr " --filename - a csomag fájlneve\n"
-#: ../urpm/search.pm:70
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
#, c-format
msgid " --files - list of files contained in the package\n"
msgstr " --files - a csomagban levő fájlok listája\n"
-#: ../urpm/search.pm:71
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
#, c-format
msgid " --group - group\n"
msgstr " --group - csoport\n"
-#: ../urpm/search.pm:72
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
#, c-format
msgid " --license - license\n"
msgstr " --license - licenc\n"
-#: ../urpm/search.pm:73
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
#, c-format
msgid " --name - package name\n"
msgstr " --name - csomagnév\n"
-#: ../urpm/search.pm:74
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - \"elavulttá tesz\" címkék\n"
-#: ../urpm/search.pm:75
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr " --packager - csomagkészítő\n"
-#: ../urpm/search.pm:76
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - \"szolgáltatásjegyzék\" címkék\n"
-#: ../urpm/search.pm:77
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - \"követelmények\" címkék\n"
-#: ../urpm/search.pm:78
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
#, c-format
msgid " --size - installed size\n"
msgstr " --size - telepített méret\n"
-#: ../urpm/search.pm:79
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - a forráscsomag neve\n"
-#: ../urpm/search.pm:80
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
#, c-format
msgid " --suggests - suggests tags\n"
msgstr " --suggests - \"javasol\" címkék\n"
-#: ../urpm/search.pm:81
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr " --summary - összefoglaló\n"
-#: ../urpm/search.pm:82
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
#, c-format
msgid " --url - url\n"
msgstr " --url - URL\n"
-#: ../urpm/search.pm:83
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
#, c-format
msgid " --vendor - vendor\n"
msgstr " --vendor - terjesztő\n"
-#: ../urpm/search.pm:84
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
#, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -m - a csomagot tartalmazó adatforrás\n"
-#: ../urpm/search.pm:85
-#: ../urpmf:85
-#: ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - a névvel együtt a verzió, a kiadásszám és az\n"
" architektúra is jelenjen meg\n"
-#: ../urpm/search.pm:197
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Helytelen formátum: csak egy darab többértékű címke használható"
-#: ../urpm/search.pm:247
-#: ../urpmf:248
-#: ../urpmi:265
-#: ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "a következő környezet használata: %s\n"
-
-#: ../urpm/search.pm:290
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "a(z) \"%s\" adatforráshoz nem elérhető a fejléclista (hdlist)"
-#: ../urpm/search.pm:297
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "a \"%s\" adatforrás kiterjesztett függőséglistája nem elérhető"
-#: ../urpm/search.pm:304
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "a(z) \"%s\" adatforrás listafájlja nem elérhető"
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr "az Urpmi újra lett indítva; a prioritásos csomagok listája nem változott"
+msgstr ""
+"az Urpmi újra lett indítva; a prioritásos csomagok listája nem változott"
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "az Urpmi újra lett indítva; a prioritásos csomagok listája változott: %s - %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"az Urpmi újra lett indítva; a prioritásos csomagok listája változott: %s - "
+"%s"
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Nincs ilyen nevű csomag: %s"
-#: ../urpm/select.pm:170
-#: ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "A következő csomagok tartalmazzák a(z) %s komponenst: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr "Használja a \"-a\" kapcsolót minden kijelöléséhez"
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, c-format
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:543
+#: ../urpm/select.pm:538
#, c-format
msgid "Package %s is already installed"
msgstr "A(z) \"%s\" csomag már telepítve van"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, c-format
msgid "Packages %s are already installed"
msgstr "A(z) \"%s\" csomagok már telepítve vannak"
-#: ../urpm/select.pm:562
-#: ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "\"%s\" hiánya miatt"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, c-format
msgid "due to already installed %s"
msgstr "mivel \"%s\" már telepítve van"
-#: ../urpm/select.pm:564
-#: ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "\"%s\" igényei miatt"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "a legalkalmasabb \"%s\" keresése"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "\"%s\" megtartása érdekében"
#: ../urpm/select.pm:607
#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"A következő csomagot el kell távolítani, hogy a szükséges csomagok "
+"frissíthetők legyenek:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"A következő csomagokat el kell távolítani, hogy a szükséges csomagok "
+"frissíthetők legyenek:\n"
+"%s"
+
+#: ../urpm/select.pm:635
+#, c-format
msgid "in order to install %s"
msgstr "\"%s\" telepítése érdekében"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "ezzel való ütközés miatt: \"%s\""
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Érvénytelen elektronikus aláírás (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Érvénytelen kulcsazonosító (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Hiányzó elektronikus aláírás (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr "rendszer"
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr "A(z) %s újraindítása szükséges a(z) %s számára"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't write file"
msgstr "A fájl nem írható"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't open file"
msgstr "Nem sikerült megnyitni a fájlt"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, c-format
msgid "Can't move file %s to %s"
msgstr "%s nem mozgatható ide: %s"
@@ -1908,7 +1838,8 @@ msgstr "%s nem mozgatható ide: %s"
msgid ""
"urpme version %s\n"
"Copyright (C) 1999-2008 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 ""
@@ -1921,7 +1852,8 @@ msgstr ""
#: ../urpme:47
#, c-format
msgid " --auto - automatically select a package in choices.\n"
-msgstr " --auto - választási lehetőségnél automatikusan választ csomagot\n"
+msgstr ""
+" --auto - választási lehetőségnél automatikusan választ csomagot\n"
#: ../urpme:48
#, c-format
@@ -1931,17 +1863,15 @@ msgstr " --auto-orphans - árvák eltávolítása\n"
#: ../urpme:49
#, c-format
msgid " --test - verify if the removal can be achieved correctly.\n"
-msgstr " --test - annak ellenőrzése, hogy az eltávolítás végrehajtható-e\n"
+msgstr ""
+" --test - annak ellenőrzése, hogy az eltávolítás végrehajtható-e\n"
-#: ../urpme:51
-#: ../urpmi:109
-#: ../urpmq:68
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - elosztott urpmi több számítógép közt\n"
-#: ../urpme:52
-#: ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - a fájlok újracsomagolása törlés előtt\n"
@@ -1949,13 +1879,15 @@ msgstr " --repackage - a fájlok újracsomagolása törlés előtt\n"
#: ../urpme:53
#, c-format
msgid " --root - use another root for rpm removal.\n"
-msgstr " --root - másik gyökér használata az RPM-csomageltávolításhoz\n"
+msgstr ""
+" --root - másik gyökér használata az RPM-csomageltávolításhoz\n"
-#: ../urpme:55
-#: ../urpmi:101
+#: ../urpme:55 ../urpmi:101
#, c-format
msgid " --justdb - update only the rpm db, not the filesystem.\n"
-msgstr " --justdb - csak az RPM-adatbázis legyen frissítve, a fájlrendszer ne\n"
+msgstr ""
+" --justdb - csak az RPM-adatbázis legyen frissítve, a fájlrendszer "
+"ne\n"
#: ../urpme:56
#, c-format
@@ -1972,9 +1904,7 @@ msgstr ""
" fából - például chroot telepítéséhez/eltávolításához\n"
" használható a --root opció esetén\n"
-#: ../urpme:59
-#: ../urpmi:152
-#: ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - részletes információ\n"
@@ -2019,7 +1949,8 @@ msgstr "Nincs árva csomag."
#: ../urpme:149
#, 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] "A függőségek feloldásához a következő csomag el lesz távolítva"
msgstr[1] "A függőségek feloldásához a következő %d csomag el lesz távolítva"
@@ -2037,10 +1968,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "%d csomag eltávolítása?"
msgstr[1] "%d csomag eltávolítása?"
-#: ../urpme:161
-#: ../urpmi:569
-#: ../urpmi:664
-#: ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (i/N) "
@@ -2068,7 +1996,8 @@ msgstr "befejezetlen kifejezés (%s)"
#: ../urpmi:81
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
-msgstr " --auto-update - adatforrások frissítése, majd a rendszer frissítése\n"
+msgstr ""
+" --auto-update - adatforrások frissítése, majd a rendszer frissítése\n"
#: ../urpmi:82
#, c-format
@@ -2085,17 +2014,21 @@ msgstr " --force-key - a GPG-kulcs frissítésének kikényszerítése\n"
msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - kérdés nélkül eltávolítja az árva csomagokat\n"
-#: ../urpmi:85
-#: ../urpmq:54
+#: ../urpmi:85 ../urpmq:54
#, c-format
msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
-msgstr " --suggests - ne legyenek automatikusan kijelölve a \"javasolt\" csomagok.\n"
+msgstr ""
+" --suggests - ne legyenek automatikusan kijelölve a \"javasolt\" "
+"csomagok.\n"
#: ../urpmi:86
#, 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 - a program soha ne ajánlja fel csomag eltávolítását, inkább\n"
+" --no-uninstall - a program soha ne ajánlja fel csomag eltávolítását, "
+"inkább\n"
" szakadjon félbe a telepítés\n"
#: ../urpmi:87
@@ -2103,8 +2036,7 @@ msgstr ""
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - csomagok telepítésének mellőzése (csak letöltés)\n"
-#: ../urpmi:88
-#: ../urpmq:56
+#: ../urpmi:88 ../urpmq:56
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -2120,14 +2052,17 @@ msgid ""
" are going to be installed or upgraded,\n"
" default is %d.\n"
msgstr ""
-" --split-level - a műveletek több részre bontása a megadottnál több csomag\n"
+" --split-level - a műveletek több részre bontása a megadottnál több "
+"csomag\n"
" telepítése vagy frissítése esetén,\n"
" az alapértelmezés szerinti érték: %d\n"
#: ../urpmi:94
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
-msgstr " --split-length - csökkentett művelethossz használata, az alapértelmezés: %d\n"
+msgstr ""
+" --split-length - csökkentett művelethossz használata, az alapértelmezés: %"
+"d\n"
#: ../urpmi:96
#, c-format
@@ -2142,12 +2077,14 @@ msgstr " --buildrequires - csomagkövetelmények telepítése\n"
#: ../urpmi:98
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
-msgstr " --install-src - csak a forráscsomag telepítése (a programok mellőzése)\n"
+msgstr ""
+" --install-src - csak a forráscsomag telepítése (a programok mellőzése)\n"
#: ../urpmi:99
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
-msgstr " --clean - RPM-fájl eltávolítása a gyorstárból a műveletek előtt\n"
+msgstr ""
+" --clean - RPM-fájl eltávolítása a gyorstárból a műveletek előtt\n"
#: ../urpmi:100
#, c-format
@@ -2156,8 +2093,10 @@ msgstr " --noclean - az RPM-fájlok ne törlődjenek a gyorstárból\n"
#: ../urpmi:102
#, c-format
-msgid " --replacepkgs - force installing packages which are already installed.\n"
-msgstr " --replacepkgs - a már telepített csomagok telepítésének kikényszerítése\n"
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+" --replacepkgs - a már telepített csomagok telepítésének kikényszerítése\n"
#: ../urpmi:104
#, c-format
@@ -2166,7 +2105,8 @@ msgid ""
" dependencies checking.\n"
msgstr ""
" --allow-nodeps - lehetővé teszi a csomagok függőségellenőrzés nélküli\n"
-" telepítését (a felhasználótól érkező megerősítést követően)\n"
+" telepítését (a felhasználótól érkező megerősítést "
+"követően)\n"
#: ../urpmi:106
#, c-format
@@ -2174,8 +2114,10 @@ msgid ""
" --allow-force - allow asking user to install packages without\n"
" dependencies checking and integrity.\n"
msgstr ""
-" --allow-force - lehetővé teszi a csomagok függőség- és helyességellenőrzés\n"
-" nélküli telepítését (a felhasználótól érkező megerősítést\n"
+" --allow-force - lehetővé teszi a csomagok függőség- és "
+"helyességellenőrzés\n"
+" nélküli telepítését (a felhasználótól érkező "
+"megerősítést\n"
" követően)\n"
#: ../urpmi:108
@@ -2190,15 +2132,15 @@ msgid ""
" to install a chroot with --root option.\n"
msgstr ""
" --use-distrib - az urpmi menet közben való beállítása egy disztribúciós\n"
-" fából - például chroot telepítéséhez használható a --root\n"
+" fából - például chroot telepítéséhez használható a --"
+"root\n"
" opció esetén\n"
-#: ../urpmi:114
-#: ../urpmi.addmedia:59
-#: ../urpmi.update:37
+#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:37
#, c-format
msgid " --metalink - generate and use a local metalink.\n"
-msgstr " --metalink - Egy helyi metalink-et legenerál, és azt használja.\n"
+msgstr ""
+" --metalink - Egy helyi metalink-et legenerál, és azt használja.\n"
#: ../urpmi:115
#, c-format
@@ -2234,9 +2176,7 @@ msgstr " --prozilla-options - további opciók a Prozilla program számára\n"
msgid " --aria2-options - additional options to pass to aria2\n"
msgstr " --aria2-options - további opciók az aria2 program számára\n"
-#: ../urpmi:123
-#: ../urpmi.addmedia:60
-#: ../urpmi.update:38
+#: ../urpmi:123 ../urpmi.addmedia:60 ../urpmi.update:38
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - a letöltési sebesség korlátozása\n"
@@ -2248,24 +2188,20 @@ msgid ""
" (--no-resume disables it, default is disabled).\n"
msgstr ""
" --resume - részlegesen letöltött fájlok átvitelének folytatása\n"
-" (a --no-resume kikapcsolja; alapértelmezésben kikapcsolt)\n"
+" (a --no-resume kikapcsolja; alapértelmezésben "
+"kikapcsolt)\n"
-#: ../urpmi:126
-#: ../urpmi.addmedia:61
-#: ../urpmi.update:39
-#: ../urpmq:76
+#: ../urpmi:126 ../urpmi.addmedia:61 ../urpmi.update:39 ../urpmq:76
#, 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 - a megadott HTTP proxy használata; a portszám alapértelmezés\n"
+" --proxy - a megadott HTTP proxy használata; a portszám "
+"alapértelmezés\n"
" szerint 1080 (formátum: <proxygép[:port]>)\n"
-#: ../urpmi:128
-#: ../urpmi.addmedia:63
-#: ../urpmi.update:41
-#: ../urpmq:78
+#: ../urpmi:128 ../urpmi.addmedia:63 ../urpmi.update:41 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -2286,7 +2222,8 @@ msgstr ""
#: ../urpmi:136
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
-msgstr " --excludepath - bizonyos útvonalak (elválasztás: vessző) kihagyása\n"
+msgstr ""
+" --excludepath - bizonyos útvonalak (elválasztás: vessző) kihagyása\n"
#: ../urpmi:137
#, c-format
@@ -2296,13 +2233,15 @@ msgstr " --excludedocs - dokumentációs fájlok kihagyása\n"
#: ../urpmi:138
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
-msgstr " --ignoresize - telepítés előtt ne legyen ellenőrizve az üres lemezhely\n"
+msgstr ""
+" --ignoresize - telepítés előtt ne legyen ellenőrizve az üres lemezhely\n"
#: ../urpmi:139
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr ""
-" --ignorearch - az RPM-csomagok telepítésének engedélyezése nem megfelelő\n"
+" --ignorearch - az RPM-csomagok telepítésének engedélyezése nem "
+"megfelelő\n"
" architektúra esetén is\n"
#: ../urpmi:140
@@ -2310,106 +2249,117 @@ msgstr ""
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - a csomagok szkriptjei ne legyenek végrehajtva\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - ütközések megjelenítése\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - a nem telepítendő csomagok\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --prefer - előnyben részesítendő csomagok\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-" --more-choices - ha nagyobb mennyiségű csomagot talált a rendszer, akkor az\n"
+" --more-choices - ha nagyobb mennyiségű csomagot talált a rendszer, akkor "
+"az\n"
" alapértelmezettnél több lehetőséget kínáljon fel\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - ne legyen zárolva az RPM-adatbázis\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - csak az azonos architektúrájú csomagok frissítése\n"
-#: ../urpmi:148
-#: ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - kijelölés a parancssorban megadott minta szerint\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - néma üzemmód\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --debug - nagyon részletes információ.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
-msgstr " a parancssorban megadott csomagok illetve RPM-fájlok lesznek telepítve\n"
+msgstr ""
+" a parancssorban megadott csomagok illetve RPM-fájlok lesznek telepítve\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr "Hiba: --auto-select csomaglistával együtt nem használható.\n"
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-"Hiba: hibajelentés készítéséhez adja meg a szokásos parancssori argumentumokat\n"
+"Hiba: hibajelentés készítéséhez adja meg a szokásos parancssori "
+"argumentumokat\n"
"a --bug opcióval együtt.\n"
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "Nem telepíthet bináris RPM-fájlokat, ha --install-src van megadva"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr "Nem telepíthet spec-fájlokat"
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr "alapértelmezésben --buildrequires"
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
-msgstr "használja a --buildrequires vagy --install-src opciót, alapértelmezés: --buildrequires"
-
-#: ../urpmi:252
-#, c-format
-msgid "Directory [%s] already exists, please use another directory for bug report or delete it"
-msgstr "\"%s\" nevű könyvtár már létezik. Használjon más könyvtárt a hibajelentéshez, vagy pedig törölje."
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgstr ""
+"használja a --buildrequires vagy --install-src opciót, alapértelmezés: --"
+"buildrequires"
#: ../urpmi:253
#, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "A következő könyvtárnak a hibajelentés céljából való létrehozása sikertelen: \"%s\""
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"\"%s\" nevű könyvtár már létezik. Használjon más könyvtárt a "
+"hibajelentéshez, vagy pedig törölje."
-#: ../urpmi:264
+#: ../urpmi:254
#, c-format
-msgid "Environment directory %s does not exist"
-msgstr "\"%s\" környezeti könyvtár nem létezik"
+msgid "Unable to create directory [%s] for bug report"
+msgstr ""
+"A következő könyvtárnak a hibajelentés céljából való létrehozása sikertelen: "
+"\"%s\""
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2418,46 +2368,49 @@ msgstr ""
"Hiba: úgy tűnik, hogy \"%s\" csak olvasható módon lett csatolva.\n"
"Ha mégis végre kívánja hajtani a műveletet, használja a --allow-force opciót."
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr "Adatforrás frissítése...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (frissítés)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (frissítés)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (telepítés)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (telepítés)"
-#: ../urpmi:462
+#: ../urpmi:450
#, c-format
-msgid "In order to satisfy the '%s' dependency, one of the following packages is needed:"
-msgstr "A(z) \"%s\" függőség feloldásához szükség van a következő csomagok egyikére:"
+msgid ""
+"In order to satisfy the '%s' dependency, one of the following packages is "
+"needed:"
+msgstr ""
+"A(z) \"%s\" függőség feloldásához szükség van a következő csomagok egyikére:"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Melyiket választja? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2468,7 +2421,7 @@ msgstr ""
"amelyek régebbiek a telepítetteknél:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2479,8 +2432,7 @@ msgstr ""
"amelyek régebbiek a telepítetteknél:\n"
"%s"
-#: ../urpmi:515
-#: ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2489,15 +2441,12 @@ msgstr ""
"\n"
"Kívánja folytatni a telepítést?"
-#: ../urpmi:516
-#: ../urpmi:531
-#: ../urpmi:628
-#: ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (I/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2506,7 +2455,7 @@ msgstr ""
"A következő kért csomagot nem lehet telepíteni:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2515,12 +2464,12 @@ msgstr ""
"A kért csomagok közül néhányat nem lehet telepíteni:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "a(z) \"%s\" csomag eltávolítása tönkreteheti a rendszert"
-#: ../urpmi:551
+#: ../urpmi:538
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2531,7 +2480,7 @@ msgstr ""
"távolítani, hogy a szükséges csomagok frissíthetők legyenek:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2542,78 +2491,62 @@ msgstr ""
"távolítani, hogy a szükséges csomagok frissíthetők legyenek:\n"
"%s\n"
-#: ../urpmi:560
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"A következő csomagot el kell távolítani, hogy a szükséges csomagok frissíthetők legyenek:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"A következő csomagokat el kell távolítani, hogy a szükséges csomagok frissíthetők legyenek:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(csak teszt; az eltávolítás nem lesz ténylegesen végrehajtva)"
-#: ../urpmi:583
+#: ../urpmi:568
#, 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 ""
-"Használja az urpmi-hoz a --buildrequires opciót az alábbi függőségek telepítéséhez:\n"
+"Használja az urpmi-hoz a --buildrequires opciót az alábbi függőségek "
+"telepítéséhez:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "Az következő árva csomag el lesz távolítva."
msgstr[1] "Az következő árva csomagok el lesznek távolítva."
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(csak teszt; a telepítés nem lesz ténylegesen végrehajtva)"
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr "További %s lemezhely lesz használva."
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr "%s lemezhely fel lesz szabadítva."
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr "%s csomag lesz beszerezve."
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Kívánja folytatni a csomag telepítését?"
msgstr[1] "Kívánja folytatni a(z) %d csomag telepítését?"
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Mégsem"
-#: ../urpmi:648
+#: ../urpmi:633
#, c-format
msgid "Press Enter when mounted..."
msgstr "Amikor csatolta, nyomja le az Enter billentyűt..."
@@ -2651,7 +2584,8 @@ msgstr ""
" cdrom://<elérési út>\n"
"\n"
"használat: urpmi.addmedia [opciók] --distrib --mirrorlist <url>\n"
-"használat: urpmi.addmedia [opciók] --mirrorlist <url> <név> <relatív elérési út>\n"
+"használat: urpmi.addmedia [opciók] --mirrorlist <url> <név> <relatív elérési "
+"út>\n"
"\n"
"például:\n"
"\n"
@@ -2661,29 +2595,22 @@ msgstr ""
"\n"
"az [opciók] pedig a következők lehetnek:\n"
-#: ../urpmi.addmedia:55
-#: ../urpmi.update:33
-#: ../urpmq:73
+#: ../urpmi.addmedia:55 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - a Wget használata távoli fájlok letöltésére\n"
-#: ../urpmi.addmedia:56
-#: ../urpmi.update:34
-#: ../urpmq:74
+#: ../urpmi.addmedia:56 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - a Curl használata távoli fájlok letöltésére\n"
-#: ../urpmi.addmedia:57
-#: ../urpmi.update:35
-#: ../urpmq:75
+#: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --prozilla - a Prozilla használata távoli fájlok letöltésére\n"
-#: ../urpmi.addmedia:58
-#: ../urpmi.update:36
+#: ../urpmi.addmedia:58 ../urpmi.update:36
#, c-format
msgid " --aria2 - use aria2 to retrieve distant files.\n"
msgstr " --aria2 - az Aria2 használata távoli fájlok letöltésére\n"
@@ -2702,10 +2629,12 @@ 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 - egyedi irányelv a listafájlok letöltéséhez:\n"
-" never, on-demand, update-only, always. Lásd: urpmi.cfg(5)\n"
+" never, on-demand, update-only, always. Lásd: urpmi.cfg"
+"(5)\n"
#: ../urpmi.addmedia:69
#, c-format
@@ -2727,17 +2656,22 @@ msgstr " --no-probe - fejléclista keresésének mellőzése\n"
msgid ""
" --distrib - automatically create all media from an installation\n"
" medium.\n"
-msgstr " --distrib - az összes adatforrás létrehozása telepítési adatforrásból\n"
+msgstr ""
+" --distrib - az összes adatforrás létrehozása telepítési "
+"adatforrásból\n"
#: ../urpmi.addmedia:75
#, c-format
msgid " --interactive - with --distrib, ask confirmation for each media\n"
-msgstr " --interactive - --distrib esetén: megerősítés kérése minden adatforráshoz\n"
+msgstr ""
+" --interactive - --distrib esetén: megerősítés kérése minden "
+"adatforráshoz\n"
#: ../urpmi.addmedia:76
#, c-format
msgid " --all-media - with --distrib, add every listed media\n"
-msgstr " --all-media - --distrib esetén: minden listázott adatforrás felvétele\n"
+msgstr ""
+" --all-media - --distrib esetén: minden listázott adatforrás felvétele\n"
#: ../urpmi.addmedia:77
#, c-format
@@ -2752,10 +2686,10 @@ msgstr ""
#: ../urpmi.addmedia:79
#, c-format
msgid " --virtual - create virtual media wich are always up-to-date.\n"
-msgstr " --virtual - virtuális, mindig naprakész adatforrás létrehozása.\n"
+msgstr ""
+" --virtual - virtuális, mindig naprakész adatforrás létrehozása.\n"
-#: ../urpmi.addmedia:80
-#: ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - az MD5-ös összeg ellenőrzésének kikapcsolása\n"
@@ -2763,23 +2697,22 @@ msgstr " --no-md5sum - az MD5-ös összeg ellenőrzésének kikapcsolása\n"
#: ../urpmi.addmedia:81
#, c-format
msgid " --nopubkey - don't import pubkey of added media\n"
-msgstr " --nopubkey - a felvett adatforrás publikus kulcsa ne legyen importálva\n"
+msgstr ""
+" --nopubkey - a felvett adatforrás publikus kulcsa ne legyen "
+"importálva\n"
#: ../urpmi.addmedia:82
#, c-format
msgid " --raw - add the media in config, but don't update it.\n"
-msgstr " --raw - az adatforrás felvétele, de a frissítésének mellőzése\n"
+msgstr ""
+" --raw - az adatforrás felvétele, de a frissítésének mellőzése\n"
-#: ../urpmi.addmedia:83
-#: ../urpmi.removemedia:43
-#: ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - néma üzemmód\n"
-#: ../urpmi.addmedia:84
-#: ../urpmi.removemedia:44
-#: ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - részletes információ\n"
@@ -2797,7 +2730,8 @@ msgstr "Hiányzik az argumentum: --distrib --mirrorlist <url>"
#: ../urpmi.addmedia:120
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
-msgstr "helytelen <url> (helyi könyvtár esetén az útvonalnak abszolútnak kell lennie)"
+msgstr ""
+"helytelen <url> (helyi könyvtár esetén az útvonalnak abszolútnak kell lennie)"
#: ../urpmi.addmedia:124
#, c-format
@@ -2848,7 +2782,8 @@ msgstr "az adatforrás nem hozzáadható"
msgid ""
"urpmi.recover version %s\n"
"Copyright (C) 2006 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 ""
@@ -2872,7 +2807,8 @@ msgstr ""
#: ../urpmi.recover:37
#, c-format
-msgid " --list - list transactions since provided date/duration argument\n"
+msgid ""
+" --list - list transactions since provided date/duration argument\n"
msgstr ""
" --list - tranzakciók listázása a megadott dátum/időtartam\n"
" argumentumtól kezdődően\n"
@@ -2880,7 +2816,8 @@ msgstr ""
#: ../urpmi.recover:38
#, c-format
msgid " --list-all - list all transactions in rpmdb (long)\n"
-msgstr " --list-all - az RPM-adatbázisban levő tranzakciók listázása (hosszú)\n"
+msgstr ""
+" --list-all - az RPM-adatbázisban levő tranzakciók listázása (hosszú)\n"
#: ../urpmi.recover:39
#, c-format
@@ -2965,8 +2902,7 @@ msgstr "Nem található ez utáni tranzakció: %s\n"
msgid "You must be superuser to do this"
msgstr "Ehhez rendszergazdai jogosultság szükséges"
-#: ../urpmi.recover:143
-#: ../urpmi.recover:209
+#: ../urpmi.recover:143 ../urpmi.recover:209
#, c-format
msgid "Writing rpm macros file [%s]...\n"
msgstr "RPM-makrófájl írása [%s]...\n"
@@ -3013,7 +2949,9 @@ msgstr "Adatforrás eltávolításához rendszergazdai jogosultság szükséges"
#: ../urpmi.removemedia:72
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "nincs mit eltávolítani (használja az urpmi.addmedia parancsot adatforrás felvételéhez)\n"
+msgstr ""
+"nincs mit eltávolítani (használja az urpmi.addmedia parancsot adatforrás "
+"felvételéhez)\n"
#: ../urpmi.removemedia:78
#, c-format
@@ -3046,12 +2984,16 @@ msgstr " --force-key - a GPG-kulcs frissítésének kikényszerítése\n"
#: ../urpmi.update:46
#, c-format
msgid " --ignore - don't update, mark the media as ignored.\n"
-msgstr " --ignore - ne legyen frissítés; az adatforrások kihagyottnak jelölése\n"
+msgstr ""
+" --ignore - ne legyen frissítés; az adatforrások kihagyottnak "
+"jelölése\n"
#: ../urpmi.update:47
#, c-format
msgid " --no-ignore - don't update, mark the media as enabled.\n"
-msgstr " --no-ignore - ne legyen frissítés; az adatforrások bekapcsoltnak jelölése\n"
+msgstr ""
+" --no-ignore - ne legyen frissítés; az adatforrások bekapcsoltnak "
+"jelölése\n"
#: ../urpmi.update:49
#, c-format
@@ -3073,7 +3015,8 @@ msgstr " -f - fejléclista frissítésének kikényszerítése\n"
#: ../urpmi.update:52
#, c-format
msgid " -ff - really force updating synthesis\n"
-msgstr " -ff - fejléclista frissítésének kikényszerítése (mindenképpen)\n"
+msgstr ""
+" -ff - fejléclista frissítésének kikényszerítése (mindenképpen)\n"
#: ../urpmi.update:69
#, c-format
@@ -3083,7 +3026,9 @@ msgstr "Adatforrás frissítéséhez rendszergazdai jogosultság szükséges"
#: ../urpmi.update:78
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "nincs mit frissíteni (használja az urpmi.addmedia parancsot adatforrás felvételéhez)\n"
+msgstr ""
+"nincs mit frissíteni (használja az urpmi.addmedia parancsot adatforrás "
+"felvételéhez)\n"
#: ../urpmi.update:87
#, c-format
@@ -3114,7 +3059,8 @@ msgstr "\"%s\" adatforrás bekapcsolása"
msgid ""
"urpmq version %s\n"
"Copyright (C) 2000-2006 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 ""
@@ -3126,7 +3072,9 @@ msgstr ""
#: ../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 - csak a megadott adatforrások használata a kért (vagy\n"
" frissített) csomagok kereséséhez\n"
@@ -3159,7 +3107,8 @@ msgstr " --list-url - elérhető adatforrások és URL-jeik listázása\n"
#: ../urpmq:61
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
-msgstr " --list-nodes - az elérhető gépek listázása --parallel használata esetén\n"
+msgstr ""
+" --list-nodes - az elérhető gépek listázása --parallel használata esetén\n"
#: ../urpmq:62
#, c-format
@@ -3168,17 +3117,22 @@ msgstr " --list-aliases - az elérhető párhuzamos aliasok listázása\n"
#: ../urpmq:63
#, c-format
-msgid " --dump-config - dump the config in form of urpmi.addmedia argument.\n"
-msgstr " --dump-config - beállítások kiírása urpmi.addmedia-argumentumok formájában\n"
+msgid ""
+" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+" --dump-config - beállítások kiírása urpmi.addmedia-argumentumok "
+"formájában\n"
#: ../urpmq:64
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
-msgstr " --src - a következő csomag egy forráscsomag (-s opcióval azonos)\n"
+msgstr ""
+" --src - a következő csomag egy forráscsomag (-s opcióval azonos)\n"
#: ../urpmq:65
#, c-format
-msgid " --sources - give all source packages before downloading (root only).\n"
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
msgstr ""
" --sources - a csomagok elérési útjának listázása letöltés előtt\n"
" (rendszergazdai jogosultság szükséges)\n"
@@ -3187,7 +3141,8 @@ msgstr ""
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr ""
-" --ignorearch - a nem megfelelő architektúrájú RPM-csomagok lekérdezésének\n"
+" --ignorearch - a nem megfelelő architektúrájú RPM-csomagok "
+"lekérdezésének\n"
" engedélyezése\n"
#: ../urpmq:71
@@ -3260,7 +3215,8 @@ msgid ""
" - extended reverse search (includes virtual packages).\n"
msgstr ""
" --whatrequires-recursive\n"
-" - kiterjesztett fordított keresés (virtuális csomagokban is)\n"
+" - kiterjesztett fordított keresés (virtuális csomagokban "
+"is)\n"
#: ../urpmq:95
#, c-format
@@ -3274,7 +3230,8 @@ msgstr ""
#: ../urpmq:98
#, c-format
msgid " -c - complete output with package to be removed.\n"
-msgstr " -c - teljes információ, az eltávolítandó csomaggal együtt\n"
+msgstr ""
+" -c - teljes információ, az eltávolítandó csomaggal együtt\n"
#: ../urpmq:100
#, c-format
@@ -3284,7 +3241,8 @@ msgstr " -g - a névvel együtt a csoportok is jelenjenek meg\n"
#: ../urpmq:101
#, c-format
msgid " -i - print useful information in human readable form.\n"
-msgstr " -i - hasznos információk kiírása könnyen olvasható formában\n"
+msgstr ""
+" -i - hasznos információk kiírása könnyen olvasható formában\n"
#: ../urpmq:102
#, c-format
@@ -3299,32 +3257,41 @@ msgstr " -m - egyenértékű a -du opcióval\n"
#: ../urpmq:104
#, c-format
msgid " -r - print version and release with name also.\n"
-msgstr " -r - a névvel együtt a verzió és a kiadásszám is jelenjen meg\n"
+msgstr ""
+" -r - a névvel együtt a verzió és a kiadásszám is jelenjen meg\n"
#: ../urpmq:105
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
-msgstr " -s - a következő csomag egy forráscsomag (--src opcióval azonos)\n"
+msgstr ""
+" -s - a következő csomag egy forráscsomag (--src opcióval "
+"azonos)\n"
#: ../urpmq:106
#, c-format
-msgid " -u - remove package if a more recent version is already installed.\n"
-msgstr " -u - csomag kihagyása, ha már van újabb verzió telepítve\n"
+msgid ""
+" -u - remove package if a more recent version is already "
+"installed.\n"
+msgstr ""
+" -u - csomag kihagyása, ha már van újabb verzió telepítve\n"
#: ../urpmq:107
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
-msgstr " -y - fuzzy keresés használata (--fuzzy opcióval azonos)\n"
+msgstr ""
+" -y - fuzzy keresés használata (--fuzzy opcióval azonos)\n"
#: ../urpmq:108
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
-msgstr " -Y - mint -y, de a kis- és nagybetűket nem különbözteti meg\n"
+msgstr ""
+" -Y - mint -y, de a kis- és nagybetűket nem különbözteti meg\n"
#: ../urpmq:109
#, c-format
msgid " names or rpm files given on command line are queried.\n"
-msgstr " a parancssorban megadott csomagok illetve RPM-fájlok lesznek lekérdezve\n"
+msgstr ""
+" a parancssorban megadott csomagok illetve RPM-fájlok lesznek lekérdezve\n"
#: ../urpmq:156
#, c-format
@@ -3344,44 +3311,72 @@ msgstr "használja a -l opciót a fájllistához"
#: ../urpmq:404
#, 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"
+msgstr ""
+"nincs listafájlja a(z) \"%s\" adatforrásnak, ezért csak részleges eredmény "
+"van a(z) \"%s\" csomaghoz"
#: ../urpmq:405
#, 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"
+msgstr ""
+"nincs listafájlja a(z) \"%s\" adatforrásnak, ezért csak részleges eredmény "
+"van a(z) \"%s\" csomagokhoz"
#: ../urpmq:408
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
-msgstr "nincs listafájlja a(z) \"%s\" adatforrásnak, ezért nincs eredmény a(z) \"%s\" csomaghoz"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
+msgstr ""
+"nincs listafájlja a(z) \"%s\" adatforrásnak, ezért nincs eredmény a(z) \"%s"
+"\" csomaghoz"
#: ../urpmq:409
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
-msgstr "nincs listafájlja a(z) \"%s\" adatforrásnak, ezért nincs eredmény a(z) \"%s\" csomagokhoz"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"nincs listafájlja a(z) \"%s\" adatforrásnak, ezért nincs eredmény a(z) \"%s"
+"\" csomagokhoz"
#: ../urpmq:473
#, c-format
msgid "No changelog found\n"
msgstr "Változási lista nem található\n"
+#~ msgid "examining %s file"
+#~ msgstr "a(z) \"%s\" fájl vizsgálata"
+
+#~ msgid "invalid MD5SUM file"
+#~ msgstr "érvénytelen MD5SUM fájl"
+
+#~ msgid "found probed synthesis as %s"
+#~ msgstr ""
+#~ "a csomagkezelő fejléclistát (illetve kiterjesztett függőséglistát) "
+#~ "talált: %s"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - frissítési adatforrás létrehozása\n"
+
#~ msgid "malformed URL: [%s]"
#~ msgstr "helytelen URL: [%s]"
+
#~ msgid "sorry, you can't use --install-src to install remote .src.rpm files"
#~ msgstr "távoli .src.rpm-fájlok nem telepíthetők a --install-src opcióval"
+
#~ msgid "Error"
#~ msgstr "Hiba"
+
#~ msgid "%d installation transaction failed"
#~ msgid_plural "%d installation transactions failed"
#~ msgstr[0] "%d telepítési művelet nem sikerült"
#~ msgstr[1] "%d telepítési művelet nem sikerült"
+
#~ msgid "Package %s can not be installed"
#~ msgstr "A(z) \"%s\" csomag nem telepíthető"
+
#~ msgid "Checking to remove the following packages"
#~ msgstr "Ellenőrzés a következő csomagok eltávolításához"
+
#~ msgid "%s database locked"
#~ msgstr "a(z) \"%s\" adatbázis zárolt"
@@ -3392,19 +3387,26 @@ msgstr "Változási lista nem található\n"
#~ msgstr ""
#~ " --auto - nem-interaktív mód, a kérdésekre az alapértelmezett\n"
#~ " válaszok lesznek feltételezve\n"
+
#~ msgid "Unknown option %s"
#~ msgstr "Ismeretlen opció: \"%s\""
+
#~ msgid "too many mount points for removable medium \"%s\""
#~ msgstr "túl sok csatolási pont ehhez a cserélhető adatforráshoz: \"%s\""
+
#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
#~ msgstr ""
#~ "A(z) \"%s\" adatforrás egy ISO-képmás - menet közben csatolásra kerül"
+
#~ msgid "using different removable device [%s] for \"%s\""
#~ msgstr "eltérő cserélhető eszköz (\"%s\") használata ehhez: \"%s\""
+
#~ msgid "unable to retrieve pathname for removable medium \"%s\""
#~ msgstr "a következő cserélhető adatforrás útvonala nem elérhető: \"%s\""
+
#~ msgid "unable to mount the distribution medium"
#~ msgstr "nem sikerült csatolni a disztribúciós adatforrást"
+
#~ msgid ""
#~ "unable to access medium \"%s\",\n"
#~ "this could happen if you mounted manually the directory when creating the "
@@ -3413,13 +3415,17 @@ msgstr "Változási lista nem található\n"
#~ "A(z) \"%s\" adatforrás nem elérhető.\n"
#~ "Lehetséges, hogy az adatforrás létrehozásakor kézzel lett csatolva a "
#~ "megfelelő könyvtár."
+
#~ msgid "inconsistent medium \"%s\" marked removable but not really"
#~ msgstr ""
#~ "a(z) \"%s\" hibás adatforrás cserélhetőnek van jelölve, pedig nem az"
+
#~ msgid " -c - clean headers cache directory.\n"
#~ msgstr " -c - a fejlécgyorstár könyvtárának kiürítése\n"
+
#~ msgid "virtual medium needs to be local"
#~ msgstr "minden virtuális adatforrásnak helyinek kell lennie"
+
#~ msgid "Error generating names file: Can't write to file (%s)"
#~ msgstr ""
#~ "Nem sikerült elkészíteni a névfájlt - nem sikerült írni a fájlba (%s)"
@@ -3427,95 +3433,124 @@ msgstr "Változási lista nem található\n"
#, fuzzy
#~ msgid "unable to parse synthesis file of \"%s\""
#~ msgstr "fejléclista nem elemezhető: \"%s\""
+
#~ msgid "found %d rpm headers in cache, removing %d obsolete headers"
#~ msgstr ""
#~ "a gyorstárban %d RPM-fejléc található, %d elavult fejléc eltávolítása"
+
#~ msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
#~ msgstr ""
#~ "a meglevő forrás-fejléclista (vagy kiterjesztett függőséglista) MD5-ös "
#~ "összegének kiszámítása - %s"
+
#~ msgid ""
#~ "virtual medium \"%s\" should not have defined hdlist or list file, medium "
#~ "ignored"
#~ msgstr ""
#~ "a virtuális \"%s\" adatforráshoz nem tartozhat definiált fejléclista vagy "
#~ "listafájl, ezért az adatforrás nem lesz feldolgozva"
+
#~ msgid "invalid hdlist name"
#~ msgstr "érvénytelen fejléclista-név"
+
#~ msgid "unable to find list file for \"%s\", medium ignored"
#~ msgstr ""
#~ "\"%s\" listafájlja nem található; az adatforrás nem kerül feldolgozásra"
+
#~ msgid "\"synthesis\" should not be set (medium \"%s\")"
#~ msgstr ""
#~ "a \"kiterjesztett függőséglista\" opció itt nem állítható be (adatforrás: "
#~ "\"%s\")"
+
#~ msgid "\"synthesis\" should be set (medium \"%s\")"
#~ msgstr ""
#~ "a \"kiterjesztett függőséglista\" opció itt beállítandó (adatforrás: \"%s"
#~ "\")"
+
#~ msgid "unable to access list file of \"%s\""
#~ msgstr "\"%s\" listafájlja nem elérhető"
+
#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
#~ msgstr ""
#~ "a(z) \"%s\" adatforrás egy használatban levő fejléclistát próbált "
#~ "használni; az adatforrás nem kerül feldolgozásra"
+
#~ msgid "medium \"%s\" trying to use an already used list, medium ignored"
#~ msgstr ""
#~ "a(z) \"%s\" adatforrás egy használatban levő listát próbált használni; az "
#~ "adatforrás nem kerül feldolgozásra"
+
#~ msgid "wrote %s"
#~ msgstr "\"%s\" elkészítve"
+
#~ msgid ""
#~ "Note: no hdlist for medium \"%s\", unable to return any result for it"
#~ msgstr ""
#~ "Megjegyzés: nincs fejléclista a(z) \"%s\" adatforráshoz, ezért azt nem "
#~ "lehet feldolgozni"
+
#~ msgid "performing second pass to compute dependencies\n"
#~ msgstr "függőségek meghatározása - második lépés\n"
+
#~ msgid "building hdlist [%s]"
#~ msgstr "fejléclista készítése: \"%s\""
+
#~ msgid ""
#~ "Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
#~ "corrupted."
#~ msgstr ""
#~ "A(z) \"%s\" adatforráshoz nem készíthető kiterjesztett függőséglista. "
#~ "Lehetséges, hogy a fejléclista sérült."
+
#~ msgid "problem reading hdlist or synthesis file of medium \"%s\""
#~ msgstr ""
#~ "hiba történt a(z) \"%s\" adatforrás fejléclistájának vagy kiterjesztett "
#~ "függőséglistájának olvasásakor"
+
#~ msgid "computing md5sum of copied source hdlist (or synthesis)"
#~ msgstr ""
#~ "a lemásolt forrás-fejléclista (vagy kiterjesztett függőséglista) MD5-ös "
#~ "ellenőrzőösszegének kiszámítása"
+
#~ msgid "...retrieving failed: md5sum mismatch"
#~ msgstr "...a behozatal sikertelen: hibás MD5-ös ellenőrzőösszeg"
+
#~ msgid "no rpm files found from [%s]"
#~ msgstr "csomagfájlok (RPM) nem találhatók: \"%s\""
+
#~ msgid "unable to read rpm files from [%s]: %s"
#~ msgstr "csomagfájlok (RPM) nem olvashatók innen: \"%s\" - %s"
+
#~ msgid "no rpms read"
#~ msgstr "csomagfájlok (RPM) nem lettek beolvasva"
+
#~ msgid "reading headers from medium \"%s\""
#~ msgstr "\"%s\" adatforrás fejléceinek olvasása"
+
#~ msgid " --probe-synthesis - use synthesis file.\n"
#~ msgstr " --probe-synthesis - kiterjesztett függőséglista felhasználása\n"
+
#~ msgid " --probe-hdlist - use hdlist file.\n"
#~ msgstr " --probe-hdlist - fejléclista felhasználása\n"
+
#~ msgid ""
#~ "Note: since no media searched uses hdlists, urpmf was unable to return "
#~ "any result\n"
#~ msgstr ""
#~ "Megjegyzés: a feldolgozott adatforrások egyike sem használ fejléclistát, "
#~ "ezért az urpmf nem tudott eredményt adni\n"
+
#~ msgid "You may want to use --name to search for package names.\n"
#~ msgstr "Csomagnevek keresésére használható a --name opció.\n"
+
#~ msgid " --src, -s - next package is a source package.\n"
#~ msgstr " --src, -s - a következő csomag egy forráscsomag\n"
+
#~ msgid " --probe-hdlist - use hdlist file.\n"
#~ msgstr " --probe-hdlist - fejléclista felhasználása\n"
+
#~ msgid "unable to update medium \"%s\"\n"
#~ msgstr "a(z) \"%s\" adatforrás frissítése nem sikerült\n"
+
#~ msgid "unable to create medium \"%s\"\n"
#~ msgstr "a(z) \"%s\" adatforrás létrehozása nem sikerült\n"
-
diff --git a/po/id.po b/po/id.po
index d4a7d2b0..3d89af4e 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+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"
@@ -34,7 +34,7 @@ msgstr "Instalasi RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Kesalahan: tidak dapat mencari file %s, membatalkan operasi"
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -99,7 +99,7 @@ msgstr "Install"
msgid "_Save"
msgstr "_Simpan"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Batal"
@@ -131,9 +131,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - cetak pesan bantuan ini.\n"
@@ -168,19 +167,19 @@ msgstr ""
" --verify-rpm - verifikasi tandatangan rpm sebelum installasi\n"
" (--no-verify-rpm menonaktifkannya, defaultnya aktif).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - hanya pakai hanya media yang diberikan, dipisahkan koma.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - izinkan pencarian pada provides untuk mencari paket.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - jangan cari pada provides untuk mencari paket.\n"
@@ -222,7 +221,22 @@ msgstr "Silahkan menunggu..."
msgid "Must be root"
msgstr "Harus sebagai root"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "sebarkan %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Instalasi paket..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Instalasi paket..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -238,37 +252,37 @@ msgstr ""
msgid "Warning"
msgstr "Peringatan"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr "(untuk upgrade)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr "(untuk menginstal)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Pilihan paket"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Salah satu paket berikut dibutuhkan:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Batal"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -279,61 +293,56 @@ msgstr ""
"%s\n"
"Lanjutkan installasi?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Untuk memenuhi ketergantungan, paket berikut akan diinstall:"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Untuk memenuhi ketergantungan, paket-paket berikut juga akan diinstal:"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d paket, %d MB)"
msgstr[1] "(%d paket, %d MB)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Instalasi paket..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "tidak dapat mengambil paket sumber, dibatalkan"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Persiapan..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Menginstall paket `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Harap masukkan media bernama \"%s\" ke perangkat [%s]"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Mendownload paket `%s'..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Selesai"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -344,28 +353,28 @@ msgstr ""
"%s\n"
"Anda mungkin perlu meng-update database urpmi Anda"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "Instalasi gagal:"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Semua paket telah terinstal"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Instalasi selesai"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "menghapus %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "jalankan ulang urpmi"
@@ -404,7 +413,7 @@ msgstr " default pada %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - tampilkan nama lengkap RPM (NVRA)\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Hanya superuser yang boleh meng-instal paket"
@@ -414,134 +423,143 @@ msgstr "Hanya superuser yang boleh meng-instal paket"
msgid "Running urpmi in restricted mode..."
msgstr "Menjalankan urpmi dalam mode terbatas..."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "Tidak bisa menulis pada direktori repackage [%s]\n"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, fuzzy, c-format
msgid "invalid owner for directory %s"
msgstr "Tanggal atau durasi [%s] yang tidak valid\n"
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "Tidak bisa menulis pada direktori repackage [%s]\n"
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr "Direktori lingkungan %s tidak ada"
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "mengunakan lingkungan spesifik pada %s\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "gagal membuka rpmdb"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nama file rpm [%s] tak valid"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "mengambil file rpm [%s] ..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...pengambilan selesai"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...pengambilan gagal: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "gagal mengakses file rpm [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "gagal mem-parse file spec %s [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "gagal meregistrasi file rpm"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Arsitektur tidak kompatibel untuk rpm [%s]"
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "kesalahan meregistrasi paket lokal"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Operasi ini dilarang ketika berjalan dalam mode terbatas"
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "deklarasi proxy buruk pada pada perintah baris\n"
-#: ../urpm/args.pm:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, fuzzy, c-format
msgid "unexpected expression %s"
msgstr "Pola ekspresi:\n"
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Tanda tangan hilang (%s)"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, fuzzy, c-format
msgid "no expression to close"
msgstr "Pola ekspresi:\n"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "Direktori chroot tidak ada"
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr "Tidak bisa menggunakan %s tanpa %s"
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr "Tidak bisa menggunakan %s dengan %s"
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr "Terlalu banyak argumen\n"
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Penyalinan gagal"
@@ -588,122 +606,122 @@ msgstr "media `%s' didefinisikan dua kali, membatalkan diri"
msgid "unable to write config file [%s]"
msgstr "gagal menulis ke file konfigurasi [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "%s tidak tersedia, kembali ke %s"
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Harap masukkan hak akses Anda untuk mengakses proxy\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Nama pengguna:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Kata sandi:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr "Webfetch tidak diketahui `%s' !!!\n"
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr "%s gagal: keluar dengan sinyal %d"
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr "%s gagal: keluar dengan %d"
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, c-format
msgid "copy failed"
msgstr "penyalinan gagal"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, c-format
msgid "wget is missing\n"
msgstr "wget tidak ada\n"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, c-format
msgid "curl is missing\n"
msgstr "curl tidak ada\n"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr "curl gagal: download dibatalkan\n"
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr "rsync tidak ada\n"
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr "ssh tidak ada\n"
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr "prozilla tidak ada\n"
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr "Tidak bisa mengeksekusi prozilla\n"
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "prozilla tidak ada\n"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr " %s%% dari %s selesai, ETA = %s, kecepatan = %s"
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr " %s%% selesai, kecepatan = %s"
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, c-format
msgid "retrieving %s"
msgstr "menerima %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, c-format
msgid "retrieved %s"
msgstr "menerima %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "protokol tidak dikenal didefinisikan untuk %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "%s tidak tersedia, kembali ke %s"
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "webfetch tidak ditemukan, webfetch yang didukung adalah: %s\n"
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "gagal menangani protokol: %s"
@@ -723,59 +741,59 @@ msgstr "paket %s tak ditemukan."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "mengambil file rpm dari media \"%s\"..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr "[pemaketan ulang]"
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
"membuat transaksi untuk instalasi di %s (hapus=%d, instal=%d, upgrade=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "gagal membuat transaksi"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "tidak bisa mengurai rpm dari paket delta-rpm %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "gagal menginstal paket %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "menghapus rpm yang terinstall (%s) dari %s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "...pengambilan gagal: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "menghapus paket %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "menghapus paket %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "menghapus rpm yang terinstall (%s) dari %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Informasi tambahan pada paket %s"
@@ -820,91 +838,81 @@ msgstr "Peringatan"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Instalasi gagal"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Installasi gagal pada node %s"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, c-format
msgid "The following package has bad signature"
msgstr "Paket berikut memiliki tandatangan yang cacat"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Paket berikut memiliki tandatangan yang cacat"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Apakah Anda hendak melanjutkan instalasi ?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "menghapus rpm yang terinstall (%s) dari %s"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "sebarkan %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "menginstall %s dari %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "menginstall %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Mencoba installasi tanpa menguji ketergantungan? (y/T) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Mencoba installasi lebih keras (--force)? (y/T) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr "Paket-paket sudah update"
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Installasi dimungkinkan"
#: ../urpm/md5sum.pm:26
#, c-format
-msgid "examining %s file"
-msgstr "memeriksa file %s"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
-#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "peringatn: md5sum untuk %s tidak tersedia pada file MD5SUM"
@@ -977,231 +985,231 @@ msgstr "paket %s akan diinstal, bukan diupgrade"
msgid "medium \"%s\" already exists"
msgstr "media \"%s\" telah ada"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr "(diabaikan secara default)"
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "menambahkan media \"%s\" sebelum media remote \"%s\""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, c-format
msgid "adding medium \"%s\""
msgstr "menambahkan media \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, fuzzy, c-format
msgid "directory %s does not exist"
msgstr "Direktori lingkungan %s tidak ada"
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "lokasi ini tampaknya tidak mengandung sembarang distribusi"
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, c-format
msgid "unable to parse media.cfg"
msgstr "tidak dapat mengolah media.cfg"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"tidak dapat mengakses media distribusi (tidak ada file media.cfg yang "
"ditemukan)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, c-format
msgid "retrieving media.cfg file..."
msgstr "menerima file media.cfg..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "mencoba memilih media tak eksis \"%s\""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "memilih banyak media: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "menghapus media \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "konfigurasi ulang urpmi untuk media \"%s\""
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...konfigurasi ulang gagal"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "konfigurasi ulang selesai"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
"Kesalahan dalam menghasilkan nama file : ketergantungan %d tidak ditemukan"
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "media \"%s\" sudah terbaru"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "memeriksa file sintesa [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "masalah membaca file sintesa hdlist untuk media \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "menyalin [%s] untuk media \"%s\"..."
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...penyalinan gagal"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "file deskripsi \"%s\" sedang disalin"
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...penyalinan selesai"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "penyalinan [%s] gagal (file dicurigai terlalu kecil)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "menghitung md5sum hdlist source (atau sintesa) yang diambil"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "penyalinan [%s] gagal (md5sum tidak cocok)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "memeriksa file hdlist [%s]"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "membersihkan %s dan %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "file hdlist %s untuk media \"%s\" tidak valid"
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "file deskripsi \"%s\" sedang disalin"
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "nama file rpm [%s] tak valid"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "mengambil hdlist source (atau sintesa) \"%s\"..."
-
-#: ../urpm/media.pm:1478
-#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "menemukan hdlist (atau sintesa) sebagai %s"
+msgid "no metadata found for medium \"%s\""
+msgstr "file hdlist utk media \"%s\" tak ditemukan"
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "file hdlist utk media \"%s\" tak ditemukan"
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "mengambil hdlist source (atau sintesa) \"%s\"..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "memeriksa file pubkey dari \"%s\"..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...kunci %s terimport dari file pubkey \"%s\""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "gagal mengimpor file pubkey dari \"%s\""
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "file hdlist utk media \"%s\" tak ditemukan"
+
+#: ../urpm/media.pm:1612
#, c-format
msgid "updated medium \"%s\""
msgstr "media \"%s\" sudah diupdate"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "membaca file rpm dari [%s]"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "TtNn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1272,7 +1280,7 @@ msgstr ""
msgid "TB"
msgstr ""
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1642,11 +1650,6 @@ msgstr ""
"Format tidak benar: Anda hanya boleh menggunakan satu tag yang bernilai "
"banyak"
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "mengunakan lingkungan spesifik pada %s\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1662,118 +1665,136 @@ msgstr "membangun file sintesa hdlist untuk media \"%s\""
msgid "no xml-info available for medium \"%s\""
msgstr "menulis ke file list untuk media \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Tidak ada paket bernama %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Paket berikut berisi %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Paket-paket %s tidak bisa diinstall"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, c-format
msgid "Package %s is already installed"
msgstr "Paket %s telah terinstall"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, c-format
msgid "Packages %s are already installed"
msgstr "Paket-paket %s telah terinstal"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "karena %s hilang"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "Paket %s telah terinstall"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "karena %s tidak terpenuhi"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "mencoba mempromosikan %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "untuk menjaga %s"
#: ../urpm/select.pm:607
#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Paket berikut harus dihapus agar yang lain dapat di-upgrade:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Paket berikut harus dihapus agar yang lain dapat di-upgrade:\n"
+"%s"
+
+#: ../urpm/select.pm:635
+#, c-format
msgid "in order to install %s"
msgstr "untuk menginstall %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "karena konflik dengan %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Tanda tangan tidak valid (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Kunci ID tidak valid (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Tanda tangan hilang (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "gagal menulis ke file konfigurasi [%s]"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "Penyalinan gagal"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "Tidak bisa menggunakan %s dengan %s"
@@ -1816,7 +1837,7 @@ msgstr ""
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - urpmi tersebar di antara mesin-mesin alias.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Paket ulang file sebelum menghapus\n"
@@ -1846,7 +1867,7 @@ msgstr ""
"berguna\n"
" untuk meng(un)install chroot dengan opsi --root.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - mode verbose.\n"
@@ -1908,7 +1929,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "Hapus %d paket?"
msgstr[1] "Hapus %d paket?"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (y/T) "
@@ -2167,17 +2188,22 @@ msgstr ""
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - tidak menjalankan script paket\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - tag konflik tag\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - paket installasi yang harus dilewati\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, fuzzy, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --skip - paket installasi yang harus dilewati\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2186,44 +2212,44 @@ msgstr ""
" --more-choices - ketika beberapa paket ditemukan, tampilkan pilihan lain\n"
" dari nilai default.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - jangan kunci database rpm.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - hanya upgrade paket dengan arsitektur yang sama.\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - pilih semua yg cocok dengan perintah baris.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - mode diam.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --verbose - mode verbose.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " nama atau file rpm yang tertera pada perintah baris akan diinstal.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
"Kesalahan: Tidak bisa menggunakan --auto-select bersama dengan daftar "
"paket.\n"
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2233,29 +2259,29 @@ msgstr ""
"baris\n"
"bersamaan dengan --bug.\n"
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
"Anda tidak bisa menginstall file rpm biner ketika menggunakan --install-src"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2264,17 +2290,12 @@ msgstr ""
"Direktori [%s] sudah ada, silahkan gunakan direktori lain untuk laporan bug "
"atau hapus"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "gagal membuat direktori [%s] untuk laporan bug"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr "Direktori lingkungan %s tidak ada"
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2283,48 +2304,48 @@ msgstr ""
"Kesalahan: %s tampaknya di-mount sebagai read-only.\n"
"Gunakan --allow-force untuk memaksa operasi."
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr "Mengupdate media...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (untuk upgrade)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (untuk upgrade)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (untuk menginstal)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (untuk menginstal)"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "Untuk memenuhi ketergantungan, paket berikut akan dihapus"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Pilihan Anda? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2335,7 +2356,7 @@ msgstr ""
"yang lebih lama dari yang terinstall:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2346,7 +2367,7 @@ msgstr ""
"yang lebih lama dari yang terinstall:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2355,12 +2376,12 @@ msgstr ""
"\n"
"Lanjutkan installasi?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (Y/t) "
-#: ../urpmi:524
+#: ../urpmi:512
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2369,7 +2390,7 @@ msgstr ""
"Paket yang diminta tidak dapat diinstall:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2378,12 +2399,12 @@ msgstr ""
"Beberapa paket yang diminta tidak dapat diinstall:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "menghapus paket %s akan merusak sistem Anda"
-#: ../urpmi:551
+#: ../urpmi:538
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2394,7 +2415,7 @@ msgstr ""
"agar yang lain dapat di-upgrade:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2405,30 +2426,12 @@ msgstr ""
"agar yang lain dapat di-upgrade:\n"
"%s\n"
-#: ../urpmi:560
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Paket berikut harus dihapus agar yang lain dapat di-upgrade:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Paket berikut harus dihapus agar yang lain dapat di-upgrade:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(hanya pengujian, penghapusan tidak akan dilakukan)"
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2438,46 +2441,46 @@ msgstr ""
"Anda perlu jadi root untuk menginstall ketergantungan berikut:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "Untuk memenuhi ketergantungan, paket berikut akan dihapus"
msgstr[1] "Untuk memenuhi ketergantungan, paket-paket %d berikut akan dihapus"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(hanya pengujian, installasi tidak akan dilakukan)"
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
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:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Batal"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Tekan [Enter] jika siap.."
@@ -3236,6 +3239,13 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Changelog tidak ditemukan\n"
+#~ msgid "examining %s file"
+#~ msgstr "memeriksa file %s"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "menemukan hdlist (atau sintesa) sebagai %s"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - buat media update.\n"
diff --git a/po/is.po b/po/is.po
index e5670e66..d4b2a327 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2007-11-29 14:14+0000\n"
"Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
"Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -28,7 +28,7 @@ msgstr "RPM innsetning"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Villa: finn ekki skrá %s, mun stöðva aðgerð"
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "Í _lagi"
@@ -95,7 +95,7 @@ msgstr "Setja _upp"
msgid "_Save"
msgstr "Vi_sta"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "Hætta _við"
@@ -126,9 +126,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - prenta þetta.\n"
@@ -164,18 +163,18 @@ msgstr ""
" (--no-verify-rpm aftengir, sjálfgefið er að athuga "
"pakka).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - nota aðeins uppgefna miðla, aðskildir með kommum.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - leyfa leit í 'skaffar' (provides) til að finna pakka.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
@@ -216,7 +215,22 @@ msgstr "Vinsamlega bíðið..."
msgid "Must be root"
msgstr "Verður að vera root"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "miðla %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Pakka innsetning..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Pakka innsetning..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -232,37 +246,37 @@ msgstr ""
msgid "Warning"
msgstr "Aðvörun"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Í lagi"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (til að uppfæra)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (til að setja inn)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Pakkaval"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Krefst einnig eins af af eftirtöldum pökkum:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Hætta við"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -273,61 +287,56 @@ msgstr ""
"%s\n"
"Halda samt áfram með uppsetningu?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Til að viðhalda samræmi, verður eftirfarandi pakki settur inn:"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Til að viðhalda samræmi, verða eftirtaldir pakkar settir inn"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d pakki, %d MB)"
msgstr[1] "(%d pakkar, %d MB)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Pakka innsetning..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "Get ekki sótt frumpakka, hætti við"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Undirbý..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Set inn pakka `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Vinsamlega settu inn %s %s"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Sæki pakka `%s'..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Lokið"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -338,28 +347,28 @@ msgstr ""
"%s\n"
"Þú ættir sennilega að uppfæra urpmi gagnagrunninn"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "Innsetning brást:"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Allt er nú þegar komið inn"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Innsetningu lokið"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "fjarlægi %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "endurræsi urpmi"
@@ -398,7 +407,7 @@ msgstr " sjálfgefið er %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - prenta fullt nafn rpm (NVRA).\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Aðeins kerfisstjóri hefur leyfi til að setja inn pakka"
@@ -408,134 +417,143 @@ msgstr "Aðeins kerfisstjóri hefur leyfi til að setja inn pakka"
msgid "Running urpmi in restricted mode..."
msgstr "Keyri urpmi í vernduðum ham..."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "Get ekki skrifað í endurpökkunarmöppu [%s]\n"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, fuzzy, c-format
msgid "invalid owner for directory %s"
msgstr "Ógild dagsetning eða tímabil [%s]\n"
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "Get ekki skrifað í endurpökkunarmöppu [%s]\n"
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr "Umhverfismappa %s er ekki til"
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "nota tilgreint umhverfi á %s\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "gat ekki opnað rpmdb"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "ógilt rpm skráarnafn [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "sæki rpm skrá [%s] ..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...niðurhali lokið"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...mistókst að sækja: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "get ekki lesið rpm skrá [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "get ekki unnið úr spec skrá %s [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "gat ekki skráð rpm skrá"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "ósamhæfður vélbúnaður fyrir rpm [%s]"
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "villa við að skrá staðbundna pakka"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
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:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "röng selskilgreining á skipanalínu\n"
-#: ../urpm/args.pm:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, fuzzy, c-format
msgid "unexpected expression %s"
msgstr "Mynstursegðir:\n"
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Vantar undirskrift (%s)"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, fuzzy, c-format
msgid "no expression to close"
msgstr "Mynstursegðir:\n"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot mappa er ekki til"
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr "Get ekki notað %s án %s"
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr "Get ekki notað %s með %s"
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr "Of mörg viðföng\n"
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Afritun brást"
@@ -582,122 +600,122 @@ msgstr "miðill `%s' er tilgreindur tvisvar, hætti"
msgid "unable to write config file [%s]"
msgstr "get ekki skrifað í uppsetningarskrá [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "%s er ekki tiltækt, nota varamiðil %s"
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Vinsamlega gefðu upp aðgangs-auðkenni þitt fyrir vefsel\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Notandi:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Lykilorð:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr "Óþekkt vefaðferð `%s' !!!\n"
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr "%s mistókst: hætti mið villumerki %d"
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr "%s mistókst: hætti með %d"
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, c-format
msgid "copy failed"
msgstr "afritun mistókst"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, c-format
msgid "wget is missing\n"
msgstr "wget vantar\n"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, c-format
msgid "curl is missing\n"
msgstr "curl vantar\n"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr "curl mistókst: hætt við að sækja skrá\n"
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr "rsync vantar\n"
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr "ssh vantar\n"
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr "prozilla vantar\n"
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr "Gat ekki keyrt prozilla\n"
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "prozilla vantar\n"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr " %s%% of %s lokið, lýkur = %s, hraði = %s"
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr " %s%% lokið, hraði = %s"
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, c-format
msgid "retrieving %s"
msgstr "sæki %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, c-format
msgid "retrieved %s"
msgstr "sótti %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "óþekkt samskiptaregla skilgreind fyrir %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "%s er ekki tiltækt, nota varamiðil %s"
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, 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:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "skil ekki samskiptareglu: %s"
@@ -717,59 +735,59 @@ msgstr "pakki %s fannst ekki."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "sæki rpm skrá frá miðli \"%s\"..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr "[endurpökkun]"
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
"bjó til færslu fyrir uppsetningu á %s (fjarlægi=%d, set inn=%d, uppfæri=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "Gat ekki búið til færslu"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "gat ekki dregið rpm úr breytinga-rpm pakka %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "get ekki sett inn pakka %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "fjarlægi uppsett rpm (%s) frá %s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "...mistókst að sækja: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, c-format
msgid "Removing package %s"
msgstr "Fjarlægi pakka %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "fjarlægi pakka %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "fjarlægi uppsett rpm (%s) frá %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Meiri upplýsingar um pakka %s"
@@ -814,91 +832,81 @@ msgstr "hætti við"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Innsetning brást"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Innsetning brást:"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, c-format
msgid "The following package has bad signature"
msgstr "Eftirfarandi pakki er með gallaða undirskrift"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Eftirfarandi pakkar eru með gallaðar undirskriftir"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Viltu halda áfram með uppsetningu ?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "fjarlægi uppsett rpm (%s) frá %s"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "miðla %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "set inn %s frá %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "Set inn %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Prófa innsetningu án þess að athuga hvaða skrár þarf? (j/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Prófa sterkari innsetningu (--force)? (j/N) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr "Pakkar eru uppfærðir"
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Innsetning er möguleg"
#: ../urpm/md5sum.pm:26
#, c-format
-msgid "examining %s file"
-msgstr "athuga skrá %s"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
-#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "aðvörun: md5 gátsumma fyrir %s ekki til í MD5SUM skrá"
@@ -971,228 +979,228 @@ msgstr "mundi setja inn í stað uppfærslu á pakka %s"
msgid "medium \"%s\" already exists"
msgstr "miðill \"%s\" er þegar til"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr "(sjálfgefið hunsað)"
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "bæti við miðli \"%s\" á undan fjartengdum miðli \"%s\""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, c-format
msgid "adding medium \"%s\""
msgstr "bæti við miðli \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, fuzzy, c-format
msgid "directory %s does not exist"
msgstr "Umhverfismappa %s er ekki til"
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "þessi staðsetning virðist ekki innihalda neina dreifingu"
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, c-format
msgid "unable to parse media.cfg"
msgstr "get ekki unnið úr media.cfg"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "fann ekki dreifingarmiðil (engin media.cfg skrá fannst)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr "sleppi ósamhæfðum miðli `%s' (fyrir %s)"
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, c-format
msgid "retrieving media.cfg file..."
msgstr "sæki media.cfg skrá..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "reynt að velja miðil sem er ekki til \"%s\""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "vel marga miðla: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "fjarlægi miðil \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "endurstilli urpmi fyrir miðil \"%s\""
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...endurstilling mistókst"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "endurstillingu lokið"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Villa við myndun nafnaskrár: er háð %d sem finnst ekki"
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "miðill \"%s\" er uppfærð"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "athuga samantektar-skrá [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "vandræði við lestur á samantektar-skrá fyrir miðil \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "afrita [%s] fyrir miðil \"%s\"..."
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...afritun brást"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "afrita lýsingaskrá fyrir \"%s\"..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...afritun lokið"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "afrit af [%s] brást (skráin er grunsamlega lítil)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "reikna md5 gátsummu yfir sótta hdlist skrá (eða samantektar-skrá)"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "afrit af [%s] brást (md5 gátsumma passar ekki)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "athuga hdlist [%s]"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "hreinsa %s og %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ógild hdlist skrá %s fyrir miðil \"%s\""
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "afrita lýsingaskrá fyrir \"%s\"..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "ógilt rpm skráarnafn [%s]"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "sæki hdlist skrá (eða samantektar-skrá) fyrir \"%s\"..."
-
-#: ../urpm/media.pm:1478
-#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "fann, við leit, hdlist skrá (eða samantektar-skrá) sem %s"
+msgid "no metadata found for medium \"%s\""
+msgstr "engin hdlist skrá fannst fyrir miðil \"%s\""
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "engin hdlist skrá fannst fyrir miðil \"%s\""
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "sæki hdlist skrá (eða samantektar-skrá) fyrir \"%s\"..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "athuga lykilskrá \"%s\"..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...flutti inn lykil %s úr lyklaskrá \"%s\""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "gat ekki flutt inn lykilskrá \"%s\""
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "engin hdlist skrá fannst fyrir miðil \"%s\""
+
+#: ../urpm/media.pm:1612
#, c-format
msgid "updated medium \"%s\""
msgstr "uppfærði miðil \"%s\""
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "les rpm skrár frá [%s]"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1263,7 +1271,7 @@ msgstr "GB"
msgid "TB"
msgstr "TB"
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1628,11 +1636,6 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Ógilt snið: þú mátt aðeins nota eitt fjölgildis-tag"
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "nota tilgreint umhverfi á %s\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1648,118 +1651,136 @@ msgstr "byggði hdlist samantektar-skrá fyrir miðil \"%s\""
msgid "no xml-info available for medium \"%s\""
msgstr "skrifa lista-skrá fyrir miðil \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr "urpmi var endurræst, og listi forgangspakka breyttist ekki"
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr "urpmi var endurræst, og listi forgangspakka breyttist: %s í stað %s"
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Enginn pakki heitir %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Eftirfarandi pakkar innihalda %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Ekki er hægt að setja inn pakka %s"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, c-format
msgid "Package %s is already installed"
msgstr "Pakki %s er nú þegar kominn inn"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, c-format
msgid "Packages %s are already installed"
msgstr "Pakkar %s eru nú þegar komnir inn"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "vegna þess að %s vantar"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, c-format
msgid "due to already installed %s"
msgstr "því pakki %s er uppsettur"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "vegna óuppfylltra %s"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "þegar reynt var að setja upp %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "til þess að halda %s"
#: ../urpm/select.pm:607
#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Eftirfarandi pakka þarf að fjarlægja til að uppfæra aðra:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Eftirfarandi pakka þarf að fjarlægja til að uppfæra aðra:\n"
+"%s"
+
+#: ../urpm/select.pm:635
+#, c-format
msgid "in order to install %s"
msgstr "til þess að setja inn %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "vegna árekstra við %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "ógild undirskrift (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Ógilt auðkenni lykils (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Vantar undirskrift (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't write file"
msgstr "Get ekki skrifað skrá"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't open file"
msgstr "Get ekki opnað skrá"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "Get ekki notað %s með %s"
@@ -1800,7 +1821,7 @@ msgstr " --test - staðfesta að hægt sé að fjarlægja umbeðna pakk
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - dreifð urpmi yfir samnefndar vélar.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Endur-pakka skrám áður en eytt\n"
@@ -1829,7 +1850,7 @@ msgstr ""
" --use-distrib - stilla urpme frá dreifingartrénu, gott að nota\n"
" til að setja inn/fjarlægja chroot með --root valkostnum.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - ítarlegri hamur.\n"
@@ -1895,7 +1916,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "Fjarlæga %d pakka?"
msgstr[1] "Fjarlæga %d pakka?"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (J/n) "
@@ -2155,17 +2176,22 @@ msgstr ""
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - ekki keyra uppsetninga-skriftur í pakka\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - ósamræmanleg tög\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - pakkar sem ætti að sleppa uppsetningu\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --prefer - pakkar sem ættu að vera teknir framfyrir aðra\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2175,43 +2201,43 @@ msgstr ""
"en\n"
" venjulega.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - ekki læsa rpm gagnagrunni.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - uppfæra aðeins pakka með sömu vélbúnaðartegund.\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - velja allt sem passar á skipanalínu.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - hljóður hamur.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --verbose - ítarlegri hamur.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
" nöfn eða rpm skrár sem eru tilgreindar á skipanalínunni verða sett inn.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr "Villa: get ekki notað --auto-select með pakkalista.\n"
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2221,28 +2247,28 @@ msgstr ""
"skipanalínu\n"
"ásamt --bug.\n"
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "Þú getur ekki sett inn vélamáls-rpm pakka þegar notað er --install-src"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2251,17 +2277,12 @@ msgstr ""
"Mappan [%s] er þegar til, vinsamlega notið aðra möppu fyrir villutilkynningu "
"eða eyðið möppunni"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Get ekki búið til möppu [%s] fyrir villu-tilkynningu"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr "Umhverfismappa %s er ekki til"
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2270,48 +2291,48 @@ msgstr ""
"Villa: %s virðist vera tengt aðeins til lestrar.\n"
"Notaðu --allow-force til að þvinga aðgerð."
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr "Uppfæri miðil...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (til að uppfæra)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (til að uppfæra)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (til að setja inn)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (til að setja inn)"
-#: ../urpmi:462
+#: ../urpmi:450
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "Til að viðhalda samræmi við %s, er þörf á einum af eftirtöldum pökkum:"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Hvað velur þú? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2322,7 +2343,7 @@ msgstr ""
"sem eru eldri en þeir sem eru uppsettir:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2333,7 +2354,7 @@ msgstr ""
"sem eru eldri en þeir sem eru uppsettir:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2342,12 +2363,12 @@ msgstr ""
"\n"
"Halda samt áfram með uppsetningu?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (J/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2356,7 +2377,7 @@ msgstr ""
"Ekki er hægt að setja inn umbeðinn pakka:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2365,12 +2386,12 @@ msgstr ""
"Ekki er hægt að setja inn suma umbeðna pakka:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "ef pakki %s er fjarlægður raskast uppsetning kerfisins"
-#: ../urpmi:551
+#: ../urpmi:538
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2381,7 +2402,7 @@ msgstr ""
"að fjarlægja til að uppfæra aðra:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2392,30 +2413,12 @@ msgstr ""
"að fjarlægja til að uppfæra aðra:\n"
"%s\n"
-#: ../urpmi:560
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Eftirfarandi pakka þarf að fjarlægja til að uppfæra aðra:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Eftirfarandi pakka þarf að fjarlægja til að uppfæra aðra:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(aðeins prófun, ekkert verður í raun fjarlægt)"
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2426,7 +2429,7 @@ msgstr ""
"pakka:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
@@ -2435,39 +2438,39 @@ msgstr[0] ""
msgstr[1] ""
"Til að viðhalda samræmi, verða eftirtaldir %d pakkar fjarlægðir (%d MB)"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(aðeins prófun, ekkert verður sett inn í raun)"
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr "diskpláss minnkar um %s."
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr "diskpláss eykst um %s."
-#: ../urpmi:618
+#: ../urpmi:603
#, fuzzy, c-format
msgid "%s of packages will be retrieved."
msgstr "diskpláss eykst um %s."
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
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:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Hætta við"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Sláðu á ENTER þegar tilbúinn..."
@@ -3213,6 +3216,13 @@ msgstr "engin hdlist skrá fyrir miðil \"%s\", engar upplýsingar fyrir pakka %
msgid "No changelog found\n"
msgstr "Enginn breytilisti fannst\n"
+#~ msgid "examining %s file"
+#~ msgstr "athuga skrá %s"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "fann, við leit, hdlist skrá (eða samantektar-skrá) sem %s"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - búa til uppfærslumiðil.\n"
diff --git a/po/it.po b/po/it.po
index d672d6df..99924b9a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: it\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2008-09-06 17:20+0200\n"
"Last-Translator: Andrea Celli <andrea.celli@libero.it>\n"
"Language-Team: Italian <timl@freelists.org>\n"
@@ -36,7 +36,7 @@ msgstr "Installazione RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Errore: impossibile trovare %s, annullo l'operazione"
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_OK"
@@ -102,7 +102,7 @@ msgstr "_Installa"
msgid "_Save"
msgstr "_Salva"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Cancella"
@@ -134,9 +134,8 @@ msgstr ""
msgid "Options:"
msgstr "Opzioni:"
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - stampa questo messaggio di aiuto.\n"
@@ -152,14 +151,16 @@ msgstr ""
#: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
msgstr ""
" --auto-select - seleziona automaticamente i pacchetti per aggiornare il "
"sistema.\n"
#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
msgstr ""
" --force - forza l'esecuzione anche se alcuni pacchetti non "
"esistono.\n"
@@ -174,20 +175,22 @@ msgstr ""
" (--no-verify-rpm la disabilita, solitamente è "
"abilitata).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
-msgstr " --media - usa solo i supporti nella lista, separati da virgole.\n"
+msgstr ""
+" --media - usa solo i supporti nella lista, separati da virgole.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - abilita la ricerca tra i provides del pacchetto.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
-msgstr " -P - non cercare tra i provides per trovare il pacchetto.\n"
+msgstr ""
+" -P - non cercare tra i provides per trovare il pacchetto.\n"
#: ../gurpmi.pm:55 ../urpmi:110 ../urpmq:69
#, c-format
@@ -207,7 +210,8 @@ msgstr ""
#: ../gurpmi.pm:57 ../urpmi:76
#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
" --searchmedia - usa solo i supporti indicati per cercare i "
"pacchetti richiesti\n"
@@ -227,7 +231,22 @@ msgstr "Per favore attendi..."
msgid "Must be root"
msgstr "Devi essere root"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "distribuzione di %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Installazione dei pacchetti..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Installazione dei pacchetti..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -243,37 +262,37 @@ msgstr ""
msgid "Warning"
msgstr "Attenzione"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr "(da aggiornare)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (da installare)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Scelta dei pacchetti"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "È richiesto uno dei seguenti pacchetti:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Interrompi"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -284,59 +303,56 @@ msgstr ""
"%s\n"
"Continuare?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, 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 "Per soddisfare le dipendenze, sarà installato il seguente pacchetto:"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Per soddisfare le dipendenze, saranno installati i seguenti pacchetti:"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d pacchetto, %d MB)"
msgstr[1] "(%d pacchetti, %d MB)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Installazione dei pacchetti..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "impossibile recuperare il pacchetto dalla fonte, interrompo"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "In preparazione..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Sto installando il pacchetto `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Bisogna inserire il supporto denominato \"%s\""
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Download del pacchetto `%s'..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Fatto"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -347,28 +363,28 @@ msgstr ""
"%s\n"
"Potresti voler aggiornare il tuo database di urpmi"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "Installazione fallita:"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "È già tutto installato"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Installazione completata"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "rimozione di %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "Riavvio di urpmi"
@@ -407,7 +423,7 @@ msgstr " predefinito: %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - mostra il nome completo del pacchetto (NVRA)\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Solo superuser è abilitato ad installare pacchetti"
@@ -417,134 +433,143 @@ msgstr "Solo superuser è abilitato ad installare pacchetti"
msgid "Running urpmi in restricted mode..."
msgstr "Eseguo urpmi in modalità \"restricted\"..."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, c-format
msgid "fail to create directory %s"
msgstr "Impossibile creare la directory %s"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr "proprietario sbagliato per la directory %s"
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, c-format
msgid "Can not download packages into %s"
msgstr "Impossibile scaricare pacchetti in %s"
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr "La directory %s, specificata nelle variabili d'ambiente, non esiste"
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "uso le variabili d'ambiente su %s\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "impossibile aprire il database rpm"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nome del file rpm non valido [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "recupero il file rpm [%s] ..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...recupero terminato"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...recupero fallito: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "impossibile accedere al file rpm [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "impossibile analizzare il file spec %s [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "impossibile registrare il file rpm"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Architettura incompatibile per il file rpm [%s]"
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "errore durante la registrazione dei pacchetti locali"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Quest'operazione non è consentita in modalità \"restricted\""
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "errata dichiarazione di proxy usando la linea di comando\n"
-#: ../urpm/args.pm:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "espressione inattesa %s"
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "manca un'espressione prima di %s"
-#: ../urpm/args.pm:382
+#: ../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:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "nessuna espressione da chiudere"
-#: ../urpm/args.pm:395
+#: ../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:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "La directory chroot non esiste"
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr "Impossibile utilizzare %s senza %s"
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr "Impossibile utilizzare %s con %s"
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr "Troppi argomenti\n"
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Copia fallita"
@@ -593,124 +618,126 @@ msgstr "il supporto %s è stato definito due volte. Interrompo"
msgid "unable to write config file [%s]"
msgstr "impossibile scrivere il file di configurazione [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "%s non è disponibile, si utilizzerà %s"
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
-msgstr "impossibile leggere le impostazioni del proxy (diritti insufficienti per leggere %s)"
+msgstr ""
+"impossibile leggere le impostazioni del proxy (diritti insufficienti per "
+"leggere %s)"
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Inserisci i tuoi dati necessari per accedere al proxy\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Nome utente:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Password:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr "Webfetch \"%s\" è sconosciuto!!!\n"
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr "%s non riuscito: segnale di uscita %d"
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr "%s non riuscito: uscito con %d"
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, c-format
msgid "copy failed"
msgstr "copia non riuscita"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, c-format
msgid "wget is missing\n"
msgstr "manca wget\n"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, c-format
msgid "curl is missing\n"
msgstr "manca curl\n"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr "curl ha fallito: download cancellato\n"
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr "manca rsync\n"
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr "manca ssh\n"
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr "manca prozilla\n"
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr "Impossibile eseguire prozilla\n"
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, c-format
msgid "aria2 is missing\n"
msgstr "manca aria2\n"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr " %s%% di %s completato, ETA = %s, velocità = %s"
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr " %s%% completato, velocità = %s"
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, c-format
msgid "retrieving %s"
msgstr "recupero di %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, c-format
msgid "retrieved %s"
msgstr "%s recuperato"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "protocollo sconosciuto definito per %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "%s non è disponibile, si utilizzerà %s"
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, 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:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "impossibile gestire il protocollo: %s"
@@ -730,59 +757,60 @@ msgstr "il pacchetto %s non è stato trovato."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "recupero i file rpm dal supporto \"%s\"..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr "[rimpacchetto]"
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
"creata transazione per installare su %s (rimuove=%d, installa=%d, aggiorna=%"
"d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "impossibile creare la transazione"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "impossibile estrarre un rpm dal pacchetto delta-rpm %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "impossibile installare il pacchetto %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "Rimozione degli rpm difettosi (%s) da %s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, c-format
msgid "removing %s failed: %s"
msgstr "rimozione di %s non riuscita: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, c-format
msgid "Removing package %s"
msgstr "Rimozione del pacchetto %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "rimozione del pacchetto %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "rimozione degli rpm installati (%s) da %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Più informazioni sul pacchetto %s"
@@ -827,18 +855,18 @@ msgstr "Interruzione"
msgid "%s database is locked (another program is already using it)"
msgstr "Il database %s è bloccato (un altro programma lo sta usando)"
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Installazione non riuscita"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr "Proseguire comunque? (y/N) "
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -847,73 +875,63 @@ msgstr ""
"Installazione fallita, rpm difettosi:\n"
"%s"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, c-format
msgid "The following package has bad signature"
msgstr "Questo pacchetto ha una firma errata"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "I seguenti pacchetti hanno delle firme errate"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Vuoi proseguire con l'installazione?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, c-format
msgid "removing installed rpms (%s)"
msgstr "rimozione degli rpm installati (%s)"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "distribuzione di %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "installazione di %s da %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "installazione di %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Provo l'installazione senza controllare le dipendenze? (s/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Provo l'installazione in modo ancora più forzato (--force)? (s/N) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr "I pacchetti sono aggiornati"
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "L'installazione è possibile"
#: ../urpm/md5sum.pm:26
#, c-format
-msgid "examining %s file"
-msgstr "esamino il file %s"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr "file MD5SUM non valido"
-
-#: ../urpm/md5sum.pm:28
-#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "attenzione: la md5sum per %s non è presente nel file MD5SUM"
@@ -988,228 +1006,229 @@ msgstr "installerebbe il pacchetto %s invece di aggiornarlo "
msgid "medium \"%s\" already exists"
msgstr "il supporto \"%s\" esiste già"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr "(ignorato per default)"
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "viene aggiunto il supporto \"%s\" prima del supporto remoto \"%s\""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, c-format
msgid "adding medium \"%s\""
msgstr "viene aggiunto il supporto \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr "La directory %s non esiste"
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "questo indirizzo non sembra contenere alcuna distribuzione"
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, c-format
msgid "unable to parse media.cfg"
msgstr "impossibile esaminare media.cfg"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
-msgstr "impossibile accedere al supporto di installazione (manca il file media.cfg)"
+msgstr ""
+"impossibile accedere al supporto di installazione (manca il file media.cfg)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr "ignoro il supporto non compatibile \"%s\" (per %s)"
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, c-format
msgid "retrieving media.cfg file..."
msgstr "recupero il file media.cfg..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "tentativo di selezionare un supporto inesistente \"%s\""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "sto selezionando più supporti: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "rimuovo il supporto \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "riconfiguro urpmi per il supporto \"%s\""
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...riconfigurazione fallita"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "riconfigurazione eseguita"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Problemi nel generare i nomi dei file: non esiste la dipendenza %d"
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "il supporto \"%s\" è aggiornato"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "esamino il file synthesis [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problema nel leggere il file synthesis del supporto \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "copia di [%s] per il supporto \"%s\"..."
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...copia fallita"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "copio il file di descrizione di \"%s\"..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...copia terminata"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "copia di [%s] fallita (il file è stranamente piccolo)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "calcolo md5sum del file synthesis della fonte scaricata"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "acquisizione di [%s] fallita (md5sum non corretta)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, c-format
msgid "genhdlist2 failed on %s"
msgstr "genhdlist2 non riuscito per %s"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, c-format
msgid "comparing %s and %s"
msgstr "confronto di %s con %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "il file hdlist %s per il supporto \"%s\" non è corretto"
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "copia del file MD5SUM di \"%s\"..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "file MD5SUM non valido (recuperato da %s)"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
+#, fuzzy, c-format
+msgid "no metadata found for medium \"%s\""
+msgstr "non trovo il file synthesis per il supporto \"%s\""
+
+#: ../urpm/media.pm:1475
#, c-format
msgid "retrieving source synthesis of \"%s\"..."
msgstr "recupero del file synthesis di \"%s\"..."
-#: ../urpm/media.pm:1478
-#, c-format
-msgid "found probed synthesis as %s"
-msgstr "trovato synthesis analizzato come %s"
-
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
-#, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "non trovo il file synthesis per il supporto \"%s\""
-
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "controllo il file pubkey di \"%s\"..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...importata la chiave %s dal file pubkey di \"%s\""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "impossibile importare il file pubkey di \"%s\""
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "non trovo il file synthesis per il supporto \"%s\""
+
+#: ../urpm/media.pm:1612
#, c-format
msgid "updated medium \"%s\""
msgstr "supporto \"%s\" aggiornato"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr "recupero di [%s] non riuscito"
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr "nuovo tentativo con il mirror %s"
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr "Impossibile trovare un mirror nell'elenco %s"
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr "localizzata posizione %s %.2f %.2f nel fuso orario %s"
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, c-format
msgid "getting mirror list from %s"
msgstr "recupero elenco dei mirror da %s"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1280,7 +1299,7 @@ msgstr "GB"
msgid "TB"
msgstr "TB"
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1288,8 +1307,11 @@ msgid ""
msgid_plural ""
"The following packages are now orphans, use \"urpme --auto-orphans\" to "
"remove them."
-msgstr[0] "Questo pacchetto ora è orfano. Esegui «urpme --auto-orphans» per rimuoverlo."
-msgstr[1] "Questi pacchetti ora sono orfani. Esegui «urpme --auto-orphans» per rimuoverli."
+msgstr[0] ""
+"Questo pacchetto ora è orfano. Esegui «urpme --auto-orphans» per rimuoverlo."
+msgstr[1] ""
+"Questi pacchetti ora sono orfani. Esegui «urpme --auto-orphans» per "
+"rimuoverli."
#: ../urpm/parallel.pm:14
#, c-format
@@ -1346,7 +1368,9 @@ msgstr "cp non riuscito sull'host %s (%d)"
msgid ""
"%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
"code: %d)"
-msgstr "%s non riuscito sull'host %s (forse non ha una versione adatta di urpmi) (codice di uscita: %d)"
+msgstr ""
+"%s non riuscito sull'host %s (forse non ha una versione adatta di urpmi) "
+"(codice di uscita: %d)"
#: ../urpm/removable.pm:32
#, c-format
@@ -1388,7 +1412,8 @@ msgstr " --version - stampa la versione di questo tool.\n"
#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
-msgstr " --env - usa un ambiente specifico (tipicamente un bug report).\n"
+msgstr ""
+" --env - usa un ambiente specifico (tipicamente un bug report).\n"
#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
#, c-format
@@ -1397,7 +1422,8 @@ msgstr " --excludemedia - non usa i supporti elencati, separati da virgole.\n"
#: ../urpm/search.pm:39 ../urpmf:39
#, c-format
-msgid " --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
"--literal, -l - non considerare i caratteri speciali, usa l'argomento come "
"è.\n"
@@ -1413,7 +1439,8 @@ msgstr ""
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../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 - ordina i supporti in base alle sottostringhe separate da "
"virgole\n"
@@ -1426,7 +1453,8 @@ msgstr " --use-distrib - utilizza questo percorso per accedere al supporto\n"
#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
-msgstr " --synthesis - utilizza la synthesis specificata invece del db urpmi.\n"
+msgstr ""
+" --synthesis - utilizza la synthesis specificata invece del db urpmi.\n"
#: ../urpm/search.pm:45 ../urpmf:45
#, c-format
@@ -1470,7 +1498,8 @@ msgstr "Chiavi di ricerca:\n"
#: ../urpm/search.pm:52 ../urpmf:52
#, c-format
msgid " text - any text is parsed as a regexp, unless -l is used.\n"
-msgstr "-text - il testo è usato come regexp, se non viene specificato -l.\n"
+msgstr ""
+"-text - il testo è usato come regexp, se non viene specificato -l.\n"
#: ../urpm/search.pm:53 ../urpmf:53
#, c-format
@@ -1635,18 +1664,14 @@ msgstr " -m - il supporto dov'è stato trovato il pacchetto\n"
#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
#, c-format
msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - stampa versione, release e architettura con il nome.\n"
+msgstr ""
+" -f - stampa versione, release e architettura con il nome.\n"
#: ../urpm/search.pm:197 ../urpmf:198
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "formato non corretto, puoi usare un solo tag "
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "uso le variabili d'ambiente su %s\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1662,119 +1687,139 @@ msgstr "manca il file di sintesi per il supporto \"%s\""
msgid "no xml-info available for medium \"%s\""
msgstr "manca xml-info per il supporto \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr "urpmi è stato riavviato, ma l'elenco dei pacchetti prioritari non è cambiato"
+msgstr ""
+"urpmi è stato riavviato, ma l'elenco dei pacchetti prioritari non è cambiato"
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
"urpmi è stato riavviato. L'elenco dei pacchetti prioritari è cambiato da %s "
"a %s"
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Nessun pacchetto denominato %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "I seguenti pacchetti contengono %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr "Dovresti aggiungere \"-a\" per usarli tutti"
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "nel DB di urpmi ci sono i pacchetti %s, ma non sono installati"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, c-format
msgid "Package %s is already installed"
msgstr "Il pacchetto %s è già installato"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, c-format
msgid "Packages %s are already installed"
msgstr "I pacchetti %s sono già installati"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "perché manca %s"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, c-format
msgid "due to already installed %s"
msgstr "perché è già installato %s"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "perché non è soddisfatto %s"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "sto selezionando %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "per conservare %s"
#: ../urpm/select.pm:607
#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Questi pacchetti devono essere rimossi per poterne aggiornare altri:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Questi pacchetti devono essere rimossi per poterne aggiornare altri:\n"
+"%s"
+
+#: ../urpm/select.pm:635
+#, c-format
msgid "in order to install %s"
msgstr "per installare %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "per conflitti con %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Firma non valida (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Key ID (%s) non valida"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Firma mancante (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr "sistema"
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr "Dovresti riavviare %s per %s"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't write file"
msgstr "Impossibile scrivere il file"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't open file"
msgstr "Impossibile aprire il file"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, c-format
msgid "Can't move file %s to %s"
msgstr "Impossibile spostare il file %s a %s"
@@ -1799,7 +1844,8 @@ msgstr ""
#: ../urpme:47
#, c-format
msgid " --auto - automatically select a package in choices.\n"
-msgstr " --auto - include automaticamente un pacchetto nelle scelte.\n"
+msgstr ""
+" --auto - include automaticamente un pacchetto nelle scelte.\n"
#: ../urpme:48
#, c-format
@@ -1809,14 +1855,15 @@ msgstr " --auto-orphans - rimuove orfani\n"
#: ../urpme:49
#, c-format
msgid " --test - verify if the removal can be achieved correctly.\n"
-msgstr " --test - verifica se la rimozione può avvenire correttamente.\n"
+msgstr ""
+" --test - verifica se la rimozione può avvenire correttamente.\n"
#: ../urpme:51 ../urpmi:109 ../urpmq:68
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - urpmi distribuito fra varie macchine dell'alias.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Ri-pacchetta i file prima della cancellazione.\n"
@@ -1847,7 +1894,7 @@ msgstr ""
" per (dis)installare un pacchetto chroot con l'opzione --"
"root.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - modalità prolissa.\n"
@@ -1894,7 +1941,8 @@ msgstr "Nessun orfano da rimuovere"
#: ../urpme:149
#, 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] "Per soddisfare le dipendenze, sarà rimosso il seguente pacchetto"
msgstr[1] "Per soddisfare le dipendenze, saranno rimossi i seguenti pacchetti"
@@ -1912,7 +1960,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "Rimuovo %d pacchetto?"
msgstr[1] "Rimuovo %d pacchetti?"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (s/N) "
@@ -1941,8 +1989,7 @@ msgstr "espressione non completata (%s)"
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
-" --auto-update - aggiorna i supporti prima di aggiornare il "
-"sistema.\n"
+" --auto-update - aggiorna i supporti prima di aggiornare il sistema.\n"
#: ../urpmi:82
#, c-format
@@ -2022,7 +2069,8 @@ msgstr ""
#: ../urpmi:98
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
-msgstr " --install-src - installa solo il pacchetto dei sorgenti (non i binari).\n"
+msgstr ""
+" --install-src - installa solo il pacchetto dei sorgenti (non i binari).\n"
#: ../urpmi:99
#, c-format
@@ -2038,8 +2086,10 @@ msgstr " --noclean - tieni in cache gli rpm inutilizzati.\n"
#: ../urpmi:102
#, c-format
-msgid " --replacepkgs - force installing packages which are already installed.\n"
-msgstr " --replacepkgs - forza l'installazione dei pacchetti già installati.\n"
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+" --replacepkgs - forza l'installazione dei pacchetti già installati.\n"
#: ../urpmi:104
#, c-format
@@ -2063,8 +2113,7 @@ msgstr ""
#, c-format
msgid " --allow-suggests - auto select \"suggested\" packages.\n"
msgstr ""
-" --allow-suggests - seleziona automaticamente i pacchetti \"suggeriti"
-"\"\n"
+" --allow-suggests - seleziona automaticamente i pacchetti \"suggeriti\"\n"
#: ../urpmi:112
#, c-format
@@ -2172,29 +2221,36 @@ msgstr " --excludedocs - esclude i file di documentazione.\n"
#: ../urpmi:138
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
-msgstr " --ignoresize -non verifica lo spazio disponibile prima dell'installazione\n"
+msgstr ""
+" --ignoresize -non verifica lo spazio disponibile prima dell'installazione\n"
#: ../urpmi:139
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
-msgstr "--ignore-arch...- permette di installare pacchetti di altre architetture.\n"
+msgstr ""
+"--ignore-arch...- permette di installare pacchetti di altre architetture.\n"
#: ../urpmi:140
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr "--noscripts - non esegue gli script contenuti nei pacchetti\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - elenca i conflitti.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - pacchetti da saltare durante l'installazione.\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --prefer - pacchetti da preferire\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2203,44 +2259,46 @@ msgstr ""
" --more-choices - qualora si trovassero più pacchetti propone più scelte\n"
" che quelle predefinite.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr "--nolock - non bloccare il db degli rpm\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
-msgstr " --strict-arch - aggiorna solo i pacchetti della stessa architettura.\n"
+msgstr ""
+" --strict-arch - aggiorna solo i pacchetti della stessa architettura.\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
-msgstr " -a - seleziona tutte le corrispondenze da riga di comando.\n"
+msgstr ""
+" -a - seleziona tutte le corrispondenze da riga di comando.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - modalità silenziosa.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --debug - modalità molto prolissa.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " i nomi o file rpm passati da riga di comando verranno installati.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
"Errore : non si può usare l'opzione --auto-select e fornire la lista dei "
"pacchetti.\n"
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2250,27 +2308,28 @@ msgstr ""
"commando\n"
"--bug.\n"
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "Non puoi installare rpm binari rpm quando viene usato --install-src"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr "Non puoi installare i file spec"
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr "si mette --buildrequires come opzione predefinita"
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr "devi utilizzare --buildrequires (predefinito) o --install-src"
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2279,17 +2338,12 @@ msgstr ""
"La directory [%s] esiste già. Usa un'altra directory per i bug report o "
"cancellala"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Impossibile creare una directory [%s] per un bug report"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr "La directory %s, specificata nelle variabili d'ambiente, non esiste"
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2298,48 +2352,49 @@ msgstr ""
"Errore: %s sembra montato in sola lettura.\n"
"Usa --allow-force per forzare l'operazione."
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr "Aggiorno il supporto...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (da aggiornare)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (da aggiornare)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (da installare)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (da installare)"
-#: ../urpmi:462
+#: ../urpmi:450
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
-msgstr "Per soddisfare le dipendenze di \"%s\" serve uno dei seguenti pacchetti:"
+msgstr ""
+"Per soddisfare le dipendenze di \"%s\" serve uno dei seguenti pacchetti:"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Quale scegli? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2350,7 +2405,7 @@ msgstr ""
"da pacchetti più vecchi di quelli già installati:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2361,7 +2416,7 @@ msgstr ""
"da pacchetti più vecchi di quelli già installati:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2370,12 +2425,12 @@ msgstr ""
"\n"
"Continuo comunque l'istallazione?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (S/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2384,7 +2439,7 @@ msgstr ""
"Uno dei pacchetti richiesti non può essere installato:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2393,12 +2448,12 @@ msgstr ""
"Alcuni dei pacchetti richiesti non possono essere installati:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "la rimozione del pacchetto %s comprometterà il sistema"
-#: ../urpmi:551
+#: ../urpmi:538
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2409,7 +2464,7 @@ msgstr ""
"devono essere rimossi per poterne aggiornare altri:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2420,30 +2475,12 @@ msgstr ""
"devono essere rimossi per poterne aggiornare altri:\n"
"%s\n"
-#: ../urpmi:560
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Questi pacchetti devono essere rimossi per poterne aggiornare altri:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Questi pacchetti devono essere rimossi per poterne aggiornare altri:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(è solo un test, la rimozione non verrà effettuata)"
-#: ../urpmi:583
+#: ../urpmi:568
#, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2454,46 +2491,46 @@ msgstr ""
"dipendenze:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "Verrà rimosso il seguente pacchetto orfano."
msgstr[1] "Verranno rimossi i seguenti pacchetti orfani."
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(è solo un test, l'installazione non verrà fatta)"
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr "Altri %s di spazio disco saranno utilizzati."
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr "%s di spazio disco saranno liberati."
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr "verranno scaricati %s di pacchetti."
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
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:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Annulla"
-#: ../urpmi:648
+#: ../urpmi:633
#, c-format
msgid "Press Enter when mounted..."
msgstr "Premi invio dopo averlo montato..."
@@ -2614,7 +2651,8 @@ msgstr "--interactive - con --distrib, chiede conferma per ogni supporto\n"
#: ../urpmi.addmedia:76
#, c-format
msgid " --all-media - with --distrib, add every listed media\n"
-msgstr " --all-media - with --distrib, aggiunge tutti supporti disponibili.\n"
+msgstr ""
+" --all-media - with --distrib, aggiunge tutti supporti disponibili.\n"
#: ../urpmi.addmedia:77
#, c-format
@@ -2628,7 +2666,8 @@ msgstr ""
#: ../urpmi.addmedia:79
#, c-format
msgid " --virtual - create virtual media wich are always up-to-date.\n"
-msgstr " --virtual - crea supporti virtuali che sono sempre aggiornati.\n"
+msgstr ""
+" --virtual - crea supporti virtuali che sono sempre aggiornati.\n"
#: ../urpmi.addmedia:80 ../urpmi.update:44
#, c-format
@@ -2638,12 +2677,14 @@ msgstr " --no-md5sum - disabilita il controllo MD5SUM sui file.\n"
#: ../urpmi.addmedia:81
#, c-format
msgid " --nopubkey - don't import pubkey of added media\n"
-msgstr "--nopubkey - non importa la chiave pubblica dei supporti aggiunti\n"
+msgstr ""
+"--nopubkey - non importa la chiave pubblica dei supporti aggiunti\n"
#: ../urpmi.addmedia:82
#, c-format
msgid " --raw - add the media in config, but don't update it.\n"
-msgstr "--raw - aggiunge il supporto alla configurazione ma non lo aggiorna.\n"
+msgstr ""
+"--raw - aggiunge il supporto alla configurazione ma non lo aggiorna.\n"
#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
#, c-format
@@ -2745,7 +2786,8 @@ msgstr ""
#: ../urpmi.recover:37
#, c-format
-msgid " --list - list transactions since provided date/duration argument\n"
+msgid ""
+" --list - list transactions since provided date/duration argument\n"
msgstr "--list - elenca le transizioni dalla data/durata specificata\n"
#: ../urpmi.recover:38
@@ -2921,12 +2963,14 @@ msgstr " --ignore - non aggiornare, segna il supporto come ignorato.\n"
#: ../urpmi.update:47
#, c-format
msgid " --no-ignore - don't update, mark the media as enabled.\n"
-msgstr " --no-ignore - non aggiornare, segna il supporto come disponibile.\n"
+msgstr ""
+" --no-ignore - non aggiornare, segna il supporto come disponibile.\n"
#: ../urpmi.update:49
#, c-format
msgid " --probe-rpms - do not use synthesis, use rpm files directly\n"
-msgstr " --probe-rpms - usa direttamente i file rpm, invece di synthesis\n"
+msgstr ""
+" --probe-rpms - usa direttamente i file rpm, invece di synthesis\n"
#: ../urpmi.update:50
#, c-format
@@ -3031,7 +3075,8 @@ msgstr " --list-url - elenca i supporti disponibili e la loro url.\n"
#: ../urpmq:61
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
-msgstr " --list-nodes - elenca i nodi disponibili quando si utilizza --parallel.\n"
+msgstr ""
+" --list-nodes - elenca i nodi disponibili quando si utilizza --parallel.\n"
#: ../urpmq:62
#, c-format
@@ -3040,7 +3085,8 @@ msgstr " --list-aliases - elenca gli alias paralleli disponibili.\n"
#: ../urpmq:63
#, 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 - mostra la configurazione nella forma usata da urpmi."
"addmedia\n"
@@ -3054,7 +3100,8 @@ msgstr ""
#: ../urpmq:65
#, c-format
-msgid " --sources - give all source packages before downloading (root only).\n"
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
msgstr ""
" --sources - elenca tutti i pacchetti sorgenti prima del download "
"(solo root).\n"
@@ -3062,7 +3109,8 @@ msgstr ""
#: ../urpmq:67
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
-msgstr " --ignorearch - permette di cercare rpm per un'altra architettura.\n"
+msgstr ""
+" --ignorearch - permette di cercare rpm per un'altra architettura.\n"
#: ../urpmq:71
#, c-format
@@ -3205,7 +3253,8 @@ msgstr " -Y - come -y, ma non distingue maiuscole da minuscole.\n"
#: ../urpmq:109
#, c-format
msgid " names or rpm files given on command line are queried.\n"
-msgstr " i nomi o i file rpm passati da riga di comando vengono interrogati.\n"
+msgstr ""
+" i nomi o i file rpm passati da riga di comando vengono interrogati.\n"
#: ../urpmq:156
#, c-format
@@ -3238,14 +3287,16 @@ msgstr ""
#: ../urpmq:408
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
"manca xml-info per il supporto \"%s\", impossibile dare risultati per il "
"pacchetto %s"
#: ../urpmq:409
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
"manca xml-info per il supporto \"%s\", impossibile dare risultati per i "
"pacchetti %s"
@@ -3255,3 +3306,11 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Nessun changelog trovato\n"
+#~ msgid "examining %s file"
+#~ msgstr "esamino il file %s"
+
+#~ msgid "invalid MD5SUM file"
+#~ msgstr "file MD5SUM non valido"
+
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "trovato synthesis analizzato come %s"
diff --git a/po/ja.po b/po/ja.po
index c98af51b..068d78d8 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2008-08-30 00:39+0900\n"
"Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
"Language-Team: Japanese <cooker-i18n@mandrivalinux.org>\n"
@@ -30,7 +30,7 @@ msgstr "RPM のインストール"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "エラー: ファイル %s が見つかりません。操作をキャンセルします。"
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_OK"
@@ -96,7 +96,7 @@ msgstr "インストール(_I)"
msgid "_Save"
msgstr "保存(_S)"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "キャンセル(_C)"
@@ -127,9 +127,8 @@ msgstr ""
msgid "Options:"
msgstr "オプション:"
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - このヘルプを表示\n"
@@ -162,17 +161,17 @@ msgstr ""
" --verify-rpm - インストールする前に RPM の署名を確認する\n"
" (デフォルトで有効。--no-verify-rpm で無効)\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - 指定したメディアのみを使う (コンマで区切る)\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - provide (提供) タグも検索対象に含める\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - provide (提供) タグは検索の対象にしない\n"
@@ -211,7 +210,22 @@ msgstr "お待ちください..."
msgid "Must be root"
msgstr "root 権限が必要です"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "%s を配信"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "パッケージをインストール..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "パッケージをインストール..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -227,37 +241,37 @@ msgstr ""
msgid "Warning"
msgstr "警告"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "OK"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (アップグレードするため)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (インストールするため)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "パッケージの選択"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "以下のパッケージのいずれかが必要です:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "中止(_A)"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -268,60 +282,55 @@ msgstr ""
"%s\n"
"このままインストールを続けますか?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "依存を満たすために以下のパッケージをインストールします:"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "依存を満たすために以下のパッケージをインストールします:"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d 個のパッケージ, %d MB)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "パッケージをインストール..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "ソースパッケージを取得できませんでした。中止します。"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "準備中..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "パッケージ %s (%s/%s) をインストール..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "%s という名前のメディアを挿入してください"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "パッケージ %s をダウンロード..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "完了(_D)"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -332,28 +341,28 @@ msgstr ""
"%s\n"
"urpmi データベースを更新してください。"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "インストール失敗:"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "パッケージは既にインストールされています"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "インストールが完了しました"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "%s を削除"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "urpmi を再スタートします"
@@ -392,7 +401,7 @@ msgstr " デフォルトは %s\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - RPM の完全な名前を表示 (NVRA)\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "パッケージのインストールはスーパーユーザにしかできません"
@@ -402,135 +411,144 @@ msgstr "パッケージのインストールはスーパーユーザにしかで
msgid "Running urpmi in restricted mode..."
msgstr "urpmi を制限モードで実行中..."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, c-format
msgid "fail to create directory %s"
msgstr "ディレクトリ %s を作成できません"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr "ディレクトリ %s の所有者が無効です"
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, c-format
msgid "Can not download packages into %s"
msgstr "パッケージを %s にダウンロードできません"
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr "環境ディレクトリ %s が存在しません"
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "%s に特定の環境を使用\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "rpmdb を開けません"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "RPM ファイル名 [%s] が無効です"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "RPM ファイル [%s] を取得..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...取得完了"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...取得に失敗: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "RPM ファイル [%s] にアクセスできません"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "スペックファイル %s [%s] を分析できません"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "RPM ファイルを登録できません"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "RPM とアーキテクチャが一致していません [%s]"
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "ローカルパッケージの登録中にエラーが発生"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "この操作は制限モードでは禁止されています"
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "コマンドラインのプロキシ宣言が間違っています\n"
-#: ../urpm/args.pm:298
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: RPM ファイル %s を読み込めません\n"
-#: ../urpm/args.pm:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "予期しない表現: %s"
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "%s の前に表現がありません"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "予期しない表現 %s (提案: -a または -o を使用)"
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "閉じる表現がありません"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"urpmf はデフォルトで正規表現を期待します。\"--literal\" を使ってください。"
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot ディレクトリが存在しません"
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr "%2$s なしで %1$s は使えません"
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr "%s は %s と一緒には使えません"
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr "引数が多すぎます\n"
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "コピーに失敗"
@@ -579,122 +597,122 @@ msgstr "メディア %s が二度定義されています。中止します。"
msgid "unable to write config file [%s]"
msgstr "設定ファイル [%s] を書き込めません"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "%s は利用できません。%s にフォールバックします。"
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr "プロキシ設定を読めません (%s を読む権限がありません)"
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "プロキシにアクセスするための資格証明を入力してください\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "ユーザ名:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "パスワード:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr "不明な webfetch `%s' !!!\n"
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr "%s 失敗: シグナル %d で終了"
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr "%s 失敗: %d で終了"
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, c-format
msgid "copy failed"
msgstr "コピーに失敗"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, c-format
msgid "wget is missing\n"
msgstr "wget がありません\n"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, c-format
msgid "curl is missing\n"
msgstr "curl がありません\n"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr "curl 失敗: ダウンロードをキャンセルしました\n"
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr "rsync がありません\n"
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr "ssh がありません\n"
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr "prozilla がありません\n"
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr "prozilla を実行できませんでした\n"
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, c-format
msgid "aria2 is missing\n"
msgstr "aria2 がありません\n"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr " %s%% / %s 完了, ETA = %s, 速度 = %s"
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr " %s%% 完了, 速度 = %s"
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, c-format
msgid "retrieving %s"
msgstr "%s を取得"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, c-format
msgid "retrieved %s"
msgstr "%s を取得しました"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "%s に不明なプロトコルが定義されています"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "%s は利用できません。%s にフォールバックします。"
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "webfetch が見つかりません。利用可能な webfetch: %s\n"
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "プロトコルを処理できません: %s"
@@ -714,12 +732,12 @@ msgstr "パッケージ %s は見つかりません"
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "メディア %s から RPM ファイルを取得..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr "[repackaging 再パッケージ化]"
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -727,47 +745,47 @@ msgstr ""
"%s にインストールするためのトランザクションを作成しました\n"
"(remove=%d, install=%d, upgrade-%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "トランザクションを作成できません"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "delta-rpm パッケージ %s から RPM を抽出できません"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "%s をインストールできません"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "不正な RPM (%s) を %s から削除"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, c-format
msgid "removing %s failed: %s"
msgstr "%s の削除に失敗: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, c-format
msgid "Removing package %s"
msgstr "%s を削除"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "%s を削除"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "インストールされている RPM (%s) を %s から削除"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "パッケージ %s の詳細情報"
@@ -812,18 +830,18 @@ msgstr "中止します"
msgid "%s database is locked (another program is already using it)"
msgstr "%s データベースがロックされています (他のプログラムが使用中です)"
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "インストールに失敗"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr "このまま続けますか? (y/N) "
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -832,73 +850,63 @@ msgstr ""
"インストール失敗。不正な RPM です:\n"
"%s"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, c-format
msgid "The following package has bad signature"
msgstr "以下のパッケージは署名が間違っています"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "以下のパッケージは署名が間違っています"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "インストールを続けますか?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, c-format
msgid "removing installed rpms (%s)"
msgstr "インストールされている RPM (%s) を削除"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "%s を配信"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "%s を %s からインストール"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "%s をインストール"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "依存を確認せずにインストールしますか? (y/N)[デフォルトはN] "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "インストールを強行 (--force) してみますか?(y/N)[デフォルトはN]"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr "パッケージは最新です"
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "インストール可能です"
#: ../urpm/md5sum.pm:26
#, c-format
-msgid "examining %s file"
-msgstr "%s ファイルを検査"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr "無効な MD5SUM ファイル"
-
-#: ../urpm/md5sum.pm:28
-#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "警告: MD5SUM ファイルに %s の md5sum がありません"
@@ -972,230 +980,230 @@ msgstr "パッケージ %s を更新ではなくインストールする"
msgid "medium \"%s\" already exists"
msgstr "メディア %s は既に存在します"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr "(デフォルトで無視)"
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "メディア %s をリモートメディア %s の前に追加"
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, c-format
msgid "adding medium \"%s\""
msgstr "メディア %s を追加"
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr "ディレクトリ %s が存在しません"
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "この場所にはディストリビューションが含まれていないようです"
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, c-format
msgid "unable to parse media.cfg"
msgstr "media.cfg を分析できません"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"ディストリビューションのメディアにアクセスできません (media.cfg ファイルがあ"
"りません)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr "互換性のないメディア %s をスキップします (%s)"
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, c-format
msgid "retrieving media.cfg file..."
msgstr "media.cfg ファイルを取得..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "%s というメディアは存在しません"
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "複数のメディアを選択: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "メディア %s を削除"
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "メディア %s について urpmi を再設定"
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...再設定に失敗"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "再設定完了"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "名前ファイルの生成エラー: 依存 %d が見つかりません"
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "メディア %s は最新です"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "synthesis ファイル [%s] を検査"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "メディア %s の synthesis ファイルの読み込み中に問題が発生"
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "メディア %2$s のために [%1$s] をコピー..."
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...コピーに失敗"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "%s の説明ファイルをコピー..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...コピー完了"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "[%s] のコピーに失敗 (ファイルが異常に小さすぎます)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "取得した source synthesis の md5sum を計算"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "[%s] の取得に失敗 (md5sum 不一致)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, c-format
msgid "genhdlist2 failed on %s"
msgstr "genhdlist2 が %s で失敗しました"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, c-format
msgid "comparing %s and %s"
msgstr "%s と %s を比較"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "メディア %2$s の hdlist ファイル %1$s が無効"
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "%s の MD5SUM ファイルをコピー..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "無効な MD5SUM ファイル (ダウンロード元: %s)"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
+#, fuzzy, c-format
+msgid "no metadata found for medium \"%s\""
+msgstr "メディア %s に synthesis ファイルが見つかりません"
+
+#: ../urpm/media.pm:1475
#, c-format
msgid "retrieving source synthesis of \"%s\"..."
msgstr "%s の source synthesis を取得..."
-#: ../urpm/media.pm:1478
-#, c-format
-msgid "found probed synthesis as %s"
-msgstr "検出した synthesis を %s と認識しました"
-
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
-#, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "メディア %s に synthesis ファイルが見つかりません"
-
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "%s の公開鍵ファイルを検査..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...%2$s の公開鍵ファイルから鍵 %1$s を取り込みました"
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "%s の公開鍵ファイルを取り込めません"
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "メディア %s に synthesis ファイルが見つかりません"
+
+#: ../urpm/media.pm:1612
#, c-format
msgid "updated medium \"%s\""
msgstr "メディア %s を更新しました"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr "[%s] の取得に失敗しました"
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr "ミラー %s で再試行"
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr "ミラーリスト %s にミラーが見つかりませんでした"
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr "ジオロケーション %s %.2f %.2f (タイムゾーン: %s) が見つかりました"
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, c-format
msgid "getting mirror list from %s"
msgstr "%s からミラーリストを取得"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "NnNnいイ"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1266,7 +1274,7 @@ msgstr "GB"
msgid "TB"
msgstr "TB"
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1624,11 +1632,6 @@ msgstr " -f - バージョン, リリース番号, アーキテク
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "不正な形式: 多値タグは一つしか使えません"
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "%s に特定の環境を使用\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1644,120 +1647,138 @@ msgstr "メディア %s には synthesis がありません"
msgid "no xml-info available for medium \"%s\""
msgstr "メディア %s には XML 情報がありません"
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr "urpmi を再スタート、優先パッケージのリストに変更はありません"
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr "urpmi を再スタート、優先パッケージのリストに変更がありました: %s vs %s"
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "%s という名前のパッケージはありません"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "以下のパッケージが %s を含んでいます: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr ""
"パッケージ %s が urpmi データベースに見つかりましたが、どれもインストールされ"
"ていません"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, c-format
msgid "Package %s is already installed"
msgstr "パッケージ %s は既にインストールされています"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, c-format
msgid "Packages %s are already installed"
msgstr "パッケージ %s は既にインストールされています"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "%s がないために"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, c-format
msgid "due to already installed %s"
msgstr "インストール済みの %s のために"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "%s が依存を満たしていないために"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "%s をアップグレードするために"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "%s を維持するために"
#: ../urpm/select.pm:607
#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"更新するには以下のパッケージを削除しなければなりません:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"更新するには以下のパッケージを削除しなければなりません:\n"
+"%s"
+
+#: ../urpm/select.pm:635
+#, c-format
msgid "in order to install %s"
msgstr "%s をインストールするために"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "%s と衝突するために"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "無効な署名 (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "無効な鍵 ID (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "署名がありません (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr "システム"
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr "%2$s のために %1$s を再スタートしてください"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't write file"
msgstr "ファイルを書き込めません"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't open file"
msgstr "ファイルを開けません"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, c-format
msgid "Can't move file %s to %s"
msgstr "ファイル %s を %s に移動できません"
@@ -1798,7 +1819,7 @@ msgstr " --test - 問題なく削除できるかどうかテストす
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - urpmi をエイリアスの複数のマシンに使う\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - ファイルを削除する前に再パッケージ化する\n"
@@ -1829,7 +1850,7 @@ msgstr ""
" で設定。chroot を --root オプション付きでインストール/\n"
" アンインストールする際に使用。\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - 詳細モード\n"
@@ -1889,7 +1910,7 @@ msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "%d 個のパッケージを削除しますか?"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (y/N)[デフォルトはN] "
@@ -2143,17 +2164,22 @@ msgstr " --ignorearch - 別のアーキテクチャの RPM のインストー
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - パッケージのスクリプトを実行しない\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - conflict (衝突) を表示\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - インストールをスキップするパッケージ\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --prefer - 優先すべきパッケージ\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2162,43 +2188,43 @@ msgstr ""
" --more-choices - 複数のパッケージがある場合に、デフォルト以外の選択肢を\n"
" 表示する\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - RPM データベースをロックしない\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - 同じアーキテクチャのパッケージのみを更新\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - 指定した表現を含むすべてのパッケージを選択する\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - 詳細を表示しない\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --debug - 非常に詳細なモード\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
" コマンドラインで指定したパッケージ名/RPM ファイルをインストールします\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr "エラー: --auto-select はパッケージリストと一緒には使えません。\n"
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2207,23 +2233,23 @@ msgstr ""
"エラー: バグレポートを生成するには、通常のコマンドライン引数に加えて\n"
"--bug を指定してください。\n"
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
"バイナリ RPM は --install-src オプション使用時にはインストールできません"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr "スペックファイルはインストールできません"
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr "デフォルトの --buildrequires を使用"
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
@@ -2231,7 +2257,7 @@ msgstr ""
"--buildrequires または --install-src を使ってください。デフォルトは --"
"buildrequires"
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2240,17 +2266,12 @@ msgstr ""
"ディレクトリ [%s] は既に存在します。バグレポートには他のディレクトリを使う"
"か、既存のディレクトリを削除してください。"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "バグレポート用のディレクトリ [%s] を作成できません"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr "環境ディレクトリ %s が存在しません"
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2259,48 +2280,48 @@ msgstr ""
"エラー: %s は読み取り専用でマウントされているようです。\n"
"操作を強制するには --allow-force を使ってください。"
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr "メディアを更新...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (アップグレードするため)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (アップグレードするため)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (インストールするため)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (インストールするため)"
-#: ../urpmi:462
+#: ../urpmi:450
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "'%s' の依存を満たすために以下のパッケージのいずれかが必要です:"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "どれを選びますか? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2311,7 +2332,7 @@ msgstr ""
"パッケージに依存しているため、インストールできません:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2322,7 +2343,7 @@ msgstr ""
"パッケージに依存しているため、インストールできません:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2331,12 +2352,12 @@ msgstr ""
"\n"
"このままインストールを続けますか?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (Y/n)[デフォルトはY] "
-#: ../urpmi:524
+#: ../urpmi:512
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2345,7 +2366,7 @@ msgstr ""
"インストールできないパッケージがあります:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2354,12 +2375,12 @@ msgstr ""
"インストールできないパッケージがあります:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "%s を削除するとシステムが壊れます"
-#: ../urpmi:551
+#: ../urpmi:538
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2370,7 +2391,7 @@ msgstr ""
"更新するには以下のパッケージを削除しなければなりません:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2381,30 +2402,12 @@ msgstr ""
"更新するには以下のパッケージを削除しなければなりません:\n"
"%s\n"
-#: ../urpmi:560
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"更新するには以下のパッケージを削除しなければなりません:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"更新するには以下のパッケージを削除しなければなりません:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(テストのみ、実際には削除されません)"
-#: ../urpmi:583
+#: ../urpmi:568
#, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2415,44 +2418,44 @@ msgstr ""
"呼び出さなければなりません:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "以下のオーファンを削除します"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(テストのみ、実際にはインストールされません)"
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr "ディスク容量を %s 使います。"
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr "ディスク容量が %s 空きます。"
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr "%s のパッケージを取得します。"
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "%d 個のパッケージのインストールを開始しますか?"
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "キャンセル"
-#: ../urpmi:648
+#: ../urpmi:633
#, c-format
msgid "Press Enter when mounted..."
msgstr "マウントされたら Enter を押してください"
@@ -3204,6 +3207,15 @@ msgstr ""
msgid "No changelog found\n"
msgstr "変更ログはありません\n"
+#~ msgid "examining %s file"
+#~ msgstr "%s ファイルを検査"
+
+#~ msgid "invalid MD5SUM file"
+#~ msgstr "無効な MD5SUM ファイル"
+
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "検出した synthesis を %s と認識しました"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - 更新メディアを作成\n"
diff --git a/po/ka.po b/po/ka.po
index 9658e4e6..26544d51 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2003-01-29 23:47+0400\n"
"Last-Translator: Aiet Kolkhi <aiet@gmx.net>\n"
"Language-Team: Georgian\n"
@@ -29,7 +29,7 @@ msgstr "ინსტალაცია ჩაიშალა"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -77,7 +77,7 @@ msgstr "ინსტალირება"
msgid "_Save"
msgstr "_შენახვა"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_გაუქმება"
@@ -109,9 +109,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - აჩვენე ეს დამხმარე ტექსტი.\n"
@@ -142,17 +141,17 @@ msgid ""
" (--no-verify-rpm disables it, default is enabled).\n"
msgstr ""
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
@@ -190,7 +189,22 @@ msgstr "გთხოვთ იქონიოთ მოთმინება"
msgid "Must be root"
msgstr ""
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "ვაინსტალირებ: %s\n"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "ინსტალაციისათვის საჭირო ramdisk იმიჯები"
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "ინსტალაციისათვის საჭირო ramdisk იმიჯები"
+
+#: ../gurpmi2:111
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -203,37 +217,37 @@ msgstr "უკვე ყველაფერი ჩაწერილია"
msgid "Warning"
msgstr "გაფრთხილება"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "ო-ქეი"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr ""
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, fuzzy, c-format
msgid " (to install)"
msgstr "ავტომატური ინსტალირება"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, fuzzy, c-format
msgid "_Abort"
msgstr "შესახებ..."
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -241,60 +255,55 @@ msgid ""
"Continue installation anyway?"
msgstr "%s შედმეგ პაკეტებშია: %s\n"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "დამოკიდებულებების შესასრულებლად შემდეგი პაკეტები ჩაიწერება (%d მბ)"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "დამოკიდებულებების შესასრულებლად შემდეგი პაკეტები ჩაიწერება (%d მბ)"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] ""
-#: ../gurpmi2:250
-#, fuzzy, c-format
-msgid "Package installation..."
-msgstr "ინსტალაციისათვის საჭირო ramdisk იმიჯები"
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, fuzzy, c-format
msgid "unable to get source packages, aborting"
msgstr "ვერ ვიყენებ პარალელურ პარამეტრს \"%s\""
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr ""
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "პაკეტის ინსტალაცია: `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "გთხოვთ ჩადოთ: %s სახელით: %s"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, fuzzy, c-format
msgid "Downloading package `%s'..."
msgstr "პაკეტის ინსტალაცია: `%s' (%s/%s)..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, fuzzy, c-format
msgid "_Done"
msgstr "დასრულდა"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -302,28 +311,28 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "ინსტალაცია ჩაიშალა"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "უკვე ყველაფერი ჩაწერილია"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, fuzzy, c-format
msgid "Installation finished"
msgstr "ინსტალაცია ჩაიშალა"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, fuzzy, c-format
msgid "removing %s"
msgstr "მომხმარებლის წაშლა : %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr ""
@@ -360,7 +369,7 @@ msgstr ""
msgid " -f - output rpm full name (NVRA)\n"
msgstr " --help - აჩვენე ეს დამხმარე ტექსტი.\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, fuzzy, c-format
msgid "Only superuser is allowed to install packages"
msgstr ""
@@ -372,134 +381,143 @@ msgstr ""
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "ვერ მოვახერხე დირექტორია %s-ის შექმნა"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "პაკეტის ინსტალაცია: `%s' (%s/%s)..."
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr ""
+
+#: ../urpm.pm:305
#, fuzzy, c-format
msgid "unable to open rpmdb"
msgstr "ვერ ვიძახებ ფაილს %s\n"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr ""
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, fuzzy, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "ვიძახებ hdlists ფაილს..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...გამოძახება დასრულდა"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...გამოძახება ჩაიშალა: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, fuzzy, c-format
msgid "unable to access rpm file [%s]"
msgstr "ვერ ვშიფრავ \"%s\"-ს ფაილში [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "ვერ ვშიფრავ \"%s\"-ს ფაილში [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, fuzzy, c-format
msgid "unable to register rpm file"
msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr ""
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr ""
-#: ../urpm/args.pm:298
+#: ../urpm/args.pm:306
#, fuzzy, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "ვერ წავიკითხე მენიუს ფაილი:%s"
-#: ../urpm/args.pm:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr ""
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, fuzzy, c-format
msgid "Copying failed"
msgstr "შესვლა ვერ განხორციელდა"
@@ -546,122 +564,122 @@ msgstr ""
msgid "unable to write config file [%s]"
msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr ""
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr ""
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr ""
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "პაროლი:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr ""
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr ""
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, fuzzy, c-format
msgid "copy failed"
msgstr "შესვლა ვერ განხორციელდა"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, c-format
msgid "wget is missing\n"
msgstr ""
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, c-format
msgid "curl is missing\n"
msgstr ""
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr ""
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr ""
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr ""
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr ""
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr ""
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, c-format
msgid "aria2 is missing\n"
msgstr ""
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr ""
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, fuzzy, c-format
msgid "retrieving %s"
msgstr "მომხმარებლის წაშლა : %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...გამოძახება ჩაიშალა: %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "%s-ისთვის უცნობი პროტოკოლია განსაზღვრული"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr ""
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr ""
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "ვერ ვუმკლავდები პროტოკოლს: %s"
@@ -681,58 +699,58 @@ msgstr "უკვე ყველაფერი ჩაწერილია"
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, fuzzy, c-format
msgid "unable to create transaction"
msgstr "ვერ მოვახერხე დირექტორია %s-ის შექმნა"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, fuzzy, c-format
msgid "unable to install package %s"
msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "ვაინსტალირებ: %s\n"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "...გამოძახება ჩაიშალა: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "ვაგდებ მედიას \"%s\""
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, fuzzy, c-format
msgid "removing package %s"
msgstr "ვაგდებ მედიას \"%s\""
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "ვაინსტალირებ: %s\n"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, fuzzy, c-format
msgid "More information on package %s"
msgstr "გვერდის ინფორმაცია არ არსებობს"
@@ -777,90 +795,80 @@ msgstr "გაფრთხილება"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "ინსტალაცია ჩაიშალა"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "ინსტალაცია ჩაიშალა"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, fuzzy, c-format
msgid "The following packages have bad signatures"
msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "Do you want to continue installation ?"
msgstr "გნებავთ დაამუშაოთ:"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "ვაინსტალირებ: %s\n"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, fuzzy, c-format
msgid "distributing %s"
msgstr "ვაინსტალირებ: %s\n"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "ვაინსტალირებ: %s\n"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, fuzzy, c-format
msgid "installing %s"
msgstr "ვაინსტალირებ: %s\n"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "გნებავთ ვცადე ჩაწერა დამოკიდებულებების შემოწმების გარეშე? (ხ/ა) [ა] "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "გნებავთ ვცადო ჩაწერა ძალით (--force)? (ხ/ა) [ა] "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, fuzzy, c-format
msgid "Installation is possible"
msgstr "ინსტალაცია ჩაიშალა"
#: ../urpm/md5sum.pm:26
-#, fuzzy, c-format
-msgid "examining %s file"
-msgstr "ვამოწმებ hdlist ფაილს [%s]"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr ""
@@ -937,228 +945,228 @@ msgstr ""
msgid "medium \"%s\" already exists"
msgstr "მედიუმი \"%s\" უკვე არსებობს"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "ვაგდებ მედიას \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr ""
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "ვერ ვიძახებ ფაილს %s\n"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "ვერ ვპოულობ პირველ საინსტალაციო მედიუმს (ვერ მივაკვლიე hdlists ფაილს)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "ვიძახებ hdlists ფაილს..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, fuzzy, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "ვცდილობ გადავახტე არსებულ მედიას \"%s\"-ს, თავიდან ვიშორებ"
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "ვირჩევ მრავალ მედიას: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "ვაგდებ მედიას \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "პრობლემა hdlist ფაილის ან მედიუმის კითხვისას \"%s\""
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "მენიუს კონფიგურაცია დამახსოვრებულია"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "სერვერის კონფიგურაცია"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "მედიუმი \"%s\" უკვე არსებობს"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "ვამოწმებ synthesis ფაილს [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, fuzzy, c-format
msgid "...copying failed"
msgstr "...კოპირება დასრულდა"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "\"%s\"-ის აღწერილობის ფაილის კოპირება..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...კოპირება დასრულდა"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "...კოპირება ჩაიშალა"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "source hdlist-ის (ან synthesis-ის) კოპირება o"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "...კოპირება ჩაიშალა"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "ვამოწმებ hdlist ფაილს [%s]"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "ვაინსტალირებ: %s\n"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "\"%s\"-ის აღწერილობის ფაილის კოპირება..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr ""
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "ვიძახებ hdlists ფაილს..."
-
-#: ../urpm/media.pm:1478
-#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "ვიპოვე პარალელური სათაე (handler) nodes:-ისთვის %s"
+msgid "no metadata found for medium \"%s\""
+msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "ვიძახებ hdlists ფაილს..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, fuzzy, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "\"%s\"-ის აღწერილობის ფაილის კოპირება..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, fuzzy, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, fuzzy, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "ვერ ვიძახებ ფაილს %s\n"
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
+
+#: ../urpm/media.pm:1612
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "დამატებული მედიუმი %s"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "ვამოწმებ hdlist ფაილს [%s]"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "nNaAა"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1229,7 +1237,7 @@ msgstr ""
msgid "TB"
msgstr ""
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1582,11 +1590,6 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr ""
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1602,68 +1605,68 @@ msgstr "პრობლემა synthesis-ის ფაილის ან მ
msgid "no xml-info available for medium \"%s\""
msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, fuzzy, c-format
msgid "No package named %s"
msgstr "არც ერთ პაკეტს არ ქვია %s\n"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, fuzzy, c-format
msgid "The following packages contain %s: %s"
msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "უკვე ყველაფერი ჩაწერილია"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "უკვე ყველაფერი ჩაწერილია"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "უკვე ყველაფერი ჩაწერილია"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr ""
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "უკვე ყველაფერი ჩაწერილია"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, fuzzy, c-format
msgid "trying to promote %s"
msgstr "ვერ ვპოულობ წასაშლელ შენატანს!"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, fuzzy, c-format
msgid "in order to keep %s"
msgstr ""
@@ -1672,52 +1675,66 @@ msgstr ""
#: ../urpm/select.pm:607
#, 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:608
+#, 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:635
+#, fuzzy, c-format
msgid "in order to install %s"
msgstr ""
"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
"ჩაწეროს პაკეტები."
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr ""
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr ""
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr ""
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr ""
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "შესვლა ვერ განხორციელდა"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "შესვლა ვერ განხორციელდა"
@@ -1759,7 +1776,7 @@ msgstr ""
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --update - განახლების კვანძები\n"
@@ -1786,7 +1803,7 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr "დააჭირეთ Esc ღილაკს ინტერაქტიული რეჟიმისათვის"
@@ -1848,7 +1865,7 @@ msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "ვაგდებ მედიას \"%s\""
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, fuzzy, c-format
msgid " (y/N) "
msgstr " (ხ/ა) [ხ] "
@@ -2082,152 +2099,152 @@ msgstr " --help - აჩვენე ეს დამხმარე
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr ""
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --update - განახლების კვანძები\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr ""
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr ""
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
-#: ../urpmi:151
+#: ../urpmi:152
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr "დააჭირეთ Esc ღილაკს ინტერაქტიული რეჟიმისათვის"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr "დააჭირეთ Esc ღილაკს ინტერაქტიული რეჟიმისათვის"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, fuzzy, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr "ჯგუფის სახელი უკვე არსებობს, გთხოვთ ამოირჩიოთ სხვა ჯგუფის სახელი"
-#: ../urpmi:253
+#: ../urpmi:254
#, fuzzy, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "ვერ მოვახერხე დირექტორია %s-ის შექმნა"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr ""
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "ავტომატური ინსტალირება"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "ავტომატური ინსტალირება"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "დამოკიდებულებების შესასრულებლად შემდეგი პაკეტები ჩაიწერება (%d მბ)"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "თქვენი არჩევანი? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2235,7 +2252,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2243,38 +2260,38 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "საინსტალაციო სერვერის კონფიგურირება"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (ხ/ა) [ხ] "
-#: ../urpmi:524
+#: ../urpmi:512
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
"%s"
msgstr "უკვე ყველაფერი ჩაწერილია"
-#: ../urpmi:525
+#: ../urpmi:513
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s"
msgstr "უკვე ყველაფერი ჩაწერილია"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr ""
-#: ../urpmi:551
+#: ../urpmi:538
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2282,7 +2299,7 @@ msgid ""
"%s\n"
msgstr "%s შედმეგ პაკეტებშია: %s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2290,26 +2307,12 @@ msgid ""
"%s\n"
msgstr "%s შედმეგ პაკეტებშია: %s\n"
-#: ../urpmi:560
-#, fuzzy, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr "%s შედმეგ პაკეტებშია: %s\n"
-
-#: ../urpmi:561
-#, fuzzy, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr "%s შედმეგ პაკეტებშია: %s\n"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:583
+#: ../urpmi:568
#, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2317,44 +2320,44 @@ msgid ""
"%s\n"
msgstr ""
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "დამოკიდებულებების შესასრულებლად შემდეგი პაკეტები ჩაიწერება (%d მბ)"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "გამოქცევა"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "გთხოვთ დაგვიდასტუროთ Enter ღილაკზე დაჭერით..."
@@ -3054,6 +3057,14 @@ msgid "No changelog found\n"
msgstr "სურათები ვერ ვიპოვე"
#, fuzzy
+#~ msgid "examining %s file"
+#~ msgstr "ვამოწმებ hdlist ფაილს [%s]"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "ვიპოვე პარალელური სათაე (handler) nodes:-ისთვის %s"
+
+#, fuzzy
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - განახლების კვანძები\n"
diff --git a/po/ko.po b/po/ko.po
index 6f9e4541..02b853f2 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+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"
@@ -28,7 +28,7 @@ msgstr "설치 준비중입니다"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Error: %s 파일을 찾을 수 없습니다. 작업을 취소합니다. "
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "확인 (_O)"
@@ -93,7 +93,7 @@ msgstr "설치(_I)"
msgid "_Save"
msgstr "저장(_S)"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "취소 (_C)"
@@ -124,9 +124,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - 이 도움말 출력.\n"
@@ -157,17 +156,17 @@ msgid ""
" (--no-verify-rpm disables it, default is enabled).\n"
msgstr ""
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
@@ -205,7 +204,22 @@ msgstr "잠시만 기다려 주십시오..."
msgid "Must be root"
msgstr "마우스 포트"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "%s 설치 중...\n"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "패키지 설치 중..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "패키지 설치 중..."
+
+#: ../gurpmi2:111
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -221,37 +235,37 @@ msgstr ""
msgid "Warning"
msgstr "경고"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "확인"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "업그레이드"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, fuzzy, c-format
msgid " (to install)"
msgstr "설치 종료"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "패키지 선택"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "다음 패키지들 중 하나가 필요합니다:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "중단(_A)"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -261,60 +275,55 @@ msgstr ""
"다음 패키지들이 제거될 것입니다.%s\n"
"계속 설치를 진행하시겠습니까?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "의존성 문제로 인하여, 다음 패키지가 설치되어야 합니다:"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "의존성 문제로 인하여, 다음 패키지들이 설치되어야 합니다:"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d 패키지, %d MB)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "패키지 설치 중..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "소스 패키지를 구할 수 없습니다, 설치를 중단합니다."
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, fuzzy, c-format
msgid "Preparing..."
msgstr "부트 로더 준비중"
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "패키지 설치 중: [%s] (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "장치 [%2$s]에 「%1$s」미디어를 넣으세요."
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, fuzzy, c-format
msgid "Downloading package `%s'..."
msgstr "패키지 내려받는 중: [%s] (%s/%s)..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, fuzzy, c-format
msgid "_Done"
msgstr "완료"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -325,28 +334,28 @@ msgstr ""
"%s\n"
"urpmi 데이터베이스를 업데이트해야 할 수도 있습니다."
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "설치 실패."
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "모든 것이 이미 설치되어 있습니다."
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "설치 완료"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, fuzzy, c-format
msgid "removing %s"
msgstr "%s 제거 중"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr ""
@@ -385,7 +394,7 @@ msgstr " -v - 상세 정보 모드.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -v - 상세 정보 모드.\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, fuzzy, c-format
msgid "Only superuser is allowed to install packages"
msgstr "오직 superuser만 패키지 설치가 가능합니다."
@@ -395,136 +404,145 @@ msgstr "오직 superuser만 패키지 설치가 가능합니다."
msgid "Running urpmi in restricted mode..."
msgstr "제한 모드에서의 urpmi 작동중"
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr ""
"%s 디렉토리을 확인할 수 없습니다\n"
"에러: %s"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "패키지 내려받는 중: [%s] (%s/%s)..."
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr ""
+
+#: ../urpm.pm:305
#, fuzzy, c-format
msgid "unable to open rpmdb"
msgstr "rpmdb를 열 수 없습니다.\n"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "유효하지 않은 RPM 파일 이름 [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, fuzzy, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "유효하지 않은 RPM 파일 이름 [%s]"
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, fuzzy, c-format
msgid "...retrieving done"
msgstr "[%s] 추출 중"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, fuzzy, c-format
msgid "...retrieving failed: %s"
msgstr "FAT크기조정 실패: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "RPM 파일「%s」에 접근할 수 없습니다."
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "RPM 파일「%s」에 접근할 수 없습니다."
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, fuzzy, c-format
msgid "unable to register rpm file"
msgstr "RPM 파일「%s」에 접근할 수 없습니다."
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "rpm [%s] 와 맞지 않는 구조"
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "패키지 등록 오류"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "이 작업은 제한모드에서 작동되는 동안 금지됩니다."
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "명령줄 내의 잘못된 선언\n"
-#: ../urpm/args.pm:298
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: RPM 파일 「%s」을 읽을 수 없습니다.\n"
-#: ../urpm/args.pm:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "서명이 없습니다.(%s)"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot 디렉토리가 존재하지 않습니다."
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr "%s 없이 %s를 사용할 수 없습니다."
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr "%s 와 함께 %s를 사용할 수 없습니다."
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr "너무 많은 인수.\n"
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, fuzzy, c-format
msgid "Copying failed"
msgstr "로그인에 실패했습니다"
@@ -571,124 +589,124 @@ msgstr "'%s'매체는 2번 정의되었습니다. 작업을 중단합니다."
msgid "unable to write config file [%s]"
msgstr "설정 파일 [%s]에 기록할 수 없습니다."
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "%s는 사용할 수 없습니다. %s를 이동시킵니다."
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "proxy에 접속하기 위하여 당신의 자격을 입력해 주십시요.\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "사용자 이름:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "열쇠글:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr "알수 없는 웹패치 '%s' !!!\n"
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr "%s 실패: %d 신호에 의하여 종료됨"
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr "%s 실패: %d 에 의하여 종료됨"
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, fuzzy, c-format
msgid "copy failed"
msgstr "로그인에 실패했습니다"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, fuzzy, c-format
msgid "wget is missing\n"
msgstr "wget이 없음"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, fuzzy, c-format
msgid "curl is missing\n"
msgstr "curl이 없음"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr "curl 실패: 다운로드 취소\n"
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr "rsync가 없음\n"
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr "ssh가 없음\n"
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr "prozilla가 없음\n"
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr "prozilla를 실행할수 없음\n"
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "prozilla가 없음\n"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr " %s%% of %s 완료됨, ETA = %s, speed = %s"
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr " %s%% 완료됨, speed = %s"
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, fuzzy, c-format
msgid "retrieving %s"
msgstr "%s 검색 중"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "%s 검색되었음"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, fuzzy, c-format
msgid "unknown protocol defined for %s"
msgstr "알 수 없는 파일 타입: %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "%s는 사용할 수 없습니다. %s를 이동시킵니다."
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr ""
"웹패치를 발견하지 못했습니다, 지원하는 웹패치는 :\n"
"%s 입니다.\n"
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, fuzzy, c-format
msgid "unable to handle protocol: %s"
msgstr ""
@@ -710,58 +728,58 @@ msgstr "패키지 %s를 찾을 수 없습니다."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "매체「%2$s」에서 RPM 파일「%1$s」를 읽을 수 없습니다."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr "%s 설치 보고서 생성(제거=%d, 설치=%d, 업그레이드=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, fuzzy, c-format
msgid "unable to create transaction"
msgstr "보고서를 생성할 수 없습니다."
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "소스 패키지를 가져올 수 없습니다."
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, fuzzy, c-format
msgid "unable to install package %s"
msgstr "패키지 설치중 문제 발생 %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "%s 설치 중...\n"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "FAT크기조정 실패: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "%s 패키지 설치중"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, fuzzy, c-format
msgid "removing package %s"
msgstr "%s 패키지 설치중"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "%s 설치 중...\n"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, fuzzy, c-format
msgid "More information on package %s"
msgstr "추가 패키지 정보..."
@@ -806,90 +824,80 @@ msgstr "경고"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "설치 실패."
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "설치 실패."
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "다음 팩키지들이 설치될 것입니다."
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, fuzzy, c-format
msgid "The following packages have bad signatures"
msgstr "다음 팩키지들이 설치될 것입니다."
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "Do you want to continue installation ?"
msgstr "이 버튼을 누르시겠습니까?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "%s 설치 중...\n"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, fuzzy, c-format
msgid "distributing %s"
msgstr "%s 설치 중...\n"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "%s 설치 중...\n"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, fuzzy, c-format
msgid "installing %s"
msgstr "%s 설치 중...\n"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "의존성 검사없이 설치합니까? (y/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "설치를 강제 추진합니까? (y/N) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, fuzzy, c-format
msgid "Installation is possible"
msgstr "설치 문제"
#: ../urpm/md5sum.pm:26
-#, fuzzy, c-format
-msgid "examining %s file"
-msgstr "목록 파일 [%s] 읽는 중"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "경고: MD5SUM파일에 있는 사용할 수 없는 %s의 md5sum"
@@ -961,228 +969,228 @@ msgstr "패키지 설치중 문제 발생 %s"
msgid "medium \"%s\" already exists"
msgstr "매체「%s」는 이미 존재합니다."
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr "(기본적으로 무시함)"
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "매체「%2$s」에서 RPM 파일「%1$s」를 읽을 수 없습니다."
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "%s 제거 중"
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, fuzzy, c-format
msgid "directory %s does not exist"
msgstr "chroot 디렉토리가 존재하지 않습니다."
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "이 위치는 어느 제품에서 포함되어있지 않는 듯 합니다."
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "media.cfg 파일을 분석할 수 없습니다.\n"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "(media.cfg파일을 발견할수 없기 때문에) 제품 매체에 접근할 수 없습니다."
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "media.cfg 파일 추출 중..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, fuzzy, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "존재하지 않는 매체 \"%s\" 선택하기 위해 시도중.\n"
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, fuzzy, c-format
msgid "selecting multiple media: %s"
msgstr "존재하지 않는 매체「%s」 선택 시도"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, fuzzy, c-format
msgid "removing medium \"%s\""
msgstr "%s 제거 중"
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "「%s」를 위해 urpmi 재설정 중 ..."
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "..재설정 실패."
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "재설정 완료"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "파일 이름 생성중 오류: %d 의존성을 찾을수 없습니다."
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "매체 [%s]는 최신의 상태입니다.."
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, fuzzy, c-format
msgid "examining synthesis file [%s]"
msgstr "의존목록 파일 [%s] 읽기"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, fuzzy, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "매체「%s」에 대한 목록 합성 파일 생성 완료."
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "매체\"%s\"에 대해 「%s」 복사 중...."
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, fuzzy, c-format
msgid "...copying failed"
msgstr "...복사 실패"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, fuzzy, c-format
msgid "copying description file of \"%s\"..."
msgstr "「%s」의 기록 파일 복사중..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, fuzzy, c-format
msgid "...copying done"
msgstr "....복사 완료"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "[%s]의 복사 실패 (파일이 의심되게 적습니다.)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "검색된 소스 hdlist(또는 synthesis)의 md5sum 계산중."
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "[%s] 복사 실패(부적절한 md5sum)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "hdlist 파일 [%s] 생성 중"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "%s 삭제 중...\n"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "매체「%s」에 대한 목록 파일을 찾을 수 없습니다."
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "「%s」의 기록 파일 복사중..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "유효하지 않은 RPM 파일 이름 [%s]"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "[%s] 추출 중"
-
-#: ../urpm/media.pm:1478
-#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "목록 파일에「%s」에 대한 기록이 없습니다."
+msgid "no metadata found for medium \"%s\""
+msgstr "매체「%s」에 대한 목록 파일을 찾을 수 없습니다."
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "매체「%s」에 대한 목록 파일을 찾을 수 없습니다."
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "[%s] 추출 중"
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, fuzzy, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "프린터 「%s」 제거 중 ..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, fuzzy, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "「%s」의 목록 파일을 기록할 수 없습니다."
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, fuzzy, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "「%s」의 목록 파일을 기록할 수 없습니다."
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "매체「%s」에 대한 목록 파일을 찾을 수 없습니다."
+
+#: ../urpm/media.pm:1612
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "매체 교환"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "[%s]에서 RPM 파일을 찾을 수 없습니다."
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn아니오"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1253,7 +1261,7 @@ msgstr ""
msgid "TB"
msgstr ""
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1606,11 +1614,6 @@ msgstr " -v - 상세 정보 모드.\n"
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr ""
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1626,118 +1629,132 @@ msgstr "매체「%s」에 대한 목록 합성 파일 생성 완료."
msgid "no xml-info available for medium \"%s\""
msgstr "매체「%s」에 대한 목록 파일을 찾을 수 없습니다."
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "%s라는 팩키지는 없습니다."
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "다음 팩키지들은 %s를 담고 있습니다: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "[%s] 팩키지를 설치할 수 없습니다."
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "모든 것이 이미 설치되어 있습니다."
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "모든 것이 이미 설치되어 있습니다."
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "%s가 없기 때문입니다."
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "모든 것이 이미 설치되어 있습니다."
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, fuzzy, c-format
msgid "due to unsatisfied %s"
msgstr "%s에 만족하지 않기 때문입니다."
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, fuzzy, c-format
msgid "trying to promote %s"
msgstr "%s 활성화 시도중"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, fuzzy, c-format
msgid "in order to keep %s"
msgstr "%s를 유지하기 위해"
#: ../urpm/select.pm:607
#, fuzzy, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr "다음 팩키지들이 제거될 것입니다."
+
+#: ../urpm/select.pm:608
+#, fuzzy, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr "다음 팩키지들이 제거될 것입니다."
+
+#: ../urpm/select.pm:635
+#, fuzzy, c-format
msgid "in order to install %s"
msgstr "%s를 설치하기 위해"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "%s와 충돌하기 때문"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, fuzzy, c-format
msgid "Invalid signature (%s)"
msgstr "유효하지 않은 서명 (%s)."
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "유효하지 않은 Key ID (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, fuzzy, c-format
msgid "Missing signature (%s)"
msgstr "서명이 없습니다.(%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "설정 파일 [%s]에 기록할 수 없습니다."
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "로그인에 실패했습니다"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "%s 와 함께 %s를 사용할 수 없습니다."
@@ -1778,7 +1795,7 @@ msgstr " --test - 만약 제거가 정확하게 이루어질수 있다
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - 삭제전에 파일을 Re-package\n"
@@ -1807,7 +1824,7 @@ msgstr ""
" --use-distrib - distrib 트리에서 서둘러 urpme를 설정합니다, \n"
"chroot가 --root 옵션과 함께 인스톨(언인스톨)하기에 유용합니다.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - 상세 정보 모드.\n"
@@ -1870,7 +1887,7 @@ msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "%d 패키지를 제거하시겠습니까?"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, fuzzy, c-format
msgid " (y/N) "
msgstr " (Y/n) "
@@ -2104,142 +2121,142 @@ msgstr " --help - 이 도움말 출력.\n"
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr ""
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " -v - 상세 정보 모드.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr ""
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr ""
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, fuzzy, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -v - 상세 정보 모드.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -v - 상세 정보 모드.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " -v - 상세 정보 모드.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr ""
-#: ../urpmi:253
+#: ../urpmi:254
#, fuzzy, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr ""
"%s 디렉토리을 확인할 수 없습니다\n"
"에러: %s"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "업그레이드"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "업그레이드"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "설치 종료"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "설치 종료"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2249,12 +2266,12 @@ msgstr ""
"설치되어야 합니다.\n"
"\n"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "어느 것을 선택하시겠습니까? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2262,7 +2279,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2270,7 +2287,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2279,31 +2296,31 @@ msgstr ""
"\n"
"계속하시겠습니까?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (Y/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
"%s"
msgstr "일부 팩키지는 제거되어야 합니다."
-#: ../urpmi:525
+#: ../urpmi:513
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s"
msgstr "일부 팩키지는 제거되어야 합니다."
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "%s패키지를 제거하면 시스템이 깨질 수 있습니다."
-#: ../urpmi:551
+#: ../urpmi:538
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2313,7 +2330,7 @@ msgstr ""
"업그레이드하기 위해서는 일부 팩키지가 제거되어야 합니다. 이 기능은 아직 지원"
"되지 않습니다.\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2323,26 +2340,12 @@ msgstr ""
"업그레이드하기 위해서는 일부 팩키지가 제거되어야 합니다. 이 기능은 아직 지원"
"되지 않습니다.\n"
-#: ../urpmi:560
-#, fuzzy, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr "다음 팩키지들이 제거될 것입니다."
-
-#: ../urpmi:561
-#, fuzzy, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr "다음 팩키지들이 제거될 것입니다."
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:583
+#: ../urpmi:568
#, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2350,7 +2353,7 @@ msgid ""
"%s\n"
msgstr ""
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
@@ -2359,38 +2362,38 @@ msgstr[0] ""
"제거될 것입니다..\n"
"\n"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "취소"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "다 되었으면 ENTER키를 누르세요..."
@@ -3114,6 +3117,14 @@ msgid "No changelog found\n"
msgstr "하드 디스크를 찾을 수 없습니다."
#, fuzzy
+#~ msgid "examining %s file"
+#~ msgstr "목록 파일 [%s] 읽는 중"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "목록 파일에「%s」에 대한 기록이 없습니다."
+
+#, fuzzy
#~ msgid "malformed URL: [%s]"
#~ msgstr "잘못된 형식의 입력: [%s]"
diff --git a/po/ky.po b/po/ky.po
index 8c48ef5c..65a0417c 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2005-07-13 13:23+0000\n"
"Last-Translator: Timur Jamakeev <ztimur@mail..ru>\n"
"Language-Team: Kyrgyz\n"
@@ -27,7 +27,7 @@ msgstr "RPM орнотуу"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -93,7 +93,7 @@ msgstr "_Орнотуу"
msgid "_Save"
msgstr "_Сактоо"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Калтыруу"
@@ -125,9 +125,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - бул жардамды чыгаруу.\n"
@@ -163,19 +162,19 @@ msgstr ""
" --verify-rpm - орнотуу алдында rpm сигнатурасын текшерүү\n"
" (--no-verify-rpm муну өчүрөт, алдынала күйгүзүлгөн).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - үтүр менен бөлүнүп көрсөтүлгөн булактарды гана колдонуу.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - пакетти табуу үчүн, provides'терден издөө уруксаты.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - пакетти табуу үчүн, provides'терден издебөө.\n"
@@ -215,7 +214,22 @@ msgstr "Күтө туруңуз..."
msgid "Must be root"
msgstr "root укуктары талап кылынат"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "%s бөлүштүрүлүүдө"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Пакет орнотулууда..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Пакет орнотулууда..."
+
+#: ../gurpmi2:111
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -231,37 +245,37 @@ msgstr ""
msgid "Warning"
msgstr "Эскертүү"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (жаңылоо)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (орнотуу)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Пакет тандоо"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Төмөнкү пакеттердин бири талап кылынат:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Токтотуу"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -272,14 +286,14 @@ msgstr ""
"%s\n"
"Уланталыбы?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
"Көз карандылыктарды канаатандыруу үчүн, төмөнкү пакет орнотулат (%d Мб)"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -287,49 +301,44 @@ msgstr ""
"Көз карандылыктарды канаатандыруу үчүн, төмөнкү %d пакет орнотулат:\n"
"%s\n"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Пакет орнотулууда..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "баштапкы пакеттерди алууга болбоду, күтүлбөгөн аяктоо"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Даярдоо ..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Пакет орнотулууда: `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "\"%s\" аттуу булагын [%s] түзүлүшүнө орнотуңуз"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "`%s' пакети жүктөлүүдө..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Даяр"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -340,28 +349,28 @@ msgstr ""
"%s\n"
"Мүмкүн сизге urpmi берилиштер базасын жаңылоо керек"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Орнотуу ишке ашпады"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Бардыгы алдагачан орнотулган"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Орнотуу аяктады"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "%s алынып салынууда"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "urpmi кайра ишке киргизилүүдө"
@@ -400,7 +409,7 @@ msgstr " алдыалынганы %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -g - группаларды наамдары менен кошо чыгаруу.\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Суперколдонуучу гана пакеттерди орното алат"
@@ -410,134 +419,143 @@ msgstr "Суперколдонуучу гана пакеттерди орнот
msgid "Running urpmi in restricted mode..."
msgstr "urpmi чектелген режимде иштөөдө..."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "Баг отчету үчүн [%s] каталогун түзүүгө болбоду"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "`%s' пакети жүктөлүүдө..."
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "%s үчүн спецификалык чөйрө колдонулууда\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "rpmdb ачууга болбоду"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "[%s] туура эмес rpm файл аты"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "[%s] rpm файлы кабыл алынууда..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...кабыл алуу аяктады"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...кабыл алуу ийгиликсиз: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "[%s] rpm файлына жетүүгө болбоду"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "\"%s\" түшүнүүгө болбоду; ал [%s] файлынын ичинде"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "rpm файлын каттого болбоду"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "локалдык пакеттерди каттоо катасы"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Чектелген режим учурунда бул операцияны аткарууга болбойт"
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "командалык сапта туура эмес прокси көрсөтүлгөн\n"
-#: ../urpm/args.pm:298
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: \"%s\" rpm файлын окууга болбоду\n"
-#: ../urpm/args.pm:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Сигнатура жок (%s)"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Көчүрүү ишке ашпады"
@@ -584,122 +602,122 @@ msgstr ""
msgid "unable to write config file [%s]"
msgstr "[%s] конфиг файлын жазуу мүмкүн эмес"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr ""
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "proxy ге кирүү үчүн өтүнүч\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Колдонуучунун ысымы:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Пароль:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr ""
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr ""
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, fuzzy, c-format
msgid "copy failed"
msgstr "Көчүрүү ишке ашпады"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, fuzzy, c-format
msgid "wget is missing\n"
msgstr "%s жоктугунан"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, fuzzy, c-format
msgid "curl is missing\n"
msgstr "%s жоктугунан"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr ""
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr ""
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr ""
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr ""
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr ""
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "%s жоктугунан"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr ""
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, fuzzy, c-format
msgid "retrieving %s"
msgstr "%s алынып салынууда"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...кабыл алуу ийгиликсиз: %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "%s үчүн белгисиз протокол берилген"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr ""
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "webfetch табылбады, колдоого ээ webfetch: %s\n"
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "протокол аткарылбады: %s"
@@ -719,12 +737,12 @@ msgstr "%s пакети табылбады."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "rpm файлдарын \"%s\" булагынан кабыл алуу жүрүп жатат..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -732,47 +750,47 @@ msgstr ""
"%s ичине инсталляциялоо үчүн транзакция түзүлдү (remove=%d, install=%d, "
"upgrade=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "транзакция түзүүгө мүмкүн эмес"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "%s дельта-rpm пакетинен rpm-ди чыгаруугу мүмкүн эмес"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "%s пакетин орнотуу мүмкүн эмес"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "%2s булагынан %1s орнотулууда"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "...кабыл алуу ийгиликсиз: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "%s пакети алынып салынууда"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "%s пакети алынып салынууда"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "%2s булагынан %1s орнотулууда"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "%s пакети жөнүндө кеңирээк маалымат"
@@ -817,90 +835,80 @@ msgstr "Эскертүү"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Орнотуу ишке ашпады"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Орнотуу ишке ашпады"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Төмөнкү пакеттердин сигнарурасы туура эмес"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Төмөнкү пакеттердин сигнарурасы туура эмес"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Орнотууну улантууну каалайсызбы ?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "%2s булагынан %1s орнотулууда"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "%s бөлүштүрүлүүдө"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "%2s булагынан %1s орнотулууда"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "%s орнотулууда"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Көз карадылыктарды эске албай орнотуп көрөйүнбү? (y/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Мажбурлап орнотуп көрөйүнбү (--force)? (y/N) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Орнотууга мүмкүн"
#: ../urpm/md5sum.pm:26
-#, fuzzy, c-format
-msgid "examining %s file"
-msgstr "MD5SUM файлы текшерилүүдө"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "эскертүү: MD5SUM файлынын ичинде %s үчүн md5sum табылбады"
@@ -975,228 +983,228 @@ msgstr "%s пакетин жаңылоонун ордуна аны орноту
msgid "medium \"%s\" already exists"
msgstr "\"%s\" булагы алдагачан бар"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "\"%s\" булагынын башсаптары окулууда"
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "\"%s\" булагы алынып салынууда"
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr ""
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "rpmdb ачууга болбоду"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "биринчи инсталлялык булакка жетүүгө болбоду (hdlists файлы табылбады)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "hdlists файлы кабыл алынууда..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "жашабаган \"%s\" булагын тандоо аракети"
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "составдык булак тандалууда: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "\"%s\" булагы алынып салынууда"
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "\"%s\" булагы үчүн urpmi программасын кайра конфигурациялоо"
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...кайра конфигурациялоо ишке ашпады"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "кайра конфигурациялоо аяктады"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "\"%s\" булагы тандалган эмес"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "[%s] synthesis файлы текшерилүүдө"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "\"%s\" булагынын synthesis файлын окуу проблемасы"
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "\"%s\" булагы үчүн тизме файлы жазылууда"
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...көчүрүү ишке ашпады"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "\"%s\" үчүн баяндоо файлы көчүрүлүүдө..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...көчүрүү аяктады"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "[%s] көчүрүү ишке ашпады (файл күмөндүү кыска)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "кабыл алынган баштапкы hdlist (же synthesis) үчүн md5sum эсептелүүдө"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr " [%s] көчүрүү ишке ашпады (md5sum туура эмес)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "[%s] hdlist файлы текшерилүүдө"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "%2s булагынан %1s орнотулууда"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "\"%s\" булагы үчүн hdlist файлы табылбады"
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "\"%s\" үчүн баяндоо файлы көчүрүлүүдө..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "[%s] туура эмес rpm файл аты"
-#: ../urpm/media.pm:1461
-#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "\"%s\" булагынын баштапкы hdlist (же synthesis) кабыл алынууда..."
-
-#: ../urpm/media.pm:1478
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "изделген hdlist (же synthesis) табылды: %s"
+msgid "no metadata found for medium \"%s\""
+msgstr "\"%s\" булагы үчүн hdlist файлы табылбады"
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "\"%s\" булагы үчүн hdlist файлы табылбады"
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "\"%s\" булагынын баштапкы hdlist (же synthesis) кабыл алынууда..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "\"%s\" үчүн ачык ачкыч файлы текшерилүүдө..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...%s ачкычы \"%s\" ачык ачкычынан импорттолду"
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "\"%s\" ачык ачкыч файлын импортоо мүмкүн эмес"
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "\"%s\" булагы үчүн hdlist файлы табылбады"
+
+#: ../urpm/media.pm:1612
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "%s булагы кошулду"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "[%s] булагынын rpm файлдары окулууда"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "NnжЖ;:"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1267,7 +1275,7 @@ msgstr ""
msgid "TB"
msgstr ""
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1631,11 +1639,6 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "%s үчүн спецификалык чөйрө колдонулууда\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1651,118 +1654,136 @@ msgstr "\"%s\" булагы үчүн hdlist synthesis файлы түзүлдү"
msgid "no xml-info available for medium \"%s\""
msgstr "\"%s\" булагы үчүн тизме файлы жазылууда"
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, fuzzy, c-format
msgid "No package named %s"
msgstr "%s аттуу пакет жок"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Төмөнкү пакеттер %s камтыйт: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Бардыгы алдагачан орнотулган"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Бардыгы алдагачан орнотулган"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Бардыгы алдагачан орнотулган"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "%s жоктугунан"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "Бардыгы алдагачан орнотулган"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "%s канаатанбагандыгынан"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "%s активдештирүү аракети"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "%s сактоо үчүн"
#: ../urpm/select.pm:607
+#, fuzzy, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Башкаларын жаңылоо үчүн төмөнкү пакеттерди алып салуу талап кылынат:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Башкаларын жаңылоо үчүн төмөнкү пакеттерди алып салуу талап кылынат:\n"
+"%s"
+
+#: ../urpm/select.pm:635
#, c-format
msgid "in order to install %s"
msgstr "%s орнотуу үчүн"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "%s менен конфликтешкендиги үчүн"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Туура эмес сигнатура (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Туура эмес Key ID (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Сигнатура жок (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "[%s] конфигурация файлын түзүү"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "Көчүрүү ишке ашпады"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "Көчүрүү ишке ашпады"
@@ -1805,7 +1826,7 @@ msgstr " --test - туура өчүрүү мүмүкүнчүлүгүн
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - машиналардын алиастары боюнча бөлүнгөн urpmi.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - packager: пакеттөөчү тэгин чыгаруу.\n"
@@ -1835,7 +1856,7 @@ msgstr ""
"конфигурациялоо,\n"
" chroot (кайра)орнотууда --root опциясы менен пайдалуу.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - кеңири режим.\n"
@@ -1901,7 +1922,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "%s пакети алынып салынууда"
msgstr[1] "%s пакети алынып салынууда"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (y/N) "
@@ -2164,17 +2185,22 @@ msgstr " --url - url: url тэгин чыгаруу.\n"
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - description: баяны тэгин чыгаруу.\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - conflicts: бардык конфликтер тэгин чыгаруу.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - орнотуу учурунда коё берилүүчү пакеттер.\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, fuzzy, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --skip - орнотуу учурунда коё берилүүчү пакеттер.\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2184,70 +2210,70 @@ msgstr ""
"сунуштан\n"
" баш тартып, көбүрөөк вариантты сунуштоо.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - rpm-дерди кэштен тазалабоо.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - архитектуралары бирдей гана пакеттерди жаңылоо.\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - бардык тийиштүүсүн командалык саптан алуу.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - кыскартылган режим (quiet).\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --verbose - кеңири режим.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " командалык сапта көрсөтүлгөн аттар жана rpm файлдар орнотулат.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "--install-src колдонууда бинардык rpm файлдарын эмне кылуу"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2256,17 +2282,12 @@ msgstr ""
"[%s] каталогу алдагачан бар, баг жөнүндө билдирүү үчүн башка каталог "
"колдонуңуз же аны өчүрүңүз"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Баг отчету үчүн [%s] каталогун түзүүгө болбоду"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2275,36 +2296,36 @@ msgstr ""
"Ката:мүмкүн %s окуу үчүн гана колдонулган.\n"
" --allow-force операцияны чакыруу үчүн колдонуу."
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (жаңылоо)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (жаңылоо)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (орнотуу)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (орнотуу)"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2312,12 +2333,12 @@ msgid ""
msgstr ""
"Көз карандылыктарды канаатандыруу үчүн төмөнкү %d пакет жоготулат (%d Мб)"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Сиздин тандооңуз? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2328,7 +2349,7 @@ msgstr ""
"каранды:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2339,19 +2360,19 @@ msgstr ""
"каранды:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Буга карабай улантайынбы?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (Y/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2360,7 +2381,7 @@ msgstr ""
"Талап кылынган кээ бир пакеттерди орноттууга болбойт:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2369,12 +2390,12 @@ msgstr ""
"Талап кылынган кээ бир пакеттерди орноттууга болбойт:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "%s пакетин алып салуу сиздин системаңыздын ишин бузат"
-#: ../urpmi:551
+#: ../urpmi:538
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2385,7 +2406,7 @@ msgstr ""
"үчүн төмөнкү пакеттерди алып салуу талап кылынат:\n"
",%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2396,30 +2417,12 @@ msgstr ""
"үчүн төмөнкү пакеттерди алып салуу талап кылынат:\n"
",%s\n"
-#: ../urpmi:560
-#, fuzzy, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Башкаларын жаңылоо үчүн төмөнкү пакеттерди алып салуу талап кылынат:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Башкаларын жаңылоо үчүн төмөнкү пакеттерди алып салуу талап кылынат:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2429,7 +2432,7 @@ msgstr ""
"Төмөнкү көз карандылыктарды орнотуу үчүн сиз root болушуңуз керек:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
@@ -2438,39 +2441,39 @@ msgstr[0] ""
msgstr[1] ""
"Көз карандылыктарды канаатандыруу үчүн төмөнкү %d пакет жоготулат (%d Мб)"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Калтыруу"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Даяр болгон соң, Enter басыңыз..."
@@ -3230,6 +3233,14 @@ msgstr ""
msgid "No changelog found\n"
msgstr "changelog табылбады\n"
+#, fuzzy
+#~ msgid "examining %s file"
+#~ msgstr "MD5SUM файлы текшерилүүдө"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "изделген hdlist (же synthesis) табылды: %s"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - жаңылоо булагын түзүү.\n"
diff --git a/po/lt.po b/po/lt.po
index 8e21ae43..940e3aee 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+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"
@@ -30,7 +30,7 @@ msgstr "RPM įdiegimas"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Gerai"
@@ -96,7 +96,7 @@ msgstr "Į_diegti"
msgid "_Save"
msgstr "Iš_saugoti"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Atšaukti"
@@ -128,9 +128,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - spausdinti šį pagalbos pranešimą.\n"
@@ -165,18 +164,18 @@ msgstr ""
" (--no-verify-rpm funkciją išjungia, standartiškai ji yra "
"įjungta).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - naudoti tik duotąsias laikmenas, atskirtas kableliu.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - paketo suradimui leisti paiešką pasiūlymuose.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - paketo suradimui paieškos pasiūlymuose neatlikti.\n"
@@ -217,7 +216,22 @@ msgstr "Palaukite..."
msgid "Must be root"
msgstr "Turi būti pradinis"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "paskirstomas %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Paketų įdiegimas..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Paketų įdiegimas..."
+
+#: ../gurpmi2:111
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -233,37 +247,37 @@ msgstr ""
msgid "Warning"
msgstr "Dėmesio"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Gerai"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (atnaujinti)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (įdiegti)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Paketų pasirinkimas"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Vienas iš šių paketų yra reikalingas."
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Nutraukti"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -274,19 +288,19 @@ msgstr ""
"%s\n"
"Tęsti?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Priklausomybių patenkinimui, bus įdiegtas šis paketas (%d MB)"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Priklausomybių patenkinimui, bus įdiegtas šis paketas (%d MB)"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, fuzzy, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
@@ -294,42 +308,37 @@ msgstr[0] "%d paketų"
msgstr[1] "%d paketų"
msgstr[2] "%d paketų"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Paketų įdiegimas..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "negaliu gauti pirminių paketų, nutraukiu"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Ruošiamasi..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Įdiegiamas paketas `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Įdėkite laikmeną, pavadintą \"%s\", į įrenginį [%s]"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Parsiunčiamas paketas `%s'..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "Baigta"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -340,28 +349,28 @@ msgstr ""
"%s\n"
"Jūs galite norėti atnaujinti urpmi duomenų bazę"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Įdiegimas nepavyko"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Paketas(-ai) jau įdiegti"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Įdiegimas baigtas"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "pašalinama %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "iš naujo paleidžiama urpmi"
@@ -400,7 +409,7 @@ msgstr " standartinis yra %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -g - spausdinti grupes kartu su pavadinimu.\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Paketus įdiegti leidžiama tik supervartotojui"
@@ -410,134 +419,143 @@ msgstr "Paketus įdiegti leidžiama tik supervartotojui"
msgid "Running urpmi in restricted mode..."
msgstr "urpmi paleidžiama apribota veiksena..."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "Klaidų ataskaitai negaliu sukurti katalogo [%s]"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "Parsiunčiamas paketas `%s'..."
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "%s naudojama specifinė aplinka\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "negaliu atverti rpmdb"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "netinkamas rpm bylos vardas [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "atkuriama rpm byla [%s] ..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...atkūrimas baigtas"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...atkūrimas nepavyko: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "negaliu prieiti prie rpm bylos [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "negaliu išnagrinėti \"%s\" byloje [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "negaliu įregistruoti rpm bylos"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "vietinių paketų registravimo klaida"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Operacija yra draudžiama, kai dirbama apribotoje veiksenoje"
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "blogas tarpinio serverio deklaravimas komandinėje eilutėje\n"
-#: ../urpm/args.pm:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Nėra ženklo (%s)"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Kopijavimas nepavyko"
@@ -584,122 +602,122 @@ msgstr ""
msgid "unable to write config file [%s]"
msgstr "nagaliu įrašyti konfigūracijos bylos [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr ""
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr ""
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Naudotojo vardas:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Slaptažodis:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr ""
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr ""
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, fuzzy, c-format
msgid "copy failed"
msgstr "Kopijavimas nepavyko"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, fuzzy, c-format
msgid "wget is missing\n"
msgstr "dėl trūkstamo %s"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, fuzzy, c-format
msgid "curl is missing\n"
msgstr "dėl trūkstamo %s"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr ""
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr ""
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr ""
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr ""
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr ""
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "dėl trūkstamo %s"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr ""
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, fuzzy, c-format
msgid "retrieving %s"
msgstr "pašalinama %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...atkūrimas nepavyko: %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "%s nurodytas nežinomas protokolas"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr ""
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "nerasta webfetch, palaikomi webfetch yra: %s\n"
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "negaliu valdyti protokolo: %s"
@@ -719,59 +737,59 @@ msgstr "paketas %s nerastas."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "rpm bylos atkuriamos iš laikmenos \"%s\"..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
"sukurta įdiegimo operacija %s (pašalinti=%d, įdiegti=%d, atnaujinti=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "negaliu sukurti operacijos"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "iš delta-rpm paketo %s negaliu išarchyvuoti rpm"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "negaliu įdiegti paketo %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "iš %2$s įdiegiamas %1$s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "...atkūrimas nepavyko: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "pašalinamas paketas %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "pašalinamas paketas %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "iš %2$s įdiegiamas %1$s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Daugiau informacijos apie paketą %s"
@@ -816,90 +834,80 @@ msgstr "Dėmesio"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Įdiegimas nepavyko"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Įdiegimas nepavyko"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Šie paketai turi netinkamus ženklus"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Šie paketai turi netinkamus ženklus"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Ar norite tęsti įdiegimą ?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "iš %2$s įdiegiamas %1$s"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "paskirstomas %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "iš %2$s įdiegiamas %1$s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "įdiegiama %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Pabandyti įdiegimą be priklausomybių tikrinimo? (t/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Pabandyti įdiegimą priverstinai (--force)? (t/N) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Įdiegimas galimas"
#: ../urpm/md5sum.pm:26
-#, fuzzy, c-format
-msgid "examining %s file"
-msgstr "tikrinama MD5SUM byla"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "įspėjimas: MD5SUM byloje negalima %s md5sum"
@@ -974,228 +982,228 @@ msgstr "bus įdiegtas vietoje atnaujinimo paketo %s"
msgid "medium \"%s\" already exists"
msgstr "laikmena \"%s\" jau yra"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "iš laikmenos \"%s\" skaitomos antraštės"
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "pašalinama laikmena \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr ""
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "negaliu atverti rpmdb"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "negaliu prieiti prie pirmojo įdiegimo laikmenos (nerasta hdlists byla)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "atkuriama hdlists byla..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "bandoma išrinkti nesančią laikmeną \"%s\""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "išrenkama daugialypė laikmena: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "pašalinama laikmena \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "laikmenai \"%s\" iš naujo konfigūruojama urpmi"
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...naujas konfigūravimas nepavyko"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "naujas konfigūravimas atliktas"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "laikmena \"%s\" neišrinkta"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "tikrinama sintezės byla [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "laikmenos \"%s\" sintezės bylos skaitymo problema"
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "įrašoma laikmenos \"%s\" sąrašo byla"
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...kopijavimas nepavyko"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopijuojama \"%s\" aprašo byla..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...kopijavimas baigtas"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "[%s] kopijavimas nepavyko (byla per daug maža)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "atkurtam hdlist (arba sintezei) skaičiuojama md5sum"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "[%s] kopijavimas nepavyko (md5sum neatitikimas)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "tikrinama hdlist byla [%s]"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "iš %2$s įdiegiamas %1$s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "laikmenai \"%s\" nerasta hdlist byla"
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "kopijuojama \"%s\" aprašo byla..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "netinkamas rpm bylos vardas [%s]"
-#: ../urpm/media.pm:1461
-#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "atkuriamas \"%s\" pirminis hdlist (arba zintezė)..."
-
-#: ../urpm/media.pm:1478
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "rastas ištirtas hdlist (arba sintezė) kaip %s"
+msgid "no metadata found for medium \"%s\""
+msgstr "laikmenai \"%s\" nerasta hdlist byla"
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "laikmenai \"%s\" nerasta hdlist byla"
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "atkuriamas \"%s\" pirminis hdlist (arba zintezė)..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "tikrinama \"%s\" pubkey byla..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...iš \"%2$s\" pubkey bylos importuotas raktas %1$s"
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "negaliu importuoti \"%s\" pubkey bylos"
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "laikmenai \"%s\" nerasta hdlist byla"
+
+#: ../urpm/media.pm:1612
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "įtraukta laikmena %s"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "iš [%s] skaitomos rpm bylos"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1266,7 +1274,7 @@ msgstr ""
msgid "TB"
msgstr ""
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1633,11 +1641,6 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "%s naudojama specifinė aplinka\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1653,118 +1656,136 @@ msgstr "\"%s\" laikmenai sudaryta hdlist sintezės byla"
msgid "no xml-info available for medium \"%s\""
msgstr "įrašoma laikmenos \"%s\" sąrašo byla"
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Nėra paketo, pavadinto %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Šie paketai turi %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Paketas(-ai) jau įdiegti"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Paketas(-ai) jau įdiegti"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Paketas(-ai) jau įdiegti"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "dėl trūkstamo %s"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "Paketas(-ai) jau įdiegti"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "dėl nepatenkinto %s"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "bandau paaukštinti %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "%s išlaikymui"
#: ../urpm/select.pm:607
+#, fuzzy, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Šie paketai turi būti pašalinti tam, kad kitus būtų galima atnaujinti:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Šie paketai turi būti pašalinti tam, kad kitus būtų galima atnaujinti:\n"
+"%s"
+
+#: ../urpm/select.pm:635
#, c-format
msgid "in order to install %s"
msgstr "%s įdiegimui"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "dėl konfliktų su %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Netinkamas ženklas (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Netinkamas rakto ID (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Nėra ženklo (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "Įjungti ar išjungti bendrą naudojimąsi bylomis"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "Kopijavimas nepavyko"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "Kopijavimas nepavyko"
@@ -1808,7 +1829,7 @@ msgstr ""
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - urpmi paskirstomas po kompiuterius.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - spausdinti žymens archyvatorių: archyvatorius.\n"
@@ -1838,7 +1859,7 @@ msgstr ""
"metodu, naudinga\n"
" įdiegti (pašalinti) chroot su --root parinktimi.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - verbose veiksena.\n"
@@ -1906,7 +1927,7 @@ msgstr[0] "pašalinamas paketas %s"
msgstr[1] "pašalinamas paketas %s"
msgstr[2] "pašalinamas paketas %s"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (t/N) "
@@ -2172,17 +2193,22 @@ msgstr " --url - spausdinti žymens url: url.\n"
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - spausdinti žymens aprašymą: aprašymas.\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - spausdinti žymenų konfliktus: visi konfliktai.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - paketai, kurie neturi būti diegiami\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, fuzzy, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --skip - paketai, kurie neturi būti diegiami\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2191,71 +2217,71 @@ msgstr ""
" --more-choices - kai randama keletas paketų, vietoje standartinių\n"
" leisti pasirinkti.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - rpms iš cache neišvalyti.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - atnaujinti tik tokios pat architektūros paketus.\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - komandinėje eilutėje išrinkti visus atitikimus.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - paslėptoji veiksena.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --verbose - verbose veiksena.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
" rpm bylos, kurių pavadinimai nurodyti komandinėje eilutėje, bus įdiegtos.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "Kas gali būti atlikta su dvejetainėmis bylomis naudojant --install-src"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2264,17 +2290,12 @@ msgstr ""
"Katalogas [%s] jau yra, klaidų ataskaitai naudokite kitą katalogą arba "
"esantį ištrinkite"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Klaidų ataskaitai negaliu sukurti katalogo [%s]"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2283,48 +2304,48 @@ msgstr ""
"Klaida: %s prijungta tik skaitymui.\n"
"Operacijos vykdymui naudokite --allow-force"
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (atnaujinti)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (atnaujinti)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (įdiegti)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (įdiegti)"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "Priklausomybių patenkinimui, šie paketai %d bus pašalinti (%d MB)"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Koks Jūsų pasirinkimas? (1-%d)"
-#: ../urpmi:507
+#: ../urpmi:495
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2335,7 +2356,7 @@ msgstr ""
"kurie yra senesni nei dabar įdiegti:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2346,19 +2367,19 @@ msgstr ""
"kurie yra senesni nei dabar įdiegti:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Ar vis tiek tęsti?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (T/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2367,7 +2388,7 @@ msgstr ""
"Pareikalautas paketas negali būti įdiegtas:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2376,12 +2397,12 @@ msgstr ""
"Pareikalautas paketas negali būti įdiegtas:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "paketo %s pašalinimas sugadins jūsų sistemą"
-#: ../urpmi:551
+#: ../urpmi:538
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2392,7 +2413,7 @@ msgstr ""
"turi būti pašalinti, kad kitus būtų galima atnaujinti:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2403,30 +2424,12 @@ msgstr ""
"turi būti pašalinti, kad kitus būtų galima atnaujinti:\n"
"%s\n"
-#: ../urpmi:560
-#, fuzzy, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Šie paketai turi būti pašalinti tam, kad kitus būtų galima atnaujinti:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Šie paketai turi būti pašalinti tam, kad kitus būtų galima atnaujinti:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2436,7 +2439,7 @@ msgstr ""
"Išvardintų priklausomybių įdiegimiui jūs turite būti pradiniu:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
@@ -2444,27 +2447,27 @@ msgstr[0] "Priklausomybių patenkinimui, šie paketai %d bus pašalinti (%d MB)"
msgstr[1] "Priklausomybių patenkinimui, šie paketai %d bus pašalinti (%d MB)"
msgstr[2] "Priklausomybių patenkinimui, šie paketai %d bus pašalinti (%d MB)"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2472,12 +2475,12 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Atšaukti"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Kai būsite pasiruošę, paspauskite Enter..."
@@ -3233,6 +3236,14 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Nerastas changelog\n"
+#, fuzzy
+#~ msgid "examining %s file"
+#~ msgstr "tikrinama MD5SUM byla"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "rastas ištirtas hdlist (arba sintezė) kaip %s"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - sukurti atnaujinimo laikmeną.\n"
diff --git a/po/lv.po b/po/lv.po
index edc6f82d..c916fd99 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+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"
@@ -31,7 +31,7 @@ msgstr "Sagatavoju instalēšanu"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Labi"
@@ -81,7 +81,7 @@ msgstr "_Uzstādīt"
msgid "_Save"
msgstr "_Saglabāt"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "At_celt"
@@ -112,9 +112,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - izvadīt šo palīdzības ziņojumu.\n"
@@ -145,17 +144,17 @@ msgid ""
" (--no-verify-rpm disables it, default is enabled).\n"
msgstr ""
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, fuzzy, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --update - izveidot atjaunināšanas datu nesēju.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, fuzzy, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -f - forsēt hdlist failu ģenerēšanu.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, fuzzy, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -f - forsēt hdlist failu ģenerēšanu.\n"
@@ -194,7 +193,22 @@ msgstr "Lūdzu gaidiet..."
msgid "Must be root"
msgstr "Peles ports"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "tiek instalēta %s\n"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Sagatavoju instalēšanu"
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Sagatavoju instalēšanu"
+
+#: ../gurpmi2:111
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -210,37 +224,37 @@ msgstr ""
msgid "Warning"
msgstr "Uzmanību"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Labi"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "Atjaunināt"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, fuzzy, c-format
msgid " (to install)"
msgstr "Instalēšanas beigas"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Ir nepieciešama viena no sekojošām pakotnēm:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Pārtraukt"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -248,19 +262,19 @@ msgid ""
"Continue installation anyway?"
msgstr "Tiks noņemtas sekojošas pakotnes"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Lai apmierinātu atkarības, tiks noņemtas sekojošas pakotnes (%d MB)"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Lai apmierinātu atkarības, tiks noņemtas sekojošas pakotnes (%d MB)"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, fuzzy, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
@@ -268,42 +282,37 @@ msgstr[0] "%d pakotnes"
msgstr[1] "%d pakotnes"
msgstr[2] "%d pakotnes"
-#: ../gurpmi2:250
-#, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Sagatavoju instalēšanu"
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "nevar dabūt koda pakotnes, pārtraucu"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Sagatavoju..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, fuzzy, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Instalēju pakotnes..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Lūdzu ielieciet datu nesēju \"%s\" ierīcē [%s]"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, fuzzy, c-format
msgid "Downloading package `%s'..."
msgstr "Instalēju pakotnes..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, fuzzy, c-format
msgid "_Done"
msgstr "Izdarīts"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -311,28 +320,28 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Instalēšana neizdevās"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "viss jau ir instalēts"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Instalēšana pabeigta"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, fuzzy, c-format
msgid "removing %s"
msgstr "Atvienoju %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr ""
@@ -373,7 +382,7 @@ msgstr ""
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -q - klusais režīms.\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, fuzzy, c-format
msgid "Only superuser is allowed to install packages"
msgstr "nevaru instalēt pakotni %s"
@@ -383,134 +392,143 @@ msgstr "nevaru instalēt pakotni %s"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "Nevarēju izveidot direktoriju [%s] kļūdu ziņojumam"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "Instalēju pakotnes..."
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr ""
+
+#: ../urpm.pm:305
#, fuzzy, c-format
msgid "unable to open rpmdb"
msgstr "Nevar atvērt failu %s\n"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nederīgs rpm faila vārds [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, fuzzy, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "atgūstu hdlists failu..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...atgūšana veikta"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...atgūšana neizdevās: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "nav iespējams piekļūt rpm failam [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "nav iespējams piekļūt rpm failam [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, fuzzy, c-format
msgid "unable to register rpm file"
msgstr "nav iespējams piekļūt rpm failam [%s]"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "kļūda reģistrējot lokālās pakotnes"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr ""
-#: ../urpm/args.pm:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Neesoši ieraksti"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, fuzzy, c-format
msgid "Copying failed"
msgstr "Neveiksmīga Pieteikšanās"
@@ -557,122 +575,122 @@ msgstr ""
msgid "unable to write config file [%s]"
msgstr "nevar saglabāt konfigurācijas failu [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr ""
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr ""
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Lietotāja vārds:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Parole:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr ""
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr ""
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, fuzzy, c-format
msgid "copy failed"
msgstr "Neveiksmīga Pieteikšanās"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, fuzzy, c-format
msgid "wget is missing\n"
msgstr "trūkstošs kdesu"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, fuzzy, c-format
msgid "curl is missing\n"
msgstr "trūkstošs kdesu"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr ""
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr ""
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr ""
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr ""
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr ""
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "trūkstošs kdesu"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr ""
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, fuzzy, c-format
msgid "retrieving %s"
msgstr "Atvienoju %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...atgūšana neizdevās: %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "Nezināms protokols definēts priekš %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr ""
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr ""
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, fuzzy, c-format
msgid "unable to handle protocol: %s"
msgstr "nav iespējams lietot paralēlo opciju \"%s\""
@@ -692,58 +710,58 @@ msgstr "pakotne %s nav atrasta."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "nav iespējams nolasīt rpm failu [%s] no datu nesēja \"%s\""
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, fuzzy, c-format
msgid "unable to create transaction"
msgstr "Neizdevās izveidot ssh identitāti"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "nevaru noņemt pakotni %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "nevaru instalēt pakotni %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "tiek instalēta %s\n"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "...atgūšana neizdevās: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "Instalēju pakotni %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, fuzzy, c-format
msgid "removing package %s"
msgstr "Instalēju pakotni %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "tiek instalēta %s\n"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, fuzzy, c-format
msgid "More information on package %s"
msgstr "Vairāk informācijas par pakotni..."
@@ -788,90 +806,80 @@ msgstr "Uzmanību"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Instalēšana neizdevās"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Instalēšana neizdevās"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Sekojošām pakotnēm ir slikti paraksti"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Sekojošām pakotnēm ir slikti paraksti"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Vēlaties turpināt instalēšanu?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "tiek instalēta %s\n"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, fuzzy, c-format
msgid "distributing %s"
msgstr "tiek instalēta %s\n"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "tiek instalēta %s\n"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, fuzzy, c-format
msgid "installing %s"
msgstr "tiek instalēta %s\n"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Vai mēģināt instalēt bez atkarību pārbaudes? (j/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Vai mēģināt instalēt vēl uzstājīgāk (--force)? (j/N) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Instalēšana ir iespējama"
#: ../urpm/md5sum.pm:26
-#, fuzzy, c-format
-msgid "examining %s file"
-msgstr "eksaminēju hdlist failu [%s]"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr ""
@@ -945,228 +953,228 @@ msgstr "Problēmas, instalējot pakotni %s"
msgid "medium \"%s\" already exists"
msgstr "datu nesējs \"%s\" jau eksistē"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "problēma nolasot datu nesēja \"%s\" synthesis failu"
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "noņemu datu nesēju \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr ""
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "Nevar atvērt failu %s\n"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "nav iespējams piekļūt pirmajam instalācijas datu nesējam"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "atgūstu hdlists failu..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, fuzzy, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "nevar izveidot datu nesēju \"%s\"\n"
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, fuzzy, c-format
msgid "selecting multiple media: %s"
msgstr "izvēlos vairākas vides: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "noņemu datu nesēju \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "Konfigurēju printeri \"%s\"..."
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "Izvēlnes konfigurācija saglabāta"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "Servera konfigurācija"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "datu nesējs \"%s\" nav izvēlēts"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "eksaminēju synthesis failu [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problēma nolasot datu nesēja \"%s\" synthesis failu"
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, fuzzy, c-format
msgid "...copying failed"
msgstr "...kopēšana veikta"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopēju \"%s\" apraksta failu ..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...kopēšana veikta"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "[%s] kopēšana neizdevās"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "saraksta fails priekš \"%s\" ir tukšs"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "[%s] kopēšana neizdevās"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "eksaminēju hdlist failu [%s]"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "tiek instalēta %s\n"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "kopēju \"%s\" apraksta failu ..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "nederīgs rpm faila vārds [%s]"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "atgūstu hdlists failu..."
-
-#: ../urpm/media.pm:1478
-#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "saraksta fails priekš \"%s\" ir tukšs"
+msgid "no metadata found for medium \"%s\""
+msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "atgūstu hdlists failu..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, fuzzy, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "kopēju \"%s\" apraksta failu ..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, fuzzy, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "nevaru ierakstīt \"%s\" saraksta failu"
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, fuzzy, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "nevaru ierakstīt \"%s\" saraksta failu"
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
+
+#: ../urpm/media.pm:1612
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "pievienoju datu nesēju %s."
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "nolasu rpm failus no [%s]"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1237,7 +1245,7 @@ msgstr ""
msgid "TB"
msgstr ""
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1597,11 +1605,6 @@ msgstr " -v - runīgais režīms.\n"
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr ""
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1617,118 +1620,132 @@ msgstr "uzbūvēju hdlist synthesis failu priekš datu nesēja \"%s\""
msgid "no xml-info available for medium \"%s\""
msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Nav pakotnes ar nosaukumu %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Sekojošas pakotnes satur %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "viss jau ir instalēts"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "viss jau ir instalēts"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "viss jau ir instalēts"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "trūkstošs kdesu"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "viss jau ir instalēts"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, fuzzy, c-format
msgid "due to unsatisfied %s"
msgstr "trūkstošs kdesu"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, fuzzy, c-format
msgid "trying to promote %s"
msgstr "Nav nekā, ko noņemt.\n"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, fuzzy, c-format
msgid "in order to keep %s"
msgstr "Loga rāmja tēma"
#: ../urpm/select.pm:607
#, 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:608
+#, 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:635
+#, fuzzy, c-format
msgid "in order to install %s"
msgstr "nevaru instalēt pakotni %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "%s konflikē ar %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, fuzzy, c-format
msgid "Invalid signature (%s)"
msgstr "Neesoši ieraksti"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr ""
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, fuzzy, c-format
msgid "Missing signature (%s)"
msgstr "Neesoši ieraksti"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "nevar saglabāt konfigurācijas failu [%s]"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "Neveiksmīga Pieteikšanās"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "Neveiksmīga Pieteikšanās"
@@ -1770,7 +1787,7 @@ msgstr ""
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --list - izvadīt sarakstu ar pieejamām pakotnēm.\n"
@@ -1797,7 +1814,7 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " -v - runīgais režīms.\n"
@@ -1865,7 +1882,7 @@ msgstr[0] "Instalēju pakotni %s"
msgstr[1] "Instalēju pakotni %s"
msgstr[2] "Instalēju pakotni %s"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (j/N) "
@@ -2105,154 +2122,154 @@ msgstr " --help - izvadīt šo palīdzības ziņojumu.\n"
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - drukāt iezīmui: apraksts."
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - drukāt iezīmi: konflikti (vairākas rindiņas)."
+
+#: ../urpmi:143
#, fuzzy, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
" --test - pārbaudīt, vai instalācija var tikt veikta korekti.\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, fuzzy, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr ""
" --test - pārbaudīt, vai instalācija var tikt veikta korekti.\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:146
+#: ../urpmi:147
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --clean - izņemt rpm no kešatmiņas, pirms darīt ko citu.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, fuzzy, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -q - klusais režīms.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - klusais režīms.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " -v - runīgais režīms.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, fuzzy, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr "Šāda grupa jau eksistē, izvēlieties citu grupas nosaukumu"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Nevarēju izveidot direktoriju [%s] kļūdu ziņojumam"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "Atjaunināt"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "Atjaunināt"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "Instalēšanas beigas"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "Instalēšanas beigas"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "Lai apmierinātu atkarības, tiks noņemtas sekojošas pakotnes (%d MB)"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Kāda ir jūsu izvēle? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2260,7 +2277,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2268,38 +2285,38 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Tad turpināt?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (J/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
"%s"
msgstr "Dažas pakotnes nepieciešams noņemt"
-#: ../urpmi:525
+#: ../urpmi:513
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s"
msgstr "Dažas pakotnes nepieciešams noņemt"
-#: ../urpmi:542
+#: ../urpmi:530
#, fuzzy, c-format
msgid "removing package %s will break your system"
msgstr "pakotnes %s noņemšana sabojās Jūsu sistēmu\n"
-#: ../urpmi:551
+#: ../urpmi:538
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2310,7 +2327,7 @@ msgstr ""
"%s\n"
"vai piekrītat?"
-#: ../urpmi:553
+#: ../urpmi:540
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2321,26 +2338,12 @@ msgstr ""
"%s\n"
"vai piekrītat?"
-#: ../urpmi:560
-#, 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"
-
-#: ../urpmi:561
-#, 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"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2350,7 +2353,7 @@ msgstr ""
"Jums jābūt root, lai instalētu sekojošas atkarības:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
@@ -2358,27 +2361,27 @@ msgstr[0] "Lai apmierinātu atkarības, tiks noņemtas sekojošas pakotnes (%d M
msgstr[1] "Lai apmierinātu atkarības, tiks noņemtas sekojošas pakotnes (%d MB)"
msgstr[2] "Lai apmierinātu atkarības, tiks noņemtas sekojošas pakotnes (%d MB)"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2386,12 +2389,12 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Atcelt"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Nospiediet Enter, kad gatavs..."
@@ -3111,6 +3114,14 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Cietņi netika atrasti"
+#, fuzzy
+#~ msgid "examining %s file"
+#~ msgstr "eksaminēju hdlist failu [%s]"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "saraksta fails priekš \"%s\" ir tukšs"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - izveidot atjaunināšanas datu nesēju.\n"
diff --git a/po/mk.po b/po/mk.po
index dad9480d..ae051c2d 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+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"
@@ -29,7 +29,7 @@ msgstr "RPM инсталација"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Во ред"
@@ -96,7 +96,7 @@ msgstr "_Инсталирај"
msgid "_Save"
msgstr "_Зачувај"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Откажи"
@@ -128,9 +128,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - ја испишува оваа помошна порака.\n"
@@ -166,18 +165,18 @@ msgstr ""
" (--no-verify-rpm го оневозможува, стандардно е "
"овозможен).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - го користи само дадениот медиум, одделено со запирка.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - дозволи пребарување за наоѓање на пакет.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - не пребарувај за наоѓање на пакет.\n"
@@ -217,7 +216,22 @@ msgstr "Ве молиме почекајте..."
msgid "Must be root"
msgstr "Мора да сте root"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "дистрибуирам %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Инсталација на пакетот..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Инсталација на пакетот..."
+
+#: ../gurpmi2:111
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -233,37 +247,37 @@ msgstr ""
msgid "Warning"
msgstr "Предупредување"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Во ред"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (за надоградување)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (за инсталирање)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Избор на пакети"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Потребен е еден од следниве пакети:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Откажи"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -274,14 +288,14 @@ msgstr ""
"%s\n"
"Да продолжам?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
"За да се задоволат зависностите, следниов пакет ќе биде инсталиран (%d MB)"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -289,49 +303,44 @@ msgstr ""
"За да се задоволат зависностите, ќе се инсталираат следниве %d пакети:\n"
"%s\n"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, fuzzy, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "%d пакети"
msgstr[1] "%d пакети"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Инсталација на пакетот..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "не можам да ги добија изворните пакети, прекинувам"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Се подготвувам..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Инсталирам пакет `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Ве молиме внесете го медиумот именуван како \"%s\" во уредот [%s]"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Го преземам пакетот `%s'..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Завршено"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -342,28 +351,28 @@ msgstr ""
"%s\n"
"Можеби сакате да ја ажурирате вашата urpmi база на податоци"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Инсталацијата не успеа"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Се е веќе инсталирано"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Инсталирањето заврши"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "отстранувам %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "рестартирам urpmi"
@@ -402,7 +411,7 @@ msgstr " стандардните се %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -g - испишува групу заедно со имињата.\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Само суперкорисникот има дозвола за инсталирање на пакети"
@@ -412,134 +421,143 @@ msgstr "Само суперкорисникот има дозвола за ин
msgid "Running urpmi in restricted mode..."
msgstr "urpmi се вклучува во затворен режим.."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "Не можам да го создадам директориумот [%s] за извештај на бубачка"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "Го преземам пакетот `%s'..."
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "употребувам одредена околина на %s\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "не можам да отворам rpmdb"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "невалидно име на rpm датотеката [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "преземам rpm датотека [%s] ..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...преземањето заврши"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...преземањето не успеа: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "не можам да пристапам до rpm датотеката [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "не можам да пренесам \"%s\" во датотека [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "не можам да ја регистрирам rpm датотеката"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "грешка при регистрирање на локалните пакети"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Оваа акција не е дозволена додека работи во затворен режим"
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "лоша декларација на прокси во командната линија\n"
-#: ../urpm/args.pm:298
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: не можам да ја прочитам rpm датотеката \"%s\"\n"
-#: ../urpm/args.pm:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Недостасува потпис (%s)"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Копирањето не успеа"
@@ -586,122 +604,122 @@ msgstr ""
msgid "unable to write config file [%s]"
msgstr "не можам да запишам конфигурациона датотека [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr ""
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Ве молиме внесете ги вашите податоци за пристапување на прокси\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Корисничко име:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Лозинка:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr ""
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr ""
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, fuzzy, c-format
msgid "copy failed"
msgstr "Копирањето не успеа"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, fuzzy, c-format
msgid "wget is missing\n"
msgstr "поради недостаток на %s"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, fuzzy, c-format
msgid "curl is missing\n"
msgstr "поради недостаток на %s"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr ""
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr ""
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr ""
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr ""
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr ""
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "поради недостаток на %s"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr ""
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, fuzzy, c-format
msgid "retrieving %s"
msgstr "отстранувам %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...преземањето не успеа: %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "непознат протокол дефиниран за %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr ""
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "не е пронајдено преземање од веб, поддржани преземања од веб се: %s\n"
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "не можам да ракувам со протоколот: %s"
@@ -721,12 +739,12 @@ msgstr "пакетот %s не е пронајден."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "преземам rpm датотеки од медиумот \"%s\"..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -734,47 +752,47 @@ msgstr ""
"создадена трансакција за инсталирање на %s (отстрани=%d, инсталирај=%d, "
"ажурирај=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "не можам да создадам трансакција"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "не можам да екстрактирам rpm од delta-rpm пакетот %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "не можам да го инсталирам пакетот %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "инсталирање на %s од %s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "...преземањето не успеа: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "го отстранувам пакетот %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "го отстранувам пакетот %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "инсталирање на %s од %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Повеќе информации за пакетот %s"
@@ -819,90 +837,80 @@ msgstr "Предупредување"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Инсталацијата не успеа"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Инсталацијата не успеа"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Следниве пакети имаат лоши потписи"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Следниве пакети имаат лоши потписи"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Дали сакате да продолжите со инсталацијата ?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "инсталирање на %s од %s"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "дистрибуирам %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "инсталирање на %s од %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "инсталирам %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Обидете се со инсталација без проверка на зависности? (y/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Обидете се инсталација дури уште посилно (--force)? (y/N) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Возможна е инсталација"
#: ../urpm/md5sum.pm:26
-#, fuzzy, c-format
-msgid "examining %s file"
-msgstr "испитување на датотеката MD5SUM"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "предупредување: md5sum за %s е недостапен во MD5SUM датотеката"
@@ -980,230 +988,230 @@ msgstr "пакетот %s ќе се инсталира наместо да се
msgid "medium \"%s\" already exists"
msgstr "медиумот \"%s\" веќе постои"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "ги читам заглавјата од медиумот \"%s\""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "го отстранувам медиумот \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr ""
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "не можам да отворам rpmdb"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"не можам да пристапам на првиот медиум за инсталација (не е пронајдена "
"датотека на hdlist)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "преземам датотека на hdlist..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "се обидувам да изберем непостоечки медиум \"%s\""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "избирам повеќе медиуми: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "го отстранувам медиумот \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "реконфигурирање на urpmi за медиумот \"%s\""
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...реконфигурирањето не успеа"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "реконфигурирањето заврши"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "не е избран медиумот \"%s\""
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "ја испитувам датотеката synthesis [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "проблем при читање на датотеката synthesis на медиумот \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "запишувам датотека со листа за медиумот \"%s\""
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...копирањето не успеа"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "се копира датотеката за опис на \"%s\"..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...копирањето заврши"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "копирањето на [%s] не успеа (датотеката е премногу мала)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "пресметувам md5sum на преземаниот изворен hdlist (или synthesis)"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "копирањето на [%s] не успеа (md5sum не се совпаѓа)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "ја испитувам датотеката hdlist [%s]"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "инсталирање на %s од %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "не е пронајдена hdlist датотека за медиумот \"%s\""
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "се копира датотеката за опис на \"%s\"..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "невалидно име на rpm датотеката [%s]"
-#: ../urpm/media.pm:1461
-#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "преземам изворен hdlist (или synthesis) на \"%s\"..."
-
-#: ../urpm/media.pm:1478
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "пронајден е пробан hdlist (или synthesis) како %s"
+msgid "no metadata found for medium \"%s\""
+msgstr "не е пронајдена hdlist датотека за медиумот \"%s\""
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "не е пронајдена hdlist датотека за медиумот \"%s\""
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "преземам изворен hdlist (или synthesis) на \"%s\"..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "испитувам датотека со јавен клуч од \"%s\"..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...внесен клуч %s од датотека со јавен клуч од \"%s\""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "не можам да внесам датотека со јавен клуч од \"%s\""
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "не е пронајдена hdlist датотека за медиумот \"%s\""
+
+#: ../urpm/media.pm:1612
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "додаден медиум %s"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "читам rpm датотеки од [%s]"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1274,7 +1282,7 @@ msgstr ""
msgid "TB"
msgstr ""
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1650,11 +1658,6 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "употребувам одредена околина на %s\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1670,118 +1673,136 @@ msgstr "изградена е hdlist synthesis датотека за медиу
msgid "no xml-info available for medium \"%s\""
msgstr "запишувам датотека со листа за медиумот \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Нема пакет именуван како %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Следниве пакети содржат %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Се е веќе инсталирано"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Се е веќе инсталирано"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Се е веќе инсталирано"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "поради недостаток на %s"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "Се е веќе инсталирано"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "поради незадоволени %s"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "се обидувам да промовирам %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "за да се задржи %s"
#: ../urpm/select.pm:607
+#, fuzzy, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Следниве пакети треба да се отстранат за да други се надоградат:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Следниве пакети треба да се отстранат за да други се надоградат:\n"
+"%s"
+
+#: ../urpm/select.pm:635
#, c-format
msgid "in order to install %s"
msgstr "за да се инсталира %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "поради конфликти со %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Невалиден потпис (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Невалиден ID на клучот (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Недостасува потпис (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "Не може да се направи конфигурациона датотека [%s]"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "Копирањето не успеа"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "Копирањето не успеа"
@@ -1822,7 +1843,7 @@ msgstr " --test - проверете дали отстранување
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - дистрибуиран urpmi низ машини со прекари.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr ""
@@ -1854,7 +1875,7 @@ msgstr ""
"корисно\n"
" за (де)инсталирање на chroot со опцијата --root.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - опширен режим.\n"
@@ -1923,7 +1944,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "го отстранувам пакетот %s"
msgstr[1] "го отстранувам пакетот %s"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (y/N) "
@@ -2194,17 +2215,22 @@ msgstr " --url - го испишува тагот на url: url.\n"
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - го испишува тагот на описот: опис.\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - го испишува тагот на конфликти: сите конфликти.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - инсталација на пакети што треба да се прескокне\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, fuzzy, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --skip - инсталација на пакети што треба да се прескокне\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2214,74 +2240,74 @@ msgstr ""
"избори\n"
" отколку стандарниот.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - не ги бриши rpm пакетите од кешот.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - надградува само пакети со иста архитектура.\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - избери ги сите совпаѓања на командната линија.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - тивок режим.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --verbose - опширен режим.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
" имињата или rpm датотеките дадени на командната линија ќе бидат "
"инсталирани.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
"Што може да се направи со бинарните rpm датотеки кога се користи --install-"
"src"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2290,17 +2316,12 @@ msgstr ""
"Директориумот [%s] веќе постои, ве молиме користете друг директориум за "
"пријавување на бубачка или избришете го"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Не можам да го создадам директориумот [%s] за извештај на бубачка"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2309,36 +2330,36 @@ msgstr ""
"Грешка: %s изгледа дека е монтиран само за читање.\n"
"Користете --allow-force за да принудете операцијата."
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (за надоградување)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (за надоградување)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (за инсталирање)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (за инсталирање)"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2347,12 +2368,12 @@ msgstr ""
"За да се задоволат зависностите, следниве %d пакети ќе бидат отстранети (%d "
"MB)"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Кој е вашиот избор? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2363,7 +2384,7 @@ msgstr ""
"кои се постари од инсталираните:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2374,19 +2395,19 @@ msgstr ""
"кои се постари од инсталираните:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Продолжуваме?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (D/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2395,7 +2416,7 @@ msgstr ""
"Некои од бараните пакети не можат да се инсталираат:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2404,12 +2425,12 @@ msgstr ""
"Некои од бараните пакети не можат да се инсталираат:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "отстранувањето на пакетот %s ќе го растури вашиот систем"
-#: ../urpmi:551
+#: ../urpmi:538
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2420,7 +2441,7 @@ msgstr ""
"треба да се отстранат за да други се надоградат:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2431,30 +2452,12 @@ msgstr ""
"треба да се отстранат за да други се надоградат:\n"
"%s\n"
-#: ../urpmi:560
-#, fuzzy, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Следниве пакети треба да се отстранат за да други се надоградат:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Следниве пакети треба да се отстранат за да други се надоградат:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2464,7 +2467,7 @@ msgstr ""
"Треба да се root за да ги инсталирате следниве зависности:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
@@ -2475,39 +2478,39 @@ msgstr[1] ""
"За да се задоволат зависностите, следниве %d пакети ќе бидат отстранети (%d "
"MB)"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Откажи"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Притиснете Ентер кога сте подготвени..."
@@ -3269,6 +3272,14 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Не е пронајдена измена на евиденцијата\n"
+#, fuzzy
+#~ msgid "examining %s file"
+#~ msgstr "испитување на датотеката MD5SUM"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "пронајден е пробан hdlist (или synthesis) како %s"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - креирај ажуриран медиум.\n"
diff --git a/po/mn.po b/po/mn.po
index f88b5d8c..5b17a822 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+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"
@@ -28,7 +28,7 @@ msgstr "Суулгалтын бэлтгэл"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Ок"
@@ -76,7 +76,7 @@ msgstr "_Суулгах"
msgid "_Save"
msgstr "_Хадгалах"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Хүчингүй"
@@ -108,9 +108,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - Энэ тусламжийг хэвлэх.\n"
@@ -143,17 +142,17 @@ msgstr ""
"\n"
" үгүй бол"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, fuzzy, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr "ямх"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, fuzzy, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr "ямх"
@@ -191,7 +190,22 @@ msgstr "Хүлээнэ үү."
msgid "Must be root"
msgstr ""
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "%s-ийг суулгаж байна\n"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Багц суулгалт..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Багц суулгалт..."
+
+#: ../gurpmi2:111
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -204,37 +218,37 @@ msgstr "г с вы?"
msgid "Warning"
msgstr "Анхааруулга"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Ок"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr ""
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, fuzzy, c-format
msgid " (to install)"
msgstr "ямх"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Дараах багцуудын нэг нь шаардлагатай:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, fuzzy, c-format
msgid "_Abort"
msgstr "Таслах"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -242,61 +256,56 @@ msgid ""
"Continue installation anyway?"
msgstr "г с вы?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Дараах багцууд суулгагдах гэж байна"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Дараах багцууд суулгагдах гэж байна"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, fuzzy, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "Тааруухан багц"
msgstr[1] "Тааруухан багц"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Багц суулгалт..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, fuzzy, c-format
msgid "unable to get source packages, aborting"
msgstr "%s багцийг устгаж болсонгүй"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Бэлдэж байна..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "`%s' (%s/%s) багцийг суулгаж байна..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "с с"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "`%s' багцыг татан авч байна..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, fuzzy, c-format
msgid "_Done"
msgstr "Биелэгдэв"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -307,28 +316,28 @@ msgstr ""
"%s\n"
"Та магадгүй urpmi баазаа шинэчлэх хэрэгтэй байх"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Суулгалтын асуудал"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Бүх зүйл хэдийн суусан байна"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, fuzzy, c-format
msgid "Installation finished"
msgstr "Суулгалт боломжтой"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, fuzzy, c-format
msgid "removing %s"
msgstr "%s-г устгаж байна"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr ""
@@ -365,7 +374,7 @@ msgstr " --list - боломжтой багцуудын жагсаал
msgid " -f - output rpm full name (NVRA)\n"
msgstr " --all - бүх тагуудыг хэвлэх.\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, fuzzy, c-format
msgid "Only superuser is allowed to install packages"
msgstr "%s багцийг суулгаж болсонгүй"
@@ -375,134 +384,143 @@ msgstr "%s багцийг суулгаж болсонгүй"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "с"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "`%s' багцыг татан авч байна..."
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, fuzzy, c-format
+msgid "using specific environment on %s\n"
+msgstr "с"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "rpmdb-г нээж болсонгүй"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "буруу rpm файлын нэр [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "rpm файлыг хүлээн авч байна [%s] ..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...хүлээн авалт дууслаа"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...хүлээн авалт бүтэлгүйтлээ: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "[%s] rpm файл руу хандаж болсонгүй"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "[%s] rpm файл руу хандаж болсонгүй"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "rpm файлыг бүртгэж болсонгүй"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, fuzzy, c-format
msgid "error registering local packages"
msgstr "локал"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "тушаалын мөрөнд буруу proxy зарлалт\n"
-#: ../urpm/args.pm:298
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: rpm файлыг уншиж чадахгүй \"%s\"\n"
-#: ../urpm/args.pm:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr ""
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Хуулалт бүтэлгүйтэв"
@@ -549,122 +567,122 @@ msgstr ""
msgid "unable to write config file [%s]"
msgstr "[%s] тохируулгын файлыг бичиж болсонгүй"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr ""
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr ""
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr ""
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Нууц үг:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr ""
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr ""
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, fuzzy, c-format
msgid "copy failed"
msgstr "Хуулалт бүтэлгүйтэв"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, c-format
msgid "wget is missing\n"
msgstr ""
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, c-format
msgid "curl is missing\n"
msgstr ""
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr ""
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr ""
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr ""
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr ""
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr ""
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, c-format
msgid "aria2 is missing\n"
msgstr ""
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr ""
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, fuzzy, c-format
msgid "retrieving %s"
msgstr "%s-г устгаж байна"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...хүлээн авалт бүтэлгүйтлээ: %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "%s-ийн хувьд үл мэдэгдэх протокол тодорхойлогдсон"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr ""
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr ""
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, fuzzy, c-format
msgid "unable to handle protocol: %s"
msgstr "%s багцийг суулгаж болсонгүй"
@@ -684,58 +702,58 @@ msgstr "с бол."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "rpm файлыг хүлээн авч байна [%s] ..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, fuzzy, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr "с"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, fuzzy, c-format
msgid "unable to create transaction"
msgstr "ssh таних тэмдэг үүсгэх боломжгүй"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "%s багцийг устгаж болсонгүй"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "%s багцийг суулгаж болсонгүй"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "%s-ийг суулгаж байна\n"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "...хүлээн авалт бүтэлгүйтлээ: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "%s багцийг устгалт"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "%s багцийг устгалт"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "%s-ийг суулгаж байна\n"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, fuzzy, c-format
msgid "More information on package %s"
msgstr "%s багцийг устгалт"
@@ -780,90 +798,80 @@ msgstr "Анхааруулга"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, fuzzy, c-format
msgid "Installation failed"
msgstr "Суулгалтын асуудал"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Суулгалтын асуудал"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Дараах багцууд суулгагдах гэж байна"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, fuzzy, c-format
msgid "The following packages have bad signatures"
msgstr "Дараах багцууд суулгагдах гэж байна"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Та суулгалтыг үргэлжлүүлэхийг хүсэж байна уу?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "%s-ийг суулгаж байна\n"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, fuzzy, c-format
msgid "distributing %s"
msgstr "%s-ийг суулгаж байна\n"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "%s-ийг суулгаж байна\n"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, fuzzy, c-format
msgid "installing %s"
msgstr "%s-ийг суулгаж байна\n"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Хамаарлыг шалгахгүйгээр суулгахыг оролдох уу? (y/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Reyna т N "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Суулгалт боломжтой"
#: ../urpm/md5sum.pm:26
-#, fuzzy, c-format
-msgid "examining %s file"
-msgstr "MD5SUM файлыг шалгаж байна"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr ""
@@ -935,228 +943,228 @@ msgstr "%s багцийг устгаж болсонгүй"
msgid "medium \"%s\" already exists"
msgstr "с"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "с"
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "%s багцийг устгалт"
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr ""
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "rpmdb-г нээж болсонгүй"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "үгүй"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "hdlists файлыг хүлээн авч байна..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, fuzzy, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "с"
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, fuzzy, c-format
msgid "selecting multiple media: %s"
msgstr "с"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, fuzzy, c-format
msgid "removing medium \"%s\""
msgstr "%s багцийг устгалт"
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "с."
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "Цэсний тохируулга хадгалагдсан"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "Серверийн тохируулга"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "с бол"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, fuzzy, c-format
msgid "examining synthesis file [%s]"
msgstr "MD5SUM файлыг шалгаж байна"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, fuzzy, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "аас с"
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "жигсаалт с"
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...хуулалт бүтэлгүйтэв"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, fuzzy, c-format
msgid "copying description file of \"%s\"..."
msgstr "Тодорхойлолт аас с."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...хуулждууслаа"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "аас с"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "аас"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "аас с"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "hdlist [%s]-ийг байгуулж байна"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "%s-ийг суулгаж байна\n"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "[%s]-ээс ямар нэг rpm олдсонгүй"
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "Тодорхойлолт аас с."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "буруу rpm файлын нэр [%s]"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "hdlists файлыг хүлээн авч байна..."
-
-#: ../urpm/media.pm:1478
-#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "аас с."
+msgid "no metadata found for medium \"%s\""
+msgstr "[%s]-ээс ямар нэг rpm олдсонгүй"
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "[%s]-ээс ямар нэг rpm олдсонгүй"
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "hdlists файлыг хүлээн авч байна..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, fuzzy, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "\"%s\" хэвлэгчийн устгаж байна..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, fuzzy, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "%s файлыг нээж болохгүй байна\n"
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, fuzzy, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "%s файлыг нээж болохгүй байна\n"
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "[%s]-ээс ямар нэг rpm олдсонгүй"
+
+#: ../urpm/media.pm:1612
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "%s файлыг нээж болохгүй байна\n"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "[%s]-ээс ямар нэг rpm олдсонгүй"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "NnүҮ"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1227,7 +1235,7 @@ msgstr ""
msgid "TB"
msgstr ""
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1583,11 +1591,6 @@ msgstr "нэр"
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, fuzzy, c-format
-msgid "using specific environment on %s\n"
-msgstr "с"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1603,118 +1606,132 @@ msgstr "с"
msgid "no xml-info available for medium \"%s\""
msgstr "жигсаалт с"
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, fuzzy, c-format
msgid "No package named %s"
msgstr "%s нэртэй багц байхгүй байна"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Дараах багцууд %s: %s-ийг агуулж байна"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Бүх зүйл хэдийн суусан байна"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Бүх зүйл хэдийн суусан байна"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Бүх зүйл хэдийн суусан байна"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr ""
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "Бүх зүйл хэдийн суусан байна"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, fuzzy, c-format
msgid "trying to promote %s"
msgstr "Юу ч үгүй"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, fuzzy, c-format
msgid "in order to keep %s"
msgstr "ямх"
#: ../urpm/select.pm:607
#, fuzzy, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr "Дараах багцууд суулгагдах гэж байна"
+
+#: ../urpm/select.pm:608
+#, fuzzy, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr "Дараах багцууд суулгагдах гэж байна"
+
+#: ../urpm/select.pm:635
+#, fuzzy, c-format
msgid "in order to install %s"
msgstr "%s багцийг суулгаж болсонгүй"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr ""
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr ""
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr ""
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr ""
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "[%s] тохируулгын файлыг бичиж болсонгүй"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "Хуулалт бүтэлгүйтэв"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "Хуулалт бүтэлгүйтэв"
@@ -1756,7 +1773,7 @@ msgstr ""
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr "аас"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --list - боломжтой багцуудын жагсаалт.\n"
@@ -1783,7 +1800,7 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr "Нарийвчилан харах бол Esc товч дарна уу"
@@ -1847,7 +1864,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "%s багцийг устгалт"
msgstr[1] "%s багцийг устгалт"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (y/N) "
@@ -2087,152 +2104,152 @@ msgstr " --all - бүх тагуудыг хэвлэх.\n"
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr "Тодорхойлолт Тодорхойлолт Тодорхойлолт"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --all - бүх тагуудыг хэвлэх.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr ""
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:146
+#: ../urpmi:147
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr "ямх"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, fuzzy, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -c - түр санах ойн хавтасын толгойг цэвэрлэх.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --all - бүх тагуудыг хэвлэх.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr "Нарийвчилан харах бол Esc товч дарна уу"
-#: ../urpmi:154
+#: ../urpmi:155
#, fuzzy, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr "Нээх"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "Хийгдсэн"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr ""
-#: ../urpmi:253
+#: ../urpmi:254
#, fuzzy, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "с"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr ""
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "ямх"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "ямх"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "тийш МБ"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Таны сонголт юу бэ? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2240,7 +2257,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2248,38 +2265,38 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Ямар ч байсан үргэлжлүүлэх үү?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (Y/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
"%s"
msgstr "Бүх зүйл хэдийн суусан байна"
-#: ../urpmi:525
+#: ../urpmi:513
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s"
msgstr "Бүх зүйл хэдийн суусан байна"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "%s багцийг устгах нь таны системийн ажиллагааг таслах болно"
-#: ../urpmi:551
+#: ../urpmi:538
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2287,7 +2304,7 @@ msgid ""
"%s\n"
msgstr "г с вы?"
-#: ../urpmi:553
+#: ../urpmi:540
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2295,26 +2312,12 @@ msgid ""
"%s\n"
msgstr "г с вы?"
-#: ../urpmi:560
-#, fuzzy, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr "Дараах багцууд суулгагдах гэж байна"
-
-#: ../urpmi:561
-#, fuzzy, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr "Дараах багцууд суулгагдах гэж байна"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2322,46 +2325,46 @@ msgid ""
"%s\n"
msgstr "Та г с"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "тийш МБ"
msgstr[1] "тийш МБ"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Хүчингүй"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Бэлэн болонгуут Enter товчоо дарна уу..."
@@ -3061,6 +3064,14 @@ msgid "No changelog found\n"
msgstr "Зураг олдсонгүй"
#, fuzzy
+#~ msgid "examining %s file"
+#~ msgstr "MD5SUM файлыг шалгаж байна"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "аас с."
+
+#, fuzzy
#~ msgid " --update - create an update medium.\n"
#~ msgstr "„mdkupdate“ хэрэгслээс багцуудыг шинэчилэхэд алдаа.\n"
diff --git a/po/ms.po b/po/ms.po
index e508740c..106501d0 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+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"
@@ -25,7 +25,7 @@ msgstr "Pemasangan RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -78,7 +78,7 @@ msgstr "_Pasang"
msgid "_Save"
msgstr "_Simpan"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Batal"
@@ -109,9 +109,8 @@ msgstr ""
msgid "Options:"
msgstr "<b>Pilihan</b>"
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - cetak mesej bantuan ini.\n"
@@ -142,17 +141,17 @@ msgid ""
" (--no-verify-rpm disables it, default is enabled).\n"
msgstr ""
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, fuzzy, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --update - guna hanya kemaskini media.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - izinkan carian dlm sediaada utk mencari pakej.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - jangan cari dalam tersedia utk mencari pakej.\n"
@@ -190,7 +189,22 @@ msgstr "Sila tunggu..."
msgid "Must be root"
msgstr "Mesti menjadi root"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "Mulakan %s:"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Pemasangan pakej..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Pemasangan pakej..."
+
+#: ../gurpmi2:111
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -203,37 +217,37 @@ msgstr "semua telah diinstal"
msgid "Warning"
msgstr "Amaran"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (untuk naiktaraf)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (untuk memasang)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Pilihan pakej"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Salah satu pakej berikut diperlukan:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Batal"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -244,13 +258,13 @@ msgstr ""
"%s\n"
"Teruskan?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Pakej berikut akan dihapus agar syarat kebergantungan dipenuhi (%d MB)"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -258,49 +272,44 @@ msgstr ""
"Untuk memenuhi kebergantungan, %d pakej berikut perlu dipasang:\n"
"%s\n"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, fuzzy, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "_Saiz (MB):"
msgstr[1] ""
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Pemasangan pakej..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "tidak dapat mengambil pakej asal, batal"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Menyediakan..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Install pakej `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Sila tunggu, mengeluarkan medium..."
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Memuatturun pakej `%s'..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Selesai"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -308,28 +317,28 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Instalasi gagal"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "semua telah diinstal"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Pemasangan selesai"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "membuang %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, fuzzy, c-format
msgid "restarting urpmi"
msgstr "Tambah media urpmi"
@@ -367,7 +376,7 @@ msgstr " default adalah %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - cetak versi, keluaran dan arch dgn nama.\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Hanya superuser yang boleh menginstal pakej"
@@ -377,134 +386,143 @@ msgstr "Hanya superuser yang boleh menginstal pakej"
msgid "Running urpmi in restricted mode..."
msgstr "Melaksanakan urpmi dalam mod terhad..."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "gagal untuk mencipta direktori %s: %s\n"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, fuzzy, c-format
msgid "invalid owner for directory %s"
msgstr "Nilai baru utk direktori: %s\n"
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "Memuatturun pakej `%s'..."
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, fuzzy, c-format
+msgid "Environment directory %s does not exist"
+msgstr "Direktori didalam nama path yang diberi tidak wujud."
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, fuzzy, c-format
+msgid "using specific environment on %s\n"
+msgstr "Mencipta swap dienkrip pada %s using %s:"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "tidak dapat membuka rpmdb"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nama fail rpm [%s] tidak sah"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "mengambil fail rpm [%s] ..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...capaian selesai"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...gagal terambil: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "gagal akses fail rpm [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "tidak dapat menghurai \"%s\" dalam fail [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "tidak dapat mendaftarkan fail rpm"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, fuzzy, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr " --root - guna root lain untuk membuang rpm.\n"
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "ralat pendaftaran pakej setempat"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr ""
-#: ../urpm/args.pm:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, fuzzy, c-format
msgid "unexpected expression %s"
msgstr "hujah tidak dijangka"
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "12 pt sebelum"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, fuzzy, c-format
msgid "no expression to close"
msgstr "Ungkapan corak:\n"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, fuzzy, c-format
msgid "Can't use %s without %s"
msgstr "Tutup Tanpa Simpan"
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, fuzzy, c-format
msgid "Can't use %s with %s"
msgstr "hidupkan penggunaan TLS dengan LDAP"
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, fuzzy, c-format
msgid "Too many arguments\n"
msgstr "%s: terlalu banyak hujah\n"
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, fuzzy, c-format
msgid "Copying failed"
msgstr "...gagal menyalin"
@@ -551,122 +569,122 @@ msgstr ""
msgid "unable to write config file [%s]"
msgstr "gagal tulis fail konfigurasi [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr ""
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr ""
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Nama pengguna:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Katalaluan:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, fuzzy, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr "Hos tidak diketahui"
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr ""
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, fuzzy, c-format
msgid "%s failed: exited with %d"
msgstr "Aksara (dengan ruang):"
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, fuzzy, c-format
msgid "copy failed"
msgstr "Sambungan Gagal"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, fuzzy, c-format
msgid "wget is missing\n"
msgstr "kerana kehilangan %s"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, fuzzy, c-format
msgid "curl is missing\n"
msgstr "kerana kehilangan %s"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr ""
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, fuzzy, c-format
msgid "rsync is missing\n"
msgstr "kerana kehilangan %s"
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, fuzzy, c-format
msgid "ssh is missing\n"
msgstr "kerana kehilangan %s"
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, fuzzy, c-format
msgid "prozilla is missing\n"
msgstr "kerana kehilangan %s"
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, fuzzy, c-format
msgid "Couldn't execute prozilla\n"
msgstr "Laksana skrip bantuan"
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "kerana kehilangan %s"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, fuzzy, c-format
msgid " %s%% completed, speed = %s"
msgstr "Muatturun `%s', kelajuan:%s"
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, fuzzy, c-format
msgid "retrieving %s"
msgstr "Menerima"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "%s tidak diambil... "
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "tiada protokol ditakrif untuk `%s'"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr ""
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "tiada webfetch dijumpai, webfetch yang disokong adalah: %s\n"
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "tidak dapat mengawal protokol: %s"
@@ -686,58 +704,58 @@ msgstr "pakej %s tidak dijumpai."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "mendapatkan fail rpm dari media \"%s\"..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "tidak dapat mencipta transaksi"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "tidak dapat mengekstrak rpm daripada pakej delta-rpm %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "tidak dapat memasang pakej %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "mendapatkan fail rpm dari media \"%s\"..."
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "Sambungan Gagal"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "membuang pakej %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "membuang pakej %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "Sahkan RPM untuk dipasang:"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Lebih maklumat pada pakej %s"
@@ -782,25 +800,25 @@ msgstr "@r adalah bukan @d; menghentikan.\n"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Instalasi gagal"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Instalasi gagal"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr ""
@@ -808,67 +826,57 @@ msgstr ""
" pakej berikut berjaya:\n"
"\n"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, fuzzy, c-format
msgid "The following packages have bad signatures"
msgstr "Salah satu pakej berikut diperlukan:"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "Do you want to continue installation ?"
msgstr "Adakah anda pasti untuk meneruskan"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "Sahkan RPM untuk dipasang:"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, fuzzy, c-format
msgid "distributing %s"
msgstr "Mulakan %s:"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "Dari Fail"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, fuzzy, c-format
msgid "installing %s"
msgstr "Memasang %s\n"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Cuba instalasi tanpa periksa kebergantungan? (y/T) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Cuba instalasi lebih keras (--force)? (y/T) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, fuzzy, c-format
msgid "Installation is possible"
msgstr "Pemasangan sekecil mungkin"
#: ../urpm/md5sum.pm:26
-#, fuzzy, c-format
-msgid "examining %s file"
-msgstr "periksa file sintesis [%s]"
-
-#: ../urpm/md5sum.pm:27
-#, fuzzy, c-format
-msgid "invalid MD5SUM file"
-msgstr "nama fail rpm [%s] tidak sah"
-
-#: ../urpm/md5sum.pm:28
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr ""
@@ -940,228 +948,228 @@ msgstr "tidak dapat membuang pakej %s"
msgid "medium \"%s\" already exists"
msgstr "media \"%s\" telah ada"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, fuzzy, c-format
msgid "(ignored by default)"
msgstr "hidupkan katalaluan bayang secara default"
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "Gagal apabila menambah media"
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "Menambah media:"
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, fuzzy, c-format
msgid "directory %s does not exist"
msgstr "Partisyen Diminta Tidak Wujud"
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "tidak dapat menghurai \"%s\" dalam fail [%s]"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "gagal mengakses media instalasi pertama (fail hdlists tidak dijumpai)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "ambil fail hdlist..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "cubaan untuk memilih media tidak wujud \"%s\""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "memilih pelbagai media: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "hapus media \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "mengulangtetap urpmi untuk media \"%s\""
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...gagal mengulangtetap"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "selesai ulangtetap"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "media \"%s\" tidak dipilih"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "periksa file sintesis [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "masalah membaca fail sintesis untuk media \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "Medium Boleh Buang Terlekap"
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...gagal menyalin"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "fail deskripsi \"%s\" sedang disalin"
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...salin selesai"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "salinan [%s] gagal (md5sum tidak sepadan)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "mengira md5sum salinan sumber hdlist (atau sintesis)"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "salinan [%s] gagal (md5sum tidak sepadan)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "dikemaskini pada %(date)s"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "Membaca dan membanding:"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "fail hdlist utk media \"%s\" tak dijumpai"
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "fail deskripsi \"%s\" sedang disalin"
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "nama fail rpm [%s] tidak sah"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "periksa file sintesis [%s]"
-
-#: ../urpm/media.pm:1478
-#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "menjumpai hdlist dikesan (atau sintesis) seperti %s"
+msgid "no metadata found for medium \"%s\""
+msgstr "fail hdlist utk media \"%s\" tak dijumpai"
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "fail hdlist utk media \"%s\" tak dijumpai"
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "periksa file sintesis [%s]"
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "memeriksa fail pubkey \"%s\"..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, fuzzy, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "tidak dapat mengimport fail pubkey \"%s\""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "tidak dapat mengimport fail pubkey \"%s\""
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "fail hdlist utk media \"%s\" tak dijumpai"
+
+#: ../urpm/media.pm:1612
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "Tambah medium"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, fuzzy, c-format
msgid "retrieval of [%s] failed"
msgstr "Sambungan Gagal"
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "Pilih dokumen dari senarai:"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "NnTt"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1232,7 +1240,7 @@ msgstr "GB"
msgid "TB"
msgstr "TB"
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1585,11 +1593,6 @@ msgstr " -f - cetak versi, keluaran dan arch dgn nama.\n"
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, fuzzy, c-format
-msgid "using specific environment on %s\n"
-msgstr "Mencipta swap dienkrip pada %s using %s:"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1605,118 +1608,138 @@ msgstr "Tiada status tersedia utk pakej ini\n"
msgid "no xml-info available for medium \"%s\""
msgstr "menulis senarai fail untuk media \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Tiada pakej bernama %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Pakej berikut mengandungi %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "semua telah diinstal"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "semua telah diinstal"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "semua telah diinstal"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "kerana kehilangan %s"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "semua telah diinstal"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "kerana ketidakpuasan %s"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "cuba untuk menaikkan %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "untuk menyimpan %s"
#: ../urpm/select.pm:607
+#, fuzzy, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Pakej berikut perlu dibuang untuk yang lain dinaiktaraf:\n"
+"%s\n"
+"Teruskan?"
+
+#: ../urpm/select.pm:608
+#, fuzzy, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Pakej berikut perlu dibuang untuk yang lain dinaiktaraf:\n"
+"%s\n"
+"Teruskan?"
+
+#: ../urpm/select.pm:635
#, c-format
msgid "in order to install %s"
msgstr "untuk memasang %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "kerana konflik dengan %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Tandatangan tidak sah (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Kekunci ID tidak sah (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Tandatangan tiada (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, fuzzy, c-format
msgid "system"
msgstr "Sistem"
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, fuzzy, c-format
msgid "You should restart %s for %s"
msgstr "Anda mesti nyatakan label bagi kemasukan"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "Tidak dapat menulis kepada fail %s"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "tidak dapat membuka fail `%s'"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "Fail untuk menyimpan suntingan:"
@@ -1757,7 +1780,7 @@ msgstr ""
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr "Tidak dapat menulis tag!"
@@ -1784,7 +1807,7 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - mod verbos.\n"
@@ -1852,7 +1875,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "Buang kekunci"
msgstr[1] "membuang pakej %s"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (y/T) "
@@ -2086,140 +2109,140 @@ msgstr "Rekabentuk Sasaran:"
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr "Pakej Hilang"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - papar konflik.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr ""
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:146
+#: ../urpmi:147
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - jaga rpm tidak dipakai dalam kache.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - pilih semua yg sama dgn baris perintah.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - mod diam.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --verbose - mod verbos.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, fuzzy, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " dicarikan nama atau fail rpm yg tertera pada baris perintah.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, fuzzy, c-format
msgid "defaulting to --buildrequires"
msgstr "&Lompat ke hiperlink"
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr ""
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr ""
-#: ../urpmi:264
-#, fuzzy, c-format
-msgid "Environment directory %s does not exist"
-msgstr "Direktori didalam nama path yang diberi tidak wujud."
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:361
+#: ../urpmi:349
#, fuzzy, c-format
msgid "Updating media...\n"
msgstr "Sila tunggu, mengemaskini media..."
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (untuk naiktaraf)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (untuk naiktaraf)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (untuk memasang)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (untuk memasang)"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2228,12 +2251,12 @@ msgstr ""
"Untuk memenuhi kebergantungan, %d pakej berikut perlu dipasang:\n"
"%s\n"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Pilihan Anda? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2241,7 +2264,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2249,38 +2272,38 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Teruskan juga?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (Y/t) "
-#: ../urpmi:524
+#: ../urpmi:512
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
"%s"
msgstr "semua telah diinstal"
-#: ../urpmi:525
+#: ../urpmi:513
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s"
msgstr "semua telah diinstal"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr ""
-#: ../urpmi:551
+#: ../urpmi:538
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2291,7 +2314,7 @@ msgstr ""
"%s\n"
"Teruskan?"
-#: ../urpmi:553
+#: ../urpmi:540
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2302,32 +2325,12 @@ msgstr ""
"%s\n"
"Teruskan?"
-#: ../urpmi:560
-#, fuzzy, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Pakej berikut perlu dibuang untuk yang lain dinaiktaraf:\n"
-"%s\n"
-"Teruskan?"
-
-#: ../urpmi:561
-#, fuzzy, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Pakej berikut perlu dibuang untuk yang lain dinaiktaraf:\n"
-"%s\n"
-"Teruskan?"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2337,7 +2340,7 @@ msgstr ""
"Anda perlu menjadi root utk install kebergantungan berikutnya:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
@@ -2346,39 +2349,39 @@ msgstr[1] ""
"Untuk memenuhi kebergantungan, %d pakej berikut perlu dipasang:\n"
"%s\n"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, fuzzy, c-format
msgid "%s of packages will be retrieved."
msgstr "%s mestilah nombor"
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Batal"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Tekan <enter> untuk shell"
@@ -3101,5 +3104,17 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Tiada log perubahan dijumpai\n"
+#, fuzzy
+#~ msgid "examining %s file"
+#~ msgstr "periksa file sintesis [%s]"
+
+#, fuzzy
+#~ msgid "invalid MD5SUM file"
+#~ msgstr "nama fail rpm [%s] tidak sah"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "menjumpai hdlist dikesan (atau sintesis) seperti %s"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - buat media update.\n"
diff --git a/po/mt.po b/po/mt.po
index f9d3a8e1..5cd10e32 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+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"
@@ -31,7 +31,7 @@ msgstr "Installazzjoni tas-sistema"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -97,7 +97,7 @@ msgstr "Installa"
msgid "_Save"
msgstr "Ikteb"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "I_kkanċella"
@@ -129,9 +129,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - uri dan il-messaġġ ta' għajnuna.\n"
@@ -166,18 +165,18 @@ msgstr ""
" --verify-rpm - ivverifika l-firma tal-pakkett qabel tinstalla.\n"
" (--no-verify-rpm itfih, impliċitament mixgħul).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - uża biss is-sorsi llistjati b'virgoli.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - ippermetti tfittix fil-\"provides\" biex issib pakkett.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - tfittixx fil-\"provides\" biex issib pakkett.\n"
@@ -215,7 +214,22 @@ msgstr "Stenna ftit."
msgid "Must be root"
msgstr "Port tal-maws"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "qed jiġi distribwit %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Installazzjoni ta' pakketti..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Installazzjoni ta' pakketti..."
+
+#: ../gurpmi2:111
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -230,37 +244,37 @@ msgstr ""
msgid "Warning"
msgstr "Twissija"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "Aġġornament"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, fuzzy, c-format
msgid " (to install)"
msgstr "Oħroġ mill-installazzjoni"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Wieħed minn dawn il-pakketti huwa meħtieġ:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, fuzzy, c-format
msgid "_Abort"
msgstr "Waqqaf"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -270,7 +284,7 @@ msgstr ""
"Dawn il-pakketti jridu jitneħħew qabel oħrajn jiġu aġġornati:\n"
"%s"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
@@ -278,56 +292,51 @@ msgstr ""
"Biex nissodisfa d-dipendenzi, dawn il-pakketti jridu jiġu nstallati wkoll (%"
"d MB)"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
"Biex nissodisfa d-dipendenzi, %d pakkett/i jridu jiġu nstallati wkoll (%d MB)"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Installazzjoni ta' pakketti..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "ma nistax inġib il-pakketti tas-sors, se noħroġ"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Qed nipprepara..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Qed jiġi nstallat \"%s\" (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Jekk jogħġbok daħħal id-diska mmarkata \"%s\" fl-apparat [%s]"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Qed jitniżżel il-pakkett \"%s\"..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, fuzzy, c-format
msgid "_Done"
msgstr "Lest"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -339,28 +348,28 @@ msgstr ""
"%s\n"
"Forsi trid taġġorna d-database urpmi"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "installazzjoni falliet"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "kollox diġà installat"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Installazzjoni lesta"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "qed jitneħħa %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "qed jiġi ristartjat urpmi"
@@ -399,7 +408,7 @@ msgstr " l-istandard huwa %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -g - uri l-gruppi flimkien ma' l-isem.\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Is-\"superuser\" biss għandu l-awtorità jistalla pakketti"
@@ -409,134 +418,143 @@ msgstr "Is-\"superuser\" biss għandu l-awtorità jistalla pakketti"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "Ma nistax noħloq id-direttorju [%s] għar-rapport tal-bug"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "Qed jitniżżel il-pakkett \"%s\"..."
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "qed jintuża ambjent speċifiku fuq %s\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "ma nistax niftaħ rpmdb"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "isem tal-fajl rpm [%s] invalidu"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "qed jinġab il-fajl rpm [%s] ..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...qari lest"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...qari falla: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "ma nistax naċċessa l-fajl rpm [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "ma nistax nifli \"%s\" fil-fajl [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "ma nistax nirreġistra l-fajl rpm"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "problema fir-reġistrazzjoni ta' pakketti lokali"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "dikjarazzjoni ta' \"proxy\" ħażina fil-linja ta' kmand\n"
-#: ../urpm/args.pm:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Firma nieqsa (%s)"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Ikkupjar falla"
@@ -583,122 +601,122 @@ msgstr ""
msgid "unable to write config file [%s]"
msgstr "ma setax jinkiteb il-fajl ta' konfigurazzjoni [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr ""
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr ""
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr ""
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Password:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr ""
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr ""
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, fuzzy, c-format
msgid "copy failed"
msgstr "Ikkupjar falla"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, fuzzy, c-format
msgid "wget is missing\n"
msgstr "minħabba %s nieqes"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, fuzzy, c-format
msgid "curl is missing\n"
msgstr "minħabba %s nieqes"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr ""
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr ""
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr ""
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr ""
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr ""
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "minħabba %s nieqes"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr ""
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, fuzzy, c-format
msgid "retrieving %s"
msgstr "qed jitneħħa %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...qari falla: %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "protokoll mhux magħruf definit għal %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr ""
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "ma nstabx webfetch; webfetch aċċettati huma: %s\n"
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "ma nistax nuża l-protokoll: %s"
@@ -718,58 +736,58 @@ msgstr "pakkett %s ma nstabx."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "qed jinġabu l-fajls rpm mis-sors \"%s\"..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr "qed tinħoloq tranżazzjoni għal %s (neħħi=%d, installa=%d, aġġorna=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "ma nistax noħloq tranżazzjoni"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "ma nistax inneħħi l-pakkett %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "ma nistax ninstalla l-pakkett %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "qed jiġi nstallat %s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "...qari falla: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "ed jitneħħa l-pakkett %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "ed jitneħħa l-pakkett %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "qed jiġi nstallat %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Iżjed informazzjoni dwar pakkett %s"
@@ -814,90 +832,80 @@ msgstr "Twissija"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "installazzjoni falliet"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "installazzjoni falliet"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Dawn il-pakketti fihom firem ħżiena"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Dawn il-pakketti fihom firem ħżiena"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Trid tkompli l-installazzjoni ?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "qed jiġi nstallat %s"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "qed jiġi distribwit %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "qed jiġi nstallat %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "qed jiġi nstallat %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Trid tinstalla mingħajr ma niċċekkja d-dipendenzi? (i/L) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Trid tipprova b'iżjed qawwa (--force)? (i/L)"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Installazzjoni possibbli"
#: ../urpm/md5sum.pm:26
-#, fuzzy, c-format
-msgid "examining %s file"
-msgstr "qed jiġi eżaminat il-fajl MD5SUM"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr ""
@@ -971,230 +979,230 @@ msgstr "jaġġorna minflok jinstalla pakkett %s"
msgid "medium \"%s\" already exists"
msgstr "sors \"%s\" diġà jeżisti"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "qed naqra l-\"headers\" mis-sors \"%s\""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "qed jitneħħa s-sors \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr ""
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "ma nistax niftaħ rpmdb"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"ma nistax naċċessa l-ewwel sors ta' installazzjoni (ma nstabx il-fajl "
"hdlists)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "qed naqra l-fajl \"hdlists\"..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "qed nipprova naċċessa sors ineżistenti \"%s\""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "qed nagħżel sors multiplu: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "qed jitneħħa s-sors \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "qed jiġi rikonfigurat urpmi għas-sors \"%s\"..."
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...rikonfigurazzjoni falliet"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "rikonfigurazzjoni lesta"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "sors \"%s\" mhuwiex magħżul"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "qed jiġi eżaminat il-fajl ta' sinteżi [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problema fil-qari tas-sinteżi għas-sors \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "qed jinkiteb il-fajl b'lista għas-sors \"%s\""
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...ikkupjar falla"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "qed nikkopja l-fajl ta' deskrizzjoni ta' \"%s\""
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...ikkupjar lest"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "l-ikkuppjar tal-fajl [%s] falla (il-fajl jidher żgħir wisq)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "qed tiġi kalkulata l-md5sum għall-hdlist jew sinteżi tas-sors imniżżel"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "l-ikkuppjar tal-fajl [%s] falla (md5sum ma qablitx)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "qed jiġi eżaminat il-fajl hdlist [%s]"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "qed jiġi nstallat %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ma nstabx fajl hdlists għas-sors \"%s\""
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "qed nikkopja l-fajl ta' deskrizzjoni ta' \"%s\""
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "isem tal-fajl rpm [%s] invalidu"
-#: ../urpm/media.pm:1461
-#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "qed jinġab l-hdlist jew sinteżi sors għal \"%s\"..."
-
-#: ../urpm/media.pm:1478
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "sibt l-hdlist (jew sinteżi) bħala %s"
+msgid "no metadata found for medium \"%s\""
+msgstr "ma nstabx fajl hdlists għas-sors \"%s\""
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "ma nstabx fajl hdlists għas-sors \"%s\""
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "qed jinġab l-hdlist jew sinteżi sors għal \"%s\"..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "qed jiġi eżaminat fajl pubkey ta' \"%s\"..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...ċifrarju %s importat mill-fajl pubkey ta' \"%s\""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "ma stajtx nimporta fajl pubkey ta' \"%s\""
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "ma nstabx fajl hdlists għas-sors \"%s\""
+
+#: ../urpm/media.pm:1612
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "ġie miżjud is-sors %s"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "qed jinqraw fajls rpm minn [%s]"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "LlNn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1265,7 +1273,7 @@ msgstr ""
msgid "TB"
msgstr ""
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1626,11 +1634,6 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "qed jintuża ambjent speċifiku fuq %s\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1646,118 +1649,136 @@ msgstr "ibni l-fajl ta' sintesi tal-hdlist għas-sors \"%s\""
msgid "no xml-info available for medium \"%s\""
msgstr "qed jinkiteb il-fajl b'lista għas-sors \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Ebda pakkett imsejjaħ %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Dawn il-pakketti fihom %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "kollox diġà installat"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "kollox diġà installat"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "kollox diġà installat"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "minħabba %s nieqes"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "kollox diġà installat"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "minħabba %s mhux sodisfatt"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "qed nipprova nippromwovi %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "sabiex inżomm %s"
#: ../urpm/select.pm:607
+#, fuzzy, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Dawn il-pakketti jridu jitneħħew qabel oħrajn jiġu aġġornati:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Dawn il-pakketti jridu jitneħħew qabel oħrajn jiġu aġġornati:\n"
+"%s"
+
+#: ../urpm/select.pm:635
#, c-format
msgid "in order to install %s"
msgstr "sabiex ninstalla %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "minħabba konflitt ma' %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Firma invalida (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "ID taċ-ċifrarju invalidu (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Firma nieqsa (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "ma setax jinkiteb il-fajl [%s]"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "Ikkupjar falla"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "Ikkupjar falla"
@@ -1799,7 +1820,7 @@ msgstr " --test - ivverifika li l-installazzjoni tista' ssir sew.\n"
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - iddistribwixxi urpmi fuq il-magni ta' alias.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - uri t-tag \"packager\": pakkeġġjatur.\n"
@@ -1828,7 +1849,7 @@ msgstr ""
" --use-distrib - ikkonfigura urpmi dak il-ħin minn distrib, utli "
"biex tinstalla jew tneħħi chroot permezz ta' --root.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " -verbose - modalità b'ħafna dettalji.\n"
@@ -1894,7 +1915,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "ed jitneħħa l-pakkett %s"
msgstr[1] "ed jitneħħa l-pakkett %s"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (i/L) "
@@ -2160,19 +2181,24 @@ msgstr " --url - uri l-url.\n"
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - uri t-tag \"description\": deskrizzjoni\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - uri \"conflicts\": kull ma joħloq konflitt\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
" --skip - pakketti li l-installazzjoni tagħhom għandha tinqabeż\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, fuzzy, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr ""
" --skip - pakketti li l-installazzjoni tagħhom għandha tinqabeż\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2181,71 +2207,71 @@ msgstr ""
" --more-choices - meta jinstabu iżjed minn pakkett wieħed, ipproponi iżjed\n"
" għażliet minn dak impliċitu.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - żomm rpms mhux użati fil-cache.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - agħżel kull ma jaqbel fuq il-linja tal-kmand.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - modalità kwieta.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " -verbose - modalità b'ħafna dettalji.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
" ismijiet jew fajls rpm mogħtija fuq il-linja ta' kmand se jiġu nstallati.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "X'jista' jsir minn fajls rpm binarji meta tuża --install-src"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2254,53 +2280,48 @@ msgstr ""
"Direttorju [%s] diġà jeżisti, jekk jogħġbok agħżel direttorju ieħor għar-"
"rapport jew ħassru"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Ma nistax noħloq id-direttorju [%s] għar-rapport tal-bug"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "Aġġornament"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "Aġġornament"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "Oħroġ mill-installazzjoni"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "Oħroġ mill-installazzjoni"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2308,12 +2329,12 @@ msgid ""
msgstr ""
"Biex nissodisfa d-dipendenzi, dawn il-pakketti jridu jitneħħew ukoll (%d MB)"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "X'tagħżel? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2321,7 +2342,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2329,19 +2350,19 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Trid tkompli xorta?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (I/l) "
-#: ../urpmi:524
+#: ../urpmi:512
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2350,7 +2371,7 @@ msgstr ""
"Xi pakketti mitluba ma jistgħux jiġu nstallati:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2359,12 +2380,12 @@ msgstr ""
"Xi pakketti mitluba ma jistgħux jiġu nstallati:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "jekk tneħħi l-pakkett %s is-sistema ma tibqax taħdem sew"
-#: ../urpmi:551
+#: ../urpmi:538
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2375,7 +2396,7 @@ msgstr ""
"jitneħħew sabiex oħrajn jiġu aġġornati:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2386,30 +2407,12 @@ msgstr ""
"jitneħħew sabiex oħrajn jiġu aġġornati:\n"
"%s\n"
-#: ../urpmi:560
-#, fuzzy, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Dawn il-pakketti jridu jitneħħew qabel oħrajn jiġu aġġornati:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Dawn il-pakketti jridu jitneħħew qabel oħrajn jiġu aġġornati:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2419,7 +2422,7 @@ msgstr ""
"Trid tkun \"root\" biex tinstalla dawn id-dipendenzi:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
@@ -2428,39 +2431,39 @@ msgstr[0] ""
msgstr[1] ""
"Biex nissodisfa d-dipendenzi, dawn il-pakketti jridu jitneħħew ukoll (%d MB)"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Ikkanċella"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Agħfas Enter meta tlesti..."
@@ -3207,6 +3210,14 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Ma nstabx changelog\n"
+#, fuzzy
+#~ msgid "examining %s file"
+#~ msgstr "qed jiġi eżaminat il-fajl MD5SUM"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "sibt l-hdlist (jew sinteżi) bħala %s"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - oħloq sors ta' aġġornament.\n"
diff --git a/po/nb.po b/po/nb.po
index 90d067a8..c393e0f0 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nb\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2007-09-17 14:07+0200\n"
"Last-Translator: Per Øyvind Karlsen <peroyvind@mandriva.org>\n"
"Language-Team: Norwegian Bokmål <i18n-no@lister.ping.uio.no>\n"
@@ -36,7 +36,7 @@ msgstr "RPM-installasjon"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Feil: klarte ikke å finne fila «%s», vil avbryte operasjon."
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -102,7 +102,7 @@ msgstr "_Installer"
msgid "_Save"
msgstr "_Lagre"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Avbryt"
@@ -133,9 +133,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help – Vis denne hjelpeteksten.\n"
@@ -174,17 +173,17 @@ msgstr ""
" (Bruk «--no-verify-rpm» for å ikke kontrollere.\n"
" Standard er å kontrollere.)\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media – Bruk bare gitt medie (kommadelt liste).\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p – Tillat søk i tilbud for å finne pakke.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P – Ikke søk i tilbud for å finne pakke.\n"
@@ -222,7 +221,22 @@ msgstr "Vent litt ..."
msgid "Must be root"
msgstr "Må være root"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "Fordeler %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Pakkeinstallasjon ..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Pakkeinstallasjon ..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -238,37 +252,37 @@ msgstr ""
msgid "Warning"
msgstr "Advarsel"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "OK"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (å oppgradere)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (å installere)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Pakkevalg"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "En av følgende pakker trengs:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Avbryt"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -279,61 +293,56 @@ msgstr ""
"%s\n"
"Fortsett installasjon uansett?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "For å oppfylle avhengighet vil den følgende pakken bli installert:"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "For å oppfylle avhengigheter vil disse pakkene bli installert:"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d pakke – %d MB)"
msgstr[1] "(%d pakker– %d MB)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Pakkeinstallasjon ..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "kunne ikke få tak i kildepakker, avslutter"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Forbereder ..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Installerer pakke «%s» (%s/%s) ..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Sett inn mediumet kalt «%s» på enhet [%s]"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Laster ned pakke «%s» ..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Ferdig"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -344,28 +353,28 @@ msgstr ""
"%s\n"
"Du ønsker antageligvis å oppdatere urpmi-databasen din"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "Installasjon mislyktes:"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Pakken(e) er allerede installert"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Installasjon ferdig"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "Fjerner «%s»."
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "starter urpmi på nytt"
@@ -404,7 +413,7 @@ msgstr " Standardverdi: %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f – Vis fullt rpm-navn (NVRA).\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Bare superbruker har adgang til å installere pakker"
@@ -414,134 +423,143 @@ msgstr "Bare superbruker har adgang til å installere pakker"
msgid "Running urpmi in restricted mode..."
msgstr "Kjører urpmi i begrenset modus ..."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "Klarte ikke skrive til ompakkingsmappe [%s].\n"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, fuzzy, c-format
msgid "invalid owner for directory %s"
msgstr "Ugyldig dato eller varighet [%s].\n"
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "Klarte ikke skrive til ompakkingsmappe [%s].\n"
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr "Omgivelsekatalog %s eksisterer ikke"
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "Bruker egendefinert miljø på «%s»\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "kunne ikke åpne rpmdb"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "ugyldig rpm-filnavn [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "mottar rpm-fil [%s] ..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "... ferdig mottatt."
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "... Mottak mislykket: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "Klarte ikke lese nå rpm-fil [%s]."
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "Klarte ikke tolke spec-fil %s [%s]."
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "Klarte ikke registrere rpm-fil."
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Inkompatibel arkitektur for rpm [%s]"
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "Feil ved registrering av lokale pakker."
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Du kan ikke kjøre denne i begrenset modus."
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "Ugyldig mellomlagerklarasjon på kommandolinjen.\n"
-#: ../urpm/args.pm:298
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: Klarer ikke lese rpm-fila «%s»\n"
-#: ../urpm/args.pm:375
+#: ../urpm/args.pm:383
#, fuzzy, c-format
msgid "unexpected expression %s"
msgstr "Søkestrenguttrykk:\n"
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Mangler signatur (%s)."
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, fuzzy, c-format
msgid "no expression to close"
msgstr "Søkestrenguttrykk:\n"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "«chroot»-mappa finnes ikke."
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr "Kan ikke bruke «%s» uten «%s»."
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr "Kan ikke bruke «%s» med «%s»."
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr "For mange argumenter\n"
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Mislykket kopiering."
@@ -588,123 +606,123 @@ msgstr "Mediet «%s» er definert to ganger. Avbryt."
msgid "unable to write config file [%s]"
msgstr "Klarte ikke skrive oppsettfila [%s]."
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "%s er ikke tilgjengelig, faller tilbake til %s"
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Skriv inn dine referanser for å få tilgang til mellomtjener\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Brukernavn:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Passord:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr "Ukjent nedlastingsprogram «%s».\n"
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr "%s-feil: Avslutt med signalet «%d»."
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr "%s-feil: Avslutt med «%d»."
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, c-format
msgid "copy failed"
msgstr "mislykket kopiering."
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, c-format
msgid "wget is missing\n"
msgstr "wget mangler.\n"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, c-format
msgid "curl is missing\n"
msgstr "curl mangler.\n"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr "curl-feil: Nedlasting avbrutt.\n"
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr "rsync mangler.\n"
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr "ssh mangler.\n"
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr "prozilla mangler.\n"
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr "Klarte ikke kjøre prozilla.\n"
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "prozilla mangler.\n"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr " %s %% av %s fullført. Tid igjen: %s. Hastighet: %s."
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr " %s %% fullført. Hastighet: %s."
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, c-format
msgid "retrieving %s"
msgstr "henter «%s»."
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, c-format
msgid "retrieved %s"
msgstr "hentet «%s»."
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "ukjent protokoll definert for %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "%s er ikke tilgjengelig, faller tilbake til %s"
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr ""
"Inget nedlastningsprogram funnet, støttede nedlastningsprogram er: %s\n"
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "Kunne ikke håndtere protokoll: %s"
@@ -724,12 +742,12 @@ msgstr "Fant ikke pakken «%s»."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "mottar rpm-filer fra medium «%s» ..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr "[ompakking]"
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -737,47 +755,47 @@ msgstr ""
"Opprettet transaksjon for installasjon på «%s» (fjern=%d, installer=%d, "
"oppgrader=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "Klarte ikke ikke opprette transaksjon."
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "Klarte ikke pakke ut rpm fra delta-rpm-pakke «%s»."
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "Klarte ikke installere pakke «%s»"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "Fjerner installerte rpm-pakker (%s) fra «%s»."
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "... Mottak mislykket: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, c-format
msgid "Removing package %s"
msgstr "Fjerner pakken «%s»"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "Fjerner pakke «%s»"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "Fjerner installerte rpm-pakker (%s) fra «%s»."
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Mer informasjon om pakke %s"
@@ -822,91 +840,81 @@ msgstr "avbryter"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Installasjon mislykket"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Installasjon mislyktes:"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, c-format
msgid "The following package has bad signature"
msgstr "Denne pakken har ugyldig signatur"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Disse pakkene har ugyldige signaturer"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Ønsker du å fortsette installasjonen?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "Fjerner installerte rpm-pakker (%s) fra «%s»."
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "Fordeler %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "Installerer %s fra %s."
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "Installerer %s."
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Prøv å installere uten å sjekke avhengigheter? (j/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Prøv enda hardere å installere («--force»)? (j/N) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr "Pakkene er av nyeste versjon"
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Installasjon er mulig"
#: ../urpm/md5sum.pm:26
#, c-format
-msgid "examining %s file"
-msgstr "Kontrollerer %s-fila."
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
-#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "advarsel: md5sum for %s er ikke tilgjengelig i MD5SUM-filen"
@@ -979,228 +987,228 @@ msgstr "Ville installert i stedet for å oppgradere pakke «%s»."
msgid "medium \"%s\" already exists"
msgstr "Medium «%s» eksisterer allerede."
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr "(hoppet over som standard)"
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "Legg til medium «%s» før det eksterne medium «%s»."
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, c-format
msgid "adding medium \"%s\""
msgstr "Legger til medium «%s»."
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, fuzzy, c-format
msgid "directory %s does not exist"
msgstr "Omgivelsekatalog %s eksisterer ikke"
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "Denne adressa ser ikke ut til å inneholde en distribusjon."
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, c-format
msgid "unable to parse media.cfg"
msgstr "Klarte ikke å tolke «media.cfg»."
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "Klarte ikke lese fra distribusjonsmediet (fant ingen «media.cfg»-fil)."
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr "Hopper over ikke-kompatibelt medie «%s» (for %s)"
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, c-format
msgid "retrieving media.cfg file..."
msgstr "Mottar «media.cfg»-fil ..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "Prøver å velge ikke-eksisterende medium «%s»."
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "Velger flere medier: %s."
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "Fjerner medium «%s»."
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "Enddrer oppsett for mediet «%s» på nytt"
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "... klarte ikke endre oppsett."
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "Fullført endring av oppsett."
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Feil ved generering av navnfil: Fant ikke avhengigheten «%d»"
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "Mediumet «%s» er av nyeste versjon."
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "Sjekker syntesefil [%s]."
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "Feil ved lesing av syntesefil til medium «%s»."
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "Kopierer [%s] for medium «%s» ..."
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "... mislykket kopiering."
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "Kopierer beskrivelsesfila til «%s» ..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "... kopiering fullført."
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "Mislykket kopiering av [%s] (fila er mistenkelig liten)."
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "Regner ut md5sum til mottatt kilde-«hdlist» (eller -syntese)"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "Mislykket kopiering av [%s] (md5sum stemmer ikke)."
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "Sjekker hdlistefil [%s]."
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "Rydder opp %s og %s."
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "Ugyldig «hdlist»-fil [%s] for medium «%s»."
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "Kopierer beskrivelsesfila til «%s» ..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "ugyldig rpm-filnavn [%s]"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "Mottar kilde-«hdlist» (eller -syntese) for «%s» ..."
-
-#: ../urpm/media.pm:1478
-#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "Fant undersøkt «hdlist» (eller -syntese) som %s."
+msgid "no metadata found for medium \"%s\""
+msgstr "Fant ingen «hdlist»-fil funnet for medium «%s»"
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "Fant ingen «hdlist»-fil funnet for medium «%s»"
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "Mottar kilde-«hdlist» (eller -syntese) for «%s» ..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "Undersøker offentlig nøkkel-til «%s» ..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "... Importerer nøkkelen «%s» fra offentlig nøkkel-fil «%s»."
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "Klarte ikke importere offentlig nøkkel-fil «%s»."
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "Fant ingen «hdlist»-fil funnet for medium «%s»"
+
+#: ../urpm/media.pm:1612
#, c-format
msgid "updated medium \"%s\""
msgstr "Oppdatert medium «%s»."
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "Leser rpm-filer fra [%s]."
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1271,7 +1279,7 @@ msgstr "GB"
msgid "TB"
msgstr "TB"
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1634,11 +1642,6 @@ msgstr " -f – Vis versjon, utgivelse og arkitektur med navn.\n"
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Ugyldig format: du kan bare bruke én flerverdietikett."
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "Bruker egendefinert miljø på «%s»\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1654,14 +1657,14 @@ msgstr "bygd hdlistesyntese-fil for medium «%s»"
msgid "no xml-info available for medium \"%s\""
msgstr "Skriver listefil for medium «%s»."
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
"Installasjonsprogrammet urpmi ble startet på nytt, og listen over "
"prioritertepakker ble ikke endret."
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
@@ -1669,107 +1672,125 @@ msgstr ""
"Installasjonsprogrammet urpmi ble startet på nytt, og programprioriteringene "
"ble endra: %s mot %s"
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Det finnes ingen «%s»-pakke."
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Følgende pakker inneholder %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Pakkene «%s» kan ikke installeres."
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, c-format
msgid "Package %s is already installed"
msgstr "Pakken «%s» er allerede installert."
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, c-format
msgid "Packages %s are already installed"
msgstr "Pakkene «%s» er allerede installerte."
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "da «%s» mangler"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, c-format
msgid "due to already installed %s"
msgstr "da «%s» allerede er installert"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "da «%s» ikke er tilfredsstilt"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "Prøver å priroritere «%s»"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "for å kunne beholde «%s»"
#: ../urpm/select.pm:607
#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Denne pakken må fjernes for at andre skal kunna oppgraderes:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Følgende pakker må fjernes for at andre skal bli oppgradert:\n"
+"%s"
+
+#: ../urpm/select.pm:635
+#, c-format
msgid "in order to install %s"
msgstr "for å kunne installere «%s»"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "på grunn av konflikter med «%s»."
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Ugyldig signatur (%s)."
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Ugyldig nøkkel-ID (%s)."
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Mangler signatur (%s)."
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't write file"
msgstr "Klarte ikke lagre fil"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't open file"
msgstr "Klarte ikke åpne fil"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "Kan ikke bruke «%s» med «%s»."
@@ -1811,7 +1832,7 @@ msgstr " --test – Kontroller at fjerning vil fungere.\n"
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel – Distribuert urpmi over maskiner med alias.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage – Pakk om filer før sletting\n"
@@ -1841,7 +1862,7 @@ msgstr ""
" nyttig for å (av)installere en «chroot» med «--root»-"
"valget.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v – Utvidede meldingar.\n"
@@ -1905,7 +1926,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "Vil du fjerne %d pakke?"
msgstr[1] "Vil du fjerne %d pakker?"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (j/N) "
@@ -2166,17 +2187,22 @@ msgstr ""
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts – Ikke kjør pakkeskript.\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts – Konfliktetiketter.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip – Pakker som installasjonen skal hoppe over\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --prefer – Pakker som skal foretrekkes.\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2184,42 +2210,42 @@ msgid ""
msgstr ""
" --more-choices – Vis flere valg enn standard ved treff på flere pakker.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock – ikke lås rpm-database.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch – Bare oppgrader pakker med samme arkitektur.\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a – Velg alle treff på kommandolinjen.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q – Stillemodus.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --verbose – Utvida meldinger.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " navn eller rpm-filer gitt på kommandolinjen vil bli installert.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr "Feil: Kan ikke bruka «auto-select» sammen med pakkeliste.\n"
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2228,28 +2254,28 @@ msgstr ""
"Feil: For å generere en feilrapport, spesifisér de vanlige "
"kommandolinjeargumentene med --bug.\n"
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "Du kan ikke installere binære rpm-filer når --install-src brukes"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2258,17 +2284,12 @@ msgstr ""
"Katalogen [%s] eksisterer allerede, bruk en annen katalog for "
"feilrapportering eller slett den"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Kan ikke opprette katalog [%s] for feilrapport"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr "Omgivelsekatalog %s eksisterer ikke"
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2277,48 +2298,48 @@ msgstr ""
"Feil: %s ser ut til å være montert skrivebeskyttet.\n"
"Bruk --allow-force for å tvinge operasjonen."
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr "Oppdaterer medie...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (oppgradering)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (oppgradering)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (installering)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (installering)"
-#: ../urpmi:462
+#: ../urpmi:450
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "På grunn av avhengigheter på «%s» trenger du én av disse pakkene:"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Hva er ditt valg? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2329,7 +2350,7 @@ msgstr ""
"som er eldre enn de installerte pakkene:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2340,7 +2361,7 @@ msgstr ""
"som er eldre enn de som er installert:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2349,12 +2370,12 @@ msgstr ""
"\n"
"Fortsett installasjon likevel?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (J/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2363,7 +2384,7 @@ msgstr ""
"Én av pakkene kan ikke installeres:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2372,12 +2393,12 @@ msgstr ""
"Noen av de forespurte pakkene kan ikke installeres:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "Du vil ødelegge systemet ditt hvis du fjerner pakken «%s»."
-#: ../urpmi:551
+#: ../urpmi:538
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2388,7 +2409,7 @@ msgstr ""
"for at andre skal kunna oppgraderes:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2399,30 +2420,12 @@ msgstr ""
"må fjernes for at andre skal bli oppgradert:\n"
"%s\n"
-#: ../urpmi:560
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Denne pakken må fjernes for at andre skal kunna oppgraderes:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Følgende pakker må fjernes for at andre skal bli oppgradert:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(kun test, fjerning vil egentlig ikke bli gjennomført)"
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2432,46 +2435,46 @@ msgstr ""
"Du må være root for å installere følgende avhengigheter:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "For å oppfylle avhengigheter vil den følgende pakken bli fjernet"
msgstr[1] "For å oppfylle avhengigheter vil de følgende %d pakkene bli fjernet"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(kun test, installasjon vil egentlig ikke bli gjennomført)"
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr "Det vil bli brukt %s mer diskplass."
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr "Det ble frigjort %s diskplass."
-#: ../urpmi:618
+#: ../urpmi:603
#, fuzzy, c-format
msgid "%s of packages will be retrieved."
msgstr "Det ble frigjort %s diskplass."
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Vil du fortsette med installering av pakken?"
msgstr[1] "Vil du fortsette med installering av de %d pakkene?"
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Avbryt"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Trykk Enter når det er klart..."
@@ -3210,6 +3213,13 @@ msgstr "Inga «hdlist» for medium «%s». Kan ikke vise resultat for pakkene «
msgid "No changelog found\n"
msgstr "Fant ingen endringslogg\n"
+#~ msgid "examining %s file"
+#~ msgstr "Kontrollerer %s-fila."
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "Fant undersøkt «hdlist» (eller -syntese) som %s."
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update – Opprett oppdateringsmedium.\n"
diff --git a/po/nl.po b/po/nl.po
index f49f9d85..97548037 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-nl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2008-09-05 00:58+0200\n"
"Last-Translator: Reinout van Schouwen <reinouts@gnome.org>\n"
"Language-Team: Nederlands <vertaling@vrijschrift.org>\n"
@@ -35,7 +35,7 @@ msgstr "RPM-installatie"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Fout opgetreden: kan bestand %s niet vinden, operatie wordt afgebroken"
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -104,7 +104,7 @@ msgstr "_Installeren"
msgid "_Save"
msgstr "_Opslaan"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Annuleren"
@@ -136,9 +136,8 @@ msgstr ""
msgid "Options:"
msgstr "Opties:"
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - geeft deze hulptekst.\n"
@@ -178,18 +177,18 @@ msgstr ""
" (--no-verify-rpm schakelt dit uit, standaard "
"ingeschakeld).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - alleen de aangegeven media, kommagescheiden.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - staat zoeken toe in 'provides' om een pakket te vinden.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
@@ -233,7 +232,22 @@ msgstr "Even geduld..."
msgid "Must be root"
msgstr "Dient 'root' te zijn"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "distribueren van %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Pakket-installatie..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Pakket-installatie..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -249,37 +263,37 @@ msgstr ""
msgid "Warning"
msgstr "Waarschuwing"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (op te waarderen)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr "(te installeren)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Pakketkeuze"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Eén van de volgende pakketten is benodigd:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Afbreken"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -291,7 +305,7 @@ msgstr ""
"%s\n"
"Toch verdergaan met installatie?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
@@ -299,7 +313,7 @@ msgstr ""
"Om aan afhankelijkheden te voldoen, wordt het volgende pakket geïnstalleerd:"
# Should use ngettext plural forms :-/
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -307,49 +321,44 @@ msgstr ""
"Om aan de afhankelijkheden te voldoen worden de volgende pakketten "
"geïnstalleerd:"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d pakket, %d MB)"
msgstr[1] "(%d pakketten, %d MB)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Pakket-installatie..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "kan bronpakketten niet ontvangen, bezig met afbreken"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Voorbereiden..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Bezig met installeren van pakket `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Gelieve het medium genaamd \"%s\" te plaatsen"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Downloaden van pakket `%s'..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Klaar"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -360,28 +369,28 @@ msgstr ""
"%s\n"
"Misschien moet u de urpmi database opwaarderen"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "Installatie mislukt:"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "De pakketten zijn reeds geïnstalleerd"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Installatie voltooid"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "verwijderen van %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "urpmi herstarten"
@@ -421,7 +430,7 @@ msgstr " standaard is %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - volledige rpm-naam tonen (NVRA).\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Alleen de beheerder mag pakketten installeren"
@@ -431,136 +440,145 @@ msgstr "Alleen de beheerder mag pakketten installeren"
msgid "Running urpmi in restricted mode..."
msgstr "Urpmi uitvoeren in beperkte modus..."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, c-format
msgid "fail to create directory %s"
msgstr "aanmaken van map %s mislukt"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr "ongeldige eigenaar van map %s"
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, c-format
msgid "Can not download packages into %s"
msgstr "kan pakketten niet naar %s downloaden"
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr "Omgevingsmap %s bestaat niet"
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "maakt gebruik van aangegeven omgeving op %s\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "kon rpmdb niet openen"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "ongeldige rpm-bestandsnaam [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "bezig met ontvangen van rpm bestand [%s] ..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...klaar met ontvangst"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...ontvangst mislukt: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "kon rpm-bestand [%s] niet benaderen"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "niet in staat spec-bestand %s te analyseren [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "kon rpm-bestand niet registreren"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Niet-compatibele architectuur voor rpm [%s]"
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "registreren van lokale pakketten is mislukt"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Deze operatie is verboden tijdens het uitvoeren in beperkte modus"
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "ongeldige proxy-aanduiding op opdrachtregel\n"
-#: ../urpm/args.pm:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "onverwachte uitdrukking %s"
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "uitdrukking vóór %s ontbreekt"
-#: ../urpm/args.pm:382
+#: ../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:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "geen afsluitbare uitdrukking"
-#: ../urpm/args.pm:395
+#: ../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:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot-map bestaat niet"
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr "Kan %s niet gebruiken zonder %s"
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr "Kan %s niet gebruiken samen met %s"
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr "Te veel argumenten\n"
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Kopiëren mislukt"
@@ -609,122 +627,122 @@ msgstr "medium \"%s\" is twee keer gedefinieerd, afbreken"
msgid "unable to write config file [%s]"
msgstr "kon configuratiebestand [%s] niet wegschrijven"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "%s is niet beschikbaar, terugvallen op %s"
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr "kan proxy-instellingen niet lezen (onvoldoende rechten om %s te lezen)"
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Voer uw aanmeldgegevens in voor toegang tot de proxy\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Gebruikersnaam:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Wachtwoord:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr "Onbekend downloadprogramma '%s'!\n"
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr "%s mislukt: afgesloten met signaal %d"
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr "%s mislukt: afgesloten met %d"
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, c-format
msgid "copy failed"
msgstr "kopiëren is mislukt"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, c-format
msgid "wget is missing\n"
msgstr "wget ontbreekt\n"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, c-format
msgid "curl is missing\n"
msgstr "curl ontbreekt\n"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr "curl is mislukt: download geannuleerd\n"
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr "rsync ontbreekt\n"
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr "ssh ontbreekt\n"
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr "prozilla ontbreekt\n"
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr "Kan prozilla niet uitvoeren\n"
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, c-format
msgid "aria2 is missing\n"
msgstr "aria2 ontbreekt\n"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr " %s%% van %s voltooid, verwacht = %s, snelheid = %s"
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr " %s%% voltooid, snelheid = %s"
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, c-format
msgid "retrieving %s"
msgstr "ophalen van %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, c-format
msgid "retrieved %s"
msgstr "%s opgehaald"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "onbekend protocol gedefinieerd voor %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "%s is niet beschikbaar, terugvallen op %s"
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "geen ``webfetch'' gevonden, ondersteund zijn: %s\n"
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "kon protocol niet verwerken: %s"
@@ -744,12 +762,12 @@ msgstr "pakket %s is niet gevonden."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "bezig met ontvangen van rpm bestanden van medium \"%s\"..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr "[opnieuw verpakken]"
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -757,47 +775,47 @@ msgstr ""
"transactie aangemaakt om te installeren op %s (verwijderen=%d, installeren=%"
"d, vernieuwen=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "Niet in staat om transactie aan te maken."
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "kan rpm niet uit delta-rpm-pakket %s uitpakken"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "kon volgend pakket niet installeren: %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "verwijderen van onjuiste rpm (%s) uit %s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, c-format
msgid "removing %s failed: %s"
msgstr "verwijderen van %s mislukt: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, c-format
msgid "Removing package %s"
msgstr "Verwijderen van pakket %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "bezig met verwijderen van pakket %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "geïnstalleerde rpms (%s) worden verwijderd uit %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Meer informatie over pakket %s"
@@ -842,18 +860,18 @@ msgstr "afbreken"
msgid "%s database is locked (another program is already using it)"
msgstr "%s-database is gesloten (een ander programma gebruikt hem al)"
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Installatie mislukt"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr "Toch proberen om door te gaan? (j/N) "
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -862,74 +880,64 @@ msgstr ""
"Installatie mislukt, onjuiste rpms:\n"
"%s"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, c-format
msgid "The following package has bad signature"
msgstr "Het volgende pakket is voorzien van een onjuiste handtekening"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "De volgende pakketten bevatten een onjuiste handtekening"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Wilt u doorgaan met de installatie?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, c-format
msgid "removing installed rpms (%s)"
msgstr "verwijderen van geïnstalleerde rpms (%s)"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "distribueren van %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "installeren van %s vanaf %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "installeren van %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr ""
"Proberen te installeren zonder de afhankelijkheden te controleren? (j/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Installatie trachten te forceren (--force)? (j/N) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr "Pakketten zijn bijgewerkt"
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Installatie is mogelijk"
#: ../urpm/md5sum.pm:26
#, c-format
-msgid "examining %s file"
-msgstr "onderzoeken van bestand %s"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr "ongeldig MD5SUM-bestand"
-
-#: ../urpm/md5sum.pm:28
-#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "waarschuwing: md5sum voor %s niet beschikbaar in MD5SUM-bestand"
@@ -1002,230 +1010,230 @@ msgstr "Zou pakket %s installeren, niet opwaarderen"
msgid "medium \"%s\" already exists"
msgstr "medium \"%s\" bestaat al"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr "(standaard niet in aanmerking genomen)"
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "toevoegen medium \"%s\" voor medium op afstand \"%s\""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, c-format
msgid "adding medium \"%s\""
msgstr "toevoegen van medium \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr "map %s bestaat niet"
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "deze locatie lijkt geen distributie te bevatten"
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, c-format
msgid "unable to parse media.cfg"
msgstr "kon media.cfg niet analyseren"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"kon het installatiemedium niet vinden (geen media.cfg bestand gevonden)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr "overslaan incompatibele media '%s' (voor %s)"
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, c-format
msgid "retrieving media.cfg file..."
msgstr "ontvangen van media.cfg-bestand..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "probeert een niet-bestaand medium \"%s\" te selecteren"
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "selecteren van meerdere media: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "bezig met verwijderen van medium \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "herconfigureren van urpmi voor medium \"%s\"..."
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...herconfiguratie mislukt"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "herconfiguratie voltooid"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
"Fout bij het genereren van namenbestand: afhankelijkheid %d niet gevonden"
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "medium \"%s\" is bijgewerkt"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "onderzoeken van het synthesis-bestand [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "probleem met lezen van synthesis bestand van medium \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "Kopiëren van bestand [%s] voor medium \"%s\"..."
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...kopiëren mislukt"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "bezig met kopiëren omschrijving bestand van \"%s\"..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...kopiëren is klaar"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopiëren van [%s] mislukt (bestand is verdacht klein)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "berekenen md5sum van ontvangen bronsynthesis"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "ophalen van [%s] mislukt (md5sum onjuist)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, c-format
msgid "genhdlist2 failed on %s"
msgstr "genhdlist2 mislukt op %s"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, c-format
msgid "comparing %s and %s"
msgstr "vergelijken van %s en %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ongeldig hdlist-bestand %s voor medium \"%s\""
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "kopiëren MD5SUM-bestand van \"%s\"..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "ongeldig MD5SUM-bestand (gedownload van %s)"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
+#, fuzzy, c-format
+msgid "no metadata found for medium \"%s\""
+msgstr "geen synthesis-bestand gevonden voor medium \"%s\""
+
+#: ../urpm/media.pm:1475
#, c-format
msgid "retrieving source synthesis of \"%s\"..."
msgstr "bronsynthesis van \"%s\" ontvangen..."
-#: ../urpm/media.pm:1478
-#, c-format
-msgid "found probed synthesis as %s"
-msgstr "afgezochte synthesis gevonden als %s"
-
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
-#, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "geen synthesis-bestand gevonden voor medium \"%s\""
-
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "onderzoeken van publieke sleutelbestand van \"%s\"..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...sleutel %s uit publiek sleutelbestand van \"%s\" geïmporteerd"
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "kon publieke sleutelbestand van \"%s\" niet importeren"
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "geen synthesis-bestand gevonden voor medium \"%s\""
+
+#: ../urpm/media.pm:1612
#, c-format
msgid "updated medium \"%s\""
msgstr "bijgewerkt medium \"%s\""
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr "ophalen van [%s] mislukt"
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr "opnieuw proberen met mirror %s"
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr "Kan geen mirror vinden uit de mirrorlijst %s"
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr "geolocalisatie %s %.2f %.2f gevonden uit tijdzone %s"
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, c-format
msgid "getting mirror list from %s"
msgstr "ophalen mirrorlijst van %s"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1296,7 +1304,7 @@ msgstr "GB"
msgid "TB"
msgstr "TB"
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1304,11 +1312,12 @@ msgid ""
msgid_plural ""
"The following packages are now orphans, use \"urpme --auto-orphans\" to "
"remove them."
-msgstr[0] "Het volgende pakket is nu wees, gebruik \"urpme --auto-orphans\" om "
-"het te verwijderen."
+msgstr[0] ""
+"Het volgende pakket is nu wees, gebruik \"urpme --auto-orphans\" om het te "
+"verwijderen."
msgstr[1] ""
-"De volgende pakketten zijn nu wees, gebruik \"urpme --auto-orphans\" om "
-"ze te verwijderen."
+"De volgende pakketten zijn nu wees, gebruik \"urpme --auto-orphans\" om ze "
+"te verwijderen."
#: ../urpm/parallel.pm:14
#, c-format
@@ -1366,8 +1375,8 @@ msgid ""
"%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
"code: %d)"
msgstr ""
-"%s mislukt op hostcomputer %s (misschien heeft hij niet de juiste urpmi-versie?) "
-"(afsluitcode: %d)"
+"%s mislukt op hostcomputer %s (misschien heeft hij niet de juiste urpmi-"
+"versie?) (afsluitcode: %d)"
#: ../urpm/removable.pm:32
#, c-format
@@ -1669,11 +1678,6 @@ msgstr " -f - geeft de versie, uitgave en arch met naam.\n"
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Onjuist formaat: u mag maar één tag gebruiken met meerdere waarden"
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "maakt gebruik van aangegeven omgeving op %s\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1689,120 +1693,139 @@ msgstr "geen synthesis beschikbaar voor medium \"%s\""
msgid "no xml-info available for medium \"%s\""
msgstr "geen xml-info beschikbaar voor medium \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
"urpmi is herstart en de prioriteitslijst van pakketten is niet gewijzigd"
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
"urpmi is herstart en de prioriteitslijst van pakketten is gewijzigd: %s vs %s"
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Geen pakket genaamd %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "De volgende pakketten bevatten %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr "Gebruik \"-a\" om ze allemaal te gebruiken"
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, c-format
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:543
+#: ../urpm/select.pm:538
#, c-format
msgid "Package %s is already installed"
msgstr "Pakket %s is reeds geïnstalleerd"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, c-format
msgid "Packages %s are already installed"
msgstr "De pakketten %s zijn reeds geïnstalleerd"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "vanwege ontbrekende %s"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, c-format
msgid "due to already installed %s"
msgstr "vanwege reeds geïnstalleerde %s"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "vanwege onvoldane %s"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "probeer %s op te waarderen"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "Om %s te behouden"
#: ../urpm/select.pm:607
#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Het volgende pakket moet worden verwijderd om andere te kunnen opwaarderen:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"De volgende pakketten moeten worden verwijderd om andere te kunnen "
+"opwaarderen:\n"
+"%s"
+
+#: ../urpm/select.pm:635
+#, c-format
msgid "in order to install %s"
msgstr "in volgorde om %s te installeren"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "vanwege conflicten met %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Ongeldige ondertekening (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Ongeldig sleutel-ID (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Geen ondertekening aanwezig (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr "systeem"
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr "U dient %s te herstarten voor %s"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't write file"
msgstr "Kan niet naar bestand schrijven"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't open file"
msgstr "Openen van bestand mislukt"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, c-format
msgid "Can't move file %s to %s"
msgstr "Kan bestand %s niet verplaatsen naar %s"
@@ -1846,7 +1869,7 @@ msgstr ""
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - gedistribueerde urpmi over computers van alias.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr ""
@@ -1878,7 +1901,7 @@ msgstr ""
" --use-distrib - urpme dynamisch configureren vanuit distrib-boom, handig\n"
" om een chroot te (de)installeren met de --root optie.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - 'uitgebreid verslag'-modus.\n"
@@ -1947,7 +1970,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "Eén pakket verwijderen?"
msgstr[1] "%d Pakketten verwijderen?"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (j/N) "
@@ -2215,19 +2238,24 @@ msgstr ""
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - de pakketscriptlet(s) niet uivoeren\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - conflict-tags afdrukken.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
" --skip - pakketten waarvan de installatie moet worden "
"overgeslagen\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --prefer - pakketten die de voorkeur dienen te krijgen\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2237,44 +2265,44 @@ msgstr ""
"keuzemogelijkheden\n"
" aanbieden dan gewoonlijk.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - rpm-database niet op slot zetten.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
" --strict-arch - waardeer alleen pakketten op met dezelfde architectuur.\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - selecteer alle resultaten van console.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - stille modus.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --debug - 'zeer uitgebreid verslag'-modus.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
" namen of rpm bestanden gegeven via opdrachtregel worden geïnstalleerd.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr "Fout: kan --auto-select niet gebruiken samen met pakketlijst.\n"
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2283,31 +2311,31 @@ msgstr ""
"Fout: Om een programmafoutrapport te genereren, geeft u de gebruikelijke \n"
"opdrachtregel-argumenten samen met --bug.\n"
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
"U kunt geen binaire rpm-bestanden installeren wanneer u --install-src "
"gebruikt"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr "U kunt geen spec-bestanden installeren"
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr "terugvallen op --buildrequires"
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
"gebruik a.u.b. --buildrequires of --install-src, gaat uit van --buildrequires"
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2316,17 +2344,12 @@ msgstr ""
"De map [%s] bestaat reeds, gebruik een andere map voor het foutrapport of "
"verwijder hem"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Kon directory [%s] niet aanmaken voor programmafoutrapport"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr "Omgevingsmap %s bestaat niet"
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2335,36 +2358,36 @@ msgstr ""
"Fout: %s lijkt als alleen-lezen gekoppeld te zijn.\n"
"Gebruik --allow-force om de opdracht te forceren."
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr "Bijwerken van media...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (op te waarderen)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (op te waarderen)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (te installeren)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (te installeren)"
-#: ../urpmi:462
+#: ../urpmi:450
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2373,12 +2396,12 @@ msgstr ""
"Om aan de afhankelijkheid '%s' te voldoen, is één van de volgende pakketten "
"nodig:"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Wat is uw keuze? (1-%d)"
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2389,7 +2412,7 @@ msgstr ""
"van pakketten die ouder zijn dan de reeds geïnstalleerde pakketten:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2400,7 +2423,7 @@ msgstr ""
"van pakketten die ouder zijn dan de reeds geïnstalleerde pakketten:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2409,12 +2432,12 @@ msgstr ""
"\n"
"Toch doorgaan met de installatie?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (J/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2423,7 +2446,7 @@ msgstr ""
"Een verlangd pakket kan niet worden geïnstalleerd:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2432,12 +2455,12 @@ msgstr ""
"Enkele gevraagde pakketten kunnen niet worden geïnstalleerd:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "het verwijderen van %s zal uw systeem verstoren"
-#: ../urpmi:551
+#: ../urpmi:538
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2448,7 +2471,7 @@ msgstr ""
"moeten worden verwijderd om andere te kunnen opwaarderen:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2459,31 +2482,12 @@ msgstr ""
"moeten worden verwijderd om andere te kunnen opwaarderen:\n"
"%s\n"
-#: ../urpmi:560
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Het volgende pakket moet worden verwijderd om andere te kunnen opwaarderen:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"De volgende pakketten moeten worden verwijderd om andere te kunnen "
-"opwaarderen:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(alleen test, verwijdering zal niet daadwerkelijk plaatsvinden)"
-#: ../urpmi:583
+#: ../urpmi:568
#, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2494,48 +2498,46 @@ msgstr ""
"afhankelijkheden te installeren:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
-msgstr[0] ""
-"Het volgende weespakket wordt verwijderd."
-msgstr[1] ""
-"De volgende weespakketten worden verwijderd."
+msgstr[0] "Het volgende weespakket wordt verwijderd."
+msgstr[1] "De volgende weespakketten worden verwijderd."
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(alleen test, installatie zal niet daadwerkelijk plaatsvinden)"
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr "%s aan extra schijfruimte zal worden gebruikt."
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr "%s aan schijfruimte zal vrijkomen."
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr "%s aan pakketten zal worden opgehaald."
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
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:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Annuleren"
-#: ../urpmi:648
+#: ../urpmi:633
#, c-format
msgid "Press Enter when mounted..."
msgstr "Druk op Enter wanneer de koppeling tot stand is gebracht..."
@@ -2614,7 +2616,8 @@ msgid ""
" or discard non-update media (when used with --distrib)\n"
msgstr ""
" --update - een bijwerkmedium aanmaken, \n"
-" of niet-bijwerkmedia weggooien (als gebruikt met --distrib)\n"
+" of niet-bijwerkmedia weggooien (als gebruikt met --"
+"distrib)\n"
#: ../urpmi.addmedia:67
#, c-format
@@ -3311,3 +3314,11 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Geen wijzigingslogboek gevonden\n"
+#~ msgid "examining %s file"
+#~ msgstr "onderzoeken van bestand %s"
+
+#~ msgid "invalid MD5SUM file"
+#~ msgstr "ongeldig MD5SUM-bestand"
+
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "afgezochte synthesis gevonden als %s"
diff --git a/po/nn.po b/po/nn.po
index f99461c0..46b8e42f 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-07 13:39+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2008-10-07 18:50+0200\n"
"Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
"Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -143,13 +143,16 @@ msgstr ""
#: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
msgstr " --auto-select – Vel automatisk alle pakkar som kan oppdaterast.\n"
#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
-msgstr " --force – Tving gjennomføring sjølv om ikkje alle pakkar finst.\n"
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force – Tving gjennomføring sjølv om ikkje alle pakkar finst.\n"
#: ../gurpmi.pm:50 ../urpmi:133
#, c-format
@@ -190,7 +193,8 @@ msgstr " --test – Berre kontroller at installeringa kan fungera.\n"
#: ../gurpmi.pm:57 ../urpmi:76
#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
msgstr " --searchmedia – Berre sjå etter pakkar i dette mediet.\n"
#: ../gurpmi.pm:100
@@ -208,7 +212,22 @@ msgstr "Vent litt ..."
msgid "Must be root"
msgstr "Må vera root"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "Fordeler %s."
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Installerer pakke ..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Installerer pakke ..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -267,12 +286,14 @@ msgstr ""
#: ../gurpmi2:240 ../urpmi:592
#, 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 "Grunna avhengnader vert denne pakken installert:"
#: ../gurpmi2:241 ../urpmi:593
#, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Grunna avhengnader vert desse pakkane installerte:"
#: ../gurpmi2:243
@@ -282,12 +303,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d pakke – %d MB)"
msgstr[1] "(%d pakkar – %d MB)"
-#: ../gurpmi2:249
-#, c-format
-msgid "Package installation..."
-msgstr "Installerer pakke ..."
-
-#: ../gurpmi2:251 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "Fann ikkje kjeldepakke. Avbryter."
@@ -593,7 +609,8 @@ msgstr "«%s» er ikkje tilgjengeleg. Fell tilbake på «%s»."
#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
-msgstr "Klarte ikkje lesa mellomtenar-innstillingar (har ikkje løyve til å lesa «%s»)."
+msgstr ""
+"Klarte ikkje lesa mellomtenar-innstillingar (har ikkje løyve til å lesa «%s»)."
#: ../urpm/download.pm:182
#, c-format
@@ -727,7 +744,8 @@ msgstr "[pakkar om att]"
#: ../urpm/install.pm:169
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
"Laga transaksjon for installering på «%s» (remove: %d – install: %d – "
"upgrade: %d)"
@@ -900,7 +918,8 @@ msgstr "Åtvaring: md5summen for «%s» er ikkje tilgjengeleg i MD5SUM-fila."
#: ../urpm/media.pm:204
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "Det virtuelle mediet «%s» må ha ei eintydig adresse. Hoppar over medium."
+msgstr ""
+"Det virtuelle mediet «%s» må ha ei eintydig adresse. Hoppar over medium."
#: ../urpm/media.pm:206
#, c-format
@@ -1266,7 +1285,8 @@ msgid ""
msgid_plural ""
"The following packages are now orphans, use \"urpme --auto-orphans\" to "
"remove them."
-msgstr[0] "Denne pakken er no foreldrelaus. Bruk «urpme --auto-orphans» for å fjerna han."
+msgstr[0] ""
+"Denne pakken er no foreldrelaus. Bruk «urpme --auto-orphans» for å fjerna han."
msgstr[1] ""
"Desse pakkane er no foreldrelause. Bruk «urpme --auto-orphans» for å fjerna "
"dei."
@@ -1345,6 +1365,298 @@ msgstr "Monterer «%s»."
msgid "unmounting %s"
msgstr "Avmonterer «%s»."
+#: ../urpm/search.pm:29 ../urpmf:29
+#, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2006 Mandriva.\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 – versjon %s\n"
+"Copyright © 2002–2007 Mandriva.\n"
+"Dette er fri programvare, og kan distribuerast under vilkåra i GNU GPL-"
+"lisensen.\n"
+"\n"
+"Bruk: urpmf [val] mønster-uttrykk\n"
+
+#: ../urpm/search.pm:36 ../urpmf:36
+#, c-format
+msgid " --version - print this tool's version number.\n"
+msgstr " --version – Vis versjonsnummeret til dette verktøyet.\n"
+
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid " --env - use specific environment (typically a bug report).\n"
+msgstr ""
+" --env – Bruk eigedefinert miljø (vanlegvis ein feilrapport).\n"
+
+#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid " --excludemedia - do not use the given media, separated by comma.\n"
+msgstr " --excludemedia – Ikkje bruk gitt medium (kommadelt liste).\n"
+
+#: ../urpm/search.pm:39 ../urpmf:39
+#, c-format
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+" --literal, -l – Ingen treff på mønster; bruk berre argument som tekst.\n"
+
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+" --urpmi-root – Bruk anna rot for urpmi-database og rpm-installering.\n"
+
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+" --sortmedia - sort media according to substrings separated by comma.\n"
+msgstr ""
+" --sortmedia – Sorter medium etter delstrengar (kommadelt liste).\n"
+
+#: ../urpm/search.pm:43 ../urpmf:43
+#, c-format
+msgid " --use-distrib - use the given path to access media\n"
+msgstr " --use-distrib – Bruk denne stigen for tilgang til medium.\n"
+
+#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
+msgstr " --synthesis – Bruk syntese i staden for heile databasen.\n"
+
+#: ../urpm/search.pm:45 ../urpmf:45
+#, c-format
+msgid " --uniq - do not print identical lines twice.\n"
+msgstr " --uniq – Vis ikkje identiske linjer.\n"
+
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid " --update - use only update media.\n"
+msgstr " --update – Bruk berre oppdateringsmedium.\n"
+
+#: ../urpm/search.pm:47 ../urpmf:47
+#, c-format
+msgid " --verbose - verbose mode.\n"
+msgstr " --verbose – Utvida meldingar.\n"
+
+#: ../urpm/search.pm:48 ../urpmf:48
+#, c-format
+msgid " -i - ignore case distinctions in patterns.\n"
+msgstr " -i – Ikkje skil mellom store og små bokstavar.\n"
+
+#: ../urpm/search.pm:49 ../urpmf:49
+#, c-format
+msgid " -I - honor case distinctions in patterns (default).\n"
+msgstr " -l – Skil store og små bokstavar i mønster (standard).\n"
+
+#: ../urpm/search.pm:50 ../urpmf:50
+#, c-format
+msgid " -F<str> - change field separator (defaults to ':').\n"
+msgstr " -F<str> – Byt feltskiljar (standard er «:»).\n"
+
+#: ../urpm/search.pm:51 ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Mønsteruttrykk:\n"
+
+#: ../urpm/search.pm:52 ../urpmf:52
+#, c-format
+msgid " text - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+" tekst – All tekst vert tolka som regulære uttrykk, med mindre «-l» "
+"vert brukt.\n"
+
+#: ../urpm/search.pm:53 ../urpmf:53
+#, c-format
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -e – Ta med perl-kode direkte, som «perl -e».\n"
+
+#: ../urpm/search.pm:54 ../urpmf:54
+#, c-format
+msgid " -a - binary AND operator.\n"
+msgstr " -a – Binær OG-operator.\n"
+
+#: ../urpm/search.pm:55 ../urpmf:55
+#, c-format
+msgid " -o - binary OR operator.\n"
+msgstr " -o – Binær ELLER-operator.\n"
+
+#: ../urpm/search.pm:56 ../urpmf:56
+#, c-format
+msgid " ! - unary NOT.\n"
+msgstr " ! – Unær IKKJE-operator.\n"
+
+#: ../urpm/search.pm:57 ../urpmf:57
+#, c-format
+msgid " ( ) - left and right parentheses.\n"
+msgstr " ( ) – Venstre- og høgreparentes.\n"
+
+#: ../urpm/search.pm:58 ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Oversikt over merkelappar:\n"
+
+#: ../urpm/search.pm:59 ../urpmf:59
+#, c-format
+msgid " --qf - specify a printf-like output format\n"
+msgstr " --qf – Bruk eit printf-liknande utformat.\n"
+
+#: ../urpm/search.pm:60 ../urpmf:60
+#, c-format
+msgid " example: '%%name:%%files'\n"
+msgstr " Eksempel: «%%name:%%files»\n"
+
+#: ../urpm/search.pm:61 ../urpmf:61
+#, c-format
+msgid " --arch - architecture\n"
+msgstr " --arch – Arkitektur.\n"
+
+#: ../urpm/search.pm:62 ../urpmf:62
+#, c-format
+msgid " --buildhost - build host\n"
+msgstr " --buildhost – Byggjevert.\n"
+
+#: ../urpm/search.pm:63 ../urpmf:63
+#, c-format
+msgid " --buildtime - build time\n"
+msgstr " --buildtime – Byggjetidspunkt.\n"
+
+#: ../urpm/search.pm:64 ../urpmf:64
+#, c-format
+msgid " --conffiles - configuration files\n"
+msgstr " --conffiles – Oppsettfiler.\n"
+
+#: ../urpm/search.pm:65 ../urpmf:65
+#, c-format
+msgid " --conflicts - conflict tags\n"
+msgstr " --conflicts – Konfliktmerkelappar.\n"
+
+#: ../urpm/search.pm:66 ../urpmf:66
+#, c-format
+msgid " --description - package description\n"
+msgstr " --description – Pakkeskildring.\n"
+
+#: ../urpm/search.pm:67 ../urpmf:67
+#, c-format
+msgid " --distribution - distribution\n"
+msgstr " --distribution – Distribusjon.\n"
+
+#: ../urpm/search.pm:68 ../urpmf:68
+#, c-format
+msgid " --epoch - epoch\n"
+msgstr " --epoch – Epoch.\n"
+
+#: ../urpm/search.pm:69 ../urpmf:69
+#, c-format
+msgid " --filename - filename of the package\n"
+msgstr " --filename – Filnamnet til pakken.\n"
+
+#: ../urpm/search.pm:70 ../urpmf:70
+#, c-format
+msgid " --files - list of files contained in the package\n"
+msgstr " --files – Oversikt over filer i pakken.\n"
+
+#: ../urpm/search.pm:71 ../urpmf:71
+#, c-format
+msgid " --group - group\n"
+msgstr " --group – Gruppe.\n"
+
+#: ../urpm/search.pm:72 ../urpmf:72
+#, c-format
+msgid " --license - license\n"
+msgstr " --license – Vis lisensvilkår.\n"
+
+#: ../urpm/search.pm:73 ../urpmf:73
+#, c-format
+msgid " --name - package name\n"
+msgstr " --name – Pakkenamn.\n"
+
+#: ../urpm/search.pm:74 ../urpmf:74
+#, c-format
+msgid " --obsoletes - obsoletes tags\n"
+msgstr " --obsoletes – Utdatert-merkelappar.\n"
+
+#: ../urpm/search.pm:75 ../urpmf:75
+#, c-format
+msgid " --packager - packager\n"
+msgstr " --packager – Pakkebyggjar.\n"
+
+#: ../urpm/search.pm:76 ../urpmf:76
+#, c-format
+msgid " --provides - provides tags\n"
+msgstr " --provides – Tilbod-merkelappar.\n"
+
+#: ../urpm/search.pm:77 ../urpmf:77
+#, c-format
+msgid " --requires - requires tags\n"
+msgstr " --requires – Krev-merkelappar.\n"
+
+#: ../urpm/search.pm:78 ../urpmf:78
+#, c-format
+msgid " --size - installed size\n"
+msgstr " --size – Installert storleik.\n"
+
+#: ../urpm/search.pm:79 ../urpmf:79
+#, c-format
+msgid " --sourcerpm - source rpm name\n"
+msgstr " --sourcerpm – Namn på kjelde-RPM.\n"
+
+#: ../urpm/search.pm:80 ../urpmf:80
+#, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --suggests – Føreslegen-merkelappar.\n"
+
+#: ../urpm/search.pm:81 ../urpmf:81
+#, c-format
+msgid " --summary - summary\n"
+msgstr " --summary – Samandrag.\n"
+
+#: ../urpm/search.pm:82 ../urpmf:82
+#, c-format
+msgid " --url - url\n"
+msgstr " --url - Adresse.\n"
+
+#: ../urpm/search.pm:83 ../urpmf:83
+#, c-format
+msgid " --vendor - vendor\n"
+msgstr " --vendor – Leverandør.\n"
+
+#: ../urpm/search.pm:84 ../urpmf:84
+#, c-format
+msgid " -m - the media in which the package was found\n"
+msgstr " -m – Mediet som pakken vart funnen i.\n"
+
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
+#, c-format
+msgid " -f - print version, release and arch with name.\n"
+msgstr " -f – Vis versjon-, utgåve og arkitekturinformasjon.\n"
+
+#: ../urpm/search.pm:197 ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "Ugyldig format: Du kan berre bruka éin fleirverdi-merkelapp."
+
+#: ../urpm/search.pm:290 ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "Fann inga «hdlist» for mediet «%s»."
+
+#: ../urpm/search.pm:297 ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "Fann inga syntesefil for mediet «%s»."
+
+#: ../urpm/search.pm:304 ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "Fann ingen xml-info for mediet «%s»."
+
#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1354,7 +1666,8 @@ msgstr ""
#: ../urpm/select.pm:32
#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
"Installasjonsprogrammet urpmi vart starta på nytt, og programprioriteringane "
"vart endra: %s mot %s"
@@ -1377,7 +1690,8 @@ msgstr "Legg til «-a» for å bruka alle."
#: ../urpm/select.pm:295
#, c-format
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."
+msgstr ""
+"Fann pakke/pakkar %s i urpmi-databsen, men ingen av dei er installerte."
#: ../urpm/select.pm:538
#, c-format
@@ -1442,17 +1756,17 @@ msgstr "for å kunna installera «%s»"
msgid "due to conflicts with %s"
msgstr "på grunn av konfliktar med «%s»"
-#: ../urpm/signature.pm:49
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Ugyldig signatur (%s)."
-#: ../urpm/signature.pm:80
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Ugyldig nøkkel-ID (%s)."
-#: ../urpm/signature.pm:82
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Manglar signatur (%s)."
@@ -1529,16 +1843,11 @@ msgstr " --repackage – Pakk om filer før sletting.\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --root – Bruka anna rot for rpm-fjerning.\n"
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
-#, c-format
-msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
-msgstr " --urpmi-root – Bruk anna rot for urpmi-database og rpm-installering.\n"
-
#: ../urpme:55 ../urpmi:101
#, c-format
msgid " --justdb - update only the rpm db, not the filesystem.\n"
-msgstr " --justdb – Berre oppdater rpm-databasen, og ikkje filsystemet.\n"
+msgstr ""
+" --justdb – Berre oppdater rpm-databasen, og ikkje filsystemet.\n"
#: ../urpme:56
#, c-format
@@ -1599,7 +1908,8 @@ msgstr "Ingen foreldrelause pakkar å fjerna"
#: ../urpme:149
#, 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] "På grunn av avhengnader vert denne pakken fjerna"
msgstr[1] "På grunn av avhengnader vert desse %d pakkane fjerna"
@@ -1637,290 +1947,11 @@ msgstr "Klarte ikkje fjerna."
msgid "Removal is possible"
msgstr "Fjerning er mogleg."
-#: ../urpmf:29
-#, c-format
-msgid ""
-"urpmf version %s\n"
-"Copyright (C) 2002-2006 Mandriva.\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 – versjon %s\n"
-"Copyright © 2002–2007 Mandriva.\n"
-"Dette er fri programvare, og kan distribuerast under vilkåra i GNU GPL-"
-"lisensen.\n"
-"\n"
-"Bruk: urpmf [val] mønster-uttrykk\n"
-
-#: ../urpmf:36
-#, c-format
-msgid " --version - print this tool's version number.\n"
-msgstr " --version – Vis versjonsnummeret til dette verktøyet.\n"
-
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid " --env - use specific environment (typically a bug report).\n"
-msgstr " --env – Bruk eigedefinert miljø (vanlegvis ein feilrapport).\n"
-
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid " --excludemedia - do not use the given media, separated by comma.\n"
-msgstr " --excludemedia – Ikkje bruk gitt medium (kommadelt liste).\n"
-
-#: ../urpmf:39
-#, c-format
-msgid " --literal, -l - don't match patterns, use argument as a literal string.\n"
-msgstr " --literal, -l – Ingen treff på mønster; bruk berre argument som tekst.\n"
-
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid " --sortmedia - sort media according to substrings separated by comma.\n"
-msgstr " --sortmedia – Sorter medium etter delstrengar (kommadelt liste).\n"
-
-#: ../urpmf:43
-#, c-format
-msgid " --use-distrib - use the given path to access media\n"
-msgstr " --use-distrib – Bruk denne stigen for tilgang til medium.\n"
-
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
-msgstr " --synthesis – Bruk syntese i staden for heile databasen.\n"
-
-#: ../urpmf:45
-#, c-format
-msgid " --uniq - do not print identical lines twice.\n"
-msgstr " --uniq – Vis ikkje identiske linjer.\n"
-
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid " --update - use only update media.\n"
-msgstr " --update – Bruk berre oppdateringsmedium.\n"
-
-#: ../urpmf:47
-#, c-format
-msgid " --verbose - verbose mode.\n"
-msgstr " --verbose – Utvida meldingar.\n"
-
-#: ../urpmf:48
-#, c-format
-msgid " -i - ignore case distinctions in patterns.\n"
-msgstr " -i – Ikkje skil mellom store og små bokstavar.\n"
-
-#: ../urpmf:49
-#, c-format
-msgid " -I - honor case distinctions in patterns (default).\n"
-msgstr " -l – Skil store og små bokstavar i mønster (standard).\n"
-
-#: ../urpmf:50
-#, c-format
-msgid " -F<str> - change field separator (defaults to ':').\n"
-msgstr " -F<str> – Byt feltskiljar (standard er «:»).\n"
-
-#: ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Mønsteruttrykk:\n"
-
-#: ../urpmf:52
-#, c-format
-msgid " text - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-" tekst – All tekst vert tolka som regulære uttrykk, med mindre «-l» "
-"vert brukt.\n"
-
-#: ../urpmf:53
-#, c-format
-msgid " -e - include perl code directly as perl -e.\n"
-msgstr " -e – Ta med perl-kode direkte, som «perl -e».\n"
-
-#: ../urpmf:54
-#, c-format
-msgid " -a - binary AND operator.\n"
-msgstr " -a – Binær OG-operator.\n"
-
-#: ../urpmf:55
-#, c-format
-msgid " -o - binary OR operator.\n"
-msgstr " -o – Binær ELLER-operator.\n"
-
-#: ../urpmf:56
-#, c-format
-msgid " ! - unary NOT.\n"
-msgstr " ! – Unær IKKJE-operator.\n"
-
-#: ../urpmf:57
-#, c-format
-msgid " ( ) - left and right parentheses.\n"
-msgstr " ( ) – Venstre- og høgreparentes.\n"
-
-#: ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Oversikt over merkelappar:\n"
-
-#: ../urpmf:59
-#, c-format
-msgid " --qf - specify a printf-like output format\n"
-msgstr " --qf – Bruk eit printf-liknande utformat.\n"
-
-#: ../urpmf:60
-#, c-format
-msgid " example: '%%name:%%files'\n"
-msgstr " Eksempel: «%%name:%%files»\n"
-
-#: ../urpmf:61
-#, c-format
-msgid " --arch - architecture\n"
-msgstr " --arch – Arkitektur.\n"
-
-#: ../urpmf:62
-#, c-format
-msgid " --buildhost - build host\n"
-msgstr " --buildhost – Byggjevert.\n"
-
-#: ../urpmf:63
-#, c-format
-msgid " --buildtime - build time\n"
-msgstr " --buildtime – Byggjetidspunkt.\n"
-
-#: ../urpmf:64
-#, c-format
-msgid " --conffiles - configuration files\n"
-msgstr " --conffiles – Oppsettfiler.\n"
-
-#: ../urpmf:65
-#, c-format
-msgid " --conflicts - conflict tags\n"
-msgstr " --conflicts – Konfliktmerkelappar.\n"
-
-#: ../urpmf:66
-#, c-format
-msgid " --description - package description\n"
-msgstr " --description – Pakkeskildring.\n"
-
-#: ../urpmf:67
-#, c-format
-msgid " --distribution - distribution\n"
-msgstr " --distribution – Distribusjon.\n"
-
-#: ../urpmf:68
-#, c-format
-msgid " --epoch - epoch\n"
-msgstr " --epoch – Epoch.\n"
-
-#: ../urpmf:69
-#, c-format
-msgid " --filename - filename of the package\n"
-msgstr " --filename – Filnamnet til pakken.\n"
-
-#: ../urpmf:70
-#, c-format
-msgid " --files - list of files contained in the package\n"
-msgstr " --files – Oversikt over filer i pakken.\n"
-
-#: ../urpmf:71
-#, c-format
-msgid " --group - group\n"
-msgstr " --group – Gruppe.\n"
-
-#: ../urpmf:72
-#, c-format
-msgid " --license - license\n"
-msgstr " --license – Vis lisensvilkår.\n"
-
-#: ../urpmf:73
-#, c-format
-msgid " --name - package name\n"
-msgstr " --name – Pakkenamn.\n"
-
-#: ../urpmf:74
-#, c-format
-msgid " --obsoletes - obsoletes tags\n"
-msgstr " --obsoletes – Utdatert-merkelappar.\n"
-
-#: ../urpmf:75
-#, c-format
-msgid " --packager - packager\n"
-msgstr " --packager – Pakkebyggjar.\n"
-
-#: ../urpmf:76
-#, c-format
-msgid " --provides - provides tags\n"
-msgstr " --provides – Tilbod-merkelappar.\n"
-
-#: ../urpmf:77
-#, c-format
-msgid " --requires - requires tags\n"
-msgstr " --requires – Krev-merkelappar.\n"
-
-#: ../urpmf:78
-#, c-format
-msgid " --size - installed size\n"
-msgstr " --size – Installert storleik.\n"
-
-#: ../urpmf:79
-#, c-format
-msgid " --sourcerpm - source rpm name\n"
-msgstr " --sourcerpm – Namn på kjelde-RPM.\n"
-
-#: ../urpmf:80
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests – Føreslegen-merkelappar.\n"
-
-#: ../urpmf:81
-#, c-format
-msgid " --summary - summary\n"
-msgstr " --summary – Samandrag.\n"
-
-#: ../urpmf:82
-#, c-format
-msgid " --url - url\n"
-msgstr " --url - Adresse.\n"
-
-#: ../urpmf:83
-#, c-format
-msgid " --vendor - vendor\n"
-msgstr " --vendor – Leverandør.\n"
-
-#: ../urpmf:84
-#, c-format
-msgid " -m - the media in which the package was found\n"
-msgstr " -m – Mediet som pakken vart funnen i.\n"
-
-#: ../urpmf:85 ../urpmq:99
-#, c-format
-msgid " -f - print version, release and arch with name.\n"
-msgstr " -f – Vis versjon-, utgåve og arkitekturinformasjon.\n"
-
#: ../urpmf:153
#, c-format
msgid "unterminated expression (%s)"
msgstr "Uavslutta uttrykk: %s"
-#: ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Ugyldig format: Du kan berre bruka éin fleirverdi-merkelapp."
-
-#: ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "Fann inga «hdlist» for mediet «%s»."
-
-#: ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "Fann inga syntesefil for mediet «%s»."
-
-#: ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "Fann ingen xml-info for mediet «%s»."
-
#: ../urpmi:81
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -2013,7 +2044,8 @@ msgstr " --noclean – Behald rpm-filer i mellomlager.\n"
#: ../urpmi:102
#, c-format
-msgid " --replacepkgs - force installing packages which are already installed.\n"
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
msgstr ""
" --replacepkgs – Tving gjennom installering av pakkar som alt er "
"installerte.\n"
@@ -2148,7 +2180,8 @@ msgstr ""
#: ../urpmi:139
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
-msgstr " --ignorearch – Tillat å installera pakkar for andre arkitekturar.\n"
+msgstr ""
+" --ignorearch – Tillat å installera pakkar for andre arkitekturar.\n"
#: ../urpmi:140
#, c-format
@@ -2157,7 +2190,6 @@ msgstr " --noscripts – Ikkje køyr pakkeskript.\n"
#: ../urpmi:141
#, c-format
-#| msgid " --conflicts - print conflicts.\n"
msgid " --replacefiles - ignore file conflicts\n"
msgstr " --replacefiles – Ignorer filkonfliktar.\n"
@@ -2176,7 +2208,8 @@ msgstr " --prefer – Pakkar som skal føretrekkast.\n"
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
-msgstr " --more-choices – Vis fleire val enn standard ved treff på fleire pakkar.\n"
+msgstr ""
+" --more-choices – Vis fleire val enn standard ved treff på fleire pakkar.\n"
#: ../urpmi:147
#, c-format
@@ -2239,8 +2272,10 @@ msgstr "Brukar standardvalet --buildrequires"
#: ../urpmi:233
#, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
-msgstr "Bruk «--buildrequires» eller «--install-src». Standard er «--buildrequires»."
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgstr ""
+"Bruk «--buildrequires» eller «--install-src». Standard er «--buildrequires»."
#: ../urpmi:253
#, c-format
@@ -2559,7 +2594,8 @@ msgstr ""
#: ../urpmi.addmedia:75
#, c-format
msgid " --interactive - with --distrib, ask confirmation for each media\n"
-msgstr " --interactive – med «--distrib»: Spør om stadfesting for kvart medium.\n"
+msgstr ""
+" --interactive – med «--distrib»: Spør om stadfesting for kvart medium.\n"
#: ../urpmi.addmedia:76
#, c-format
@@ -2593,7 +2629,8 @@ msgstr " --nopubkey – Ikkje importer offentlegnøkkel til nytt medium.\n"
#: ../urpmi.addmedia:82
#, c-format
msgid " --raw - add the media in config, but don't update it.\n"
-msgstr " --raw – Legg mediet til oppsettet, men ikkje oppdater det.\n"
+msgstr ""
+" --raw – Legg mediet til oppsettet, men ikkje oppdater det.\n"
#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
#, c-format
@@ -2693,13 +2730,15 @@ msgstr " --noclean – Ikkje tøm ompakkingsmappe ved kontrollpunkt.\n"
#: ../urpmi.recover:37
#, c-format
-msgid " --list - list transactions since provided date/duration argument\n"
+msgid ""
+" --list - list transactions since provided date/duration argument\n"
msgstr " --list – Vis transaksjonar frå vald dato/lengd-argument.\n"
#: ../urpmi.recover:38
#, c-format
msgid " --list-all - list all transactions in rpmdb (long)\n"
-msgstr " --list-all – Vis oversikt over alle transaksjonar i rpmdb (lang).\n"
+msgstr ""
+" --list-all – Vis oversikt over alle transaksjonar i rpmdb (lang).\n"
#: ../urpmi.recover:39
#, c-format
@@ -2976,7 +3015,8 @@ msgstr " --list-media – Vis oversikt over tilgjengelege medium.\n"
#: ../urpmq:60
#, c-format
msgid " --list-url - list available media and their url.\n"
-msgstr " --list-url – Vis oversikt over tilgjengelge medium, med adresser.\n"
+msgstr ""
+" --list-url – Vis oversikt over tilgjengelge medium, med adresser.\n"
#: ../urpmq:61
#, c-format
@@ -2990,7 +3030,8 @@ msgstr " --list-aliases – Vis oversikt over tilgjengelege parallellalias.\n"
#: ../urpmq:63
#, 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 – Dump oppsettet på same form som «urpmi.addmedia»-"
"argument.\n"
@@ -3002,7 +3043,8 @@ msgstr " --src – Neste pakke er ein kjeldepakke (same som «-s»).\n
#: ../urpmq:65
#, c-format
-msgid " --sources - give all source packages before downloading (root only).\n"
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
msgstr ""
" --sources – Gi alle kjeldepakkar før nedlasting (berre for «root»-"
"brukar).\n"
@@ -3010,7 +3052,8 @@ msgstr ""
#: ../urpmq:67
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
-msgstr " --ignorearch – Tillat førespurnad etter pakkar for andre arkitekturar.\n"
+msgstr ""
+" --ignorearch – Tillat førespurnad etter pakkar for andre arkitekturar.\n"
#: ../urpmq:71
#, c-format
@@ -3096,7 +3139,8 @@ msgstr ""
#: ../urpmq:98
#, c-format
msgid " -c - complete output with package to be removed.\n"
-msgstr " -c – Fullstendig oversikt over pakken som skal fjernast.\n"
+msgstr ""
+" -c – Fullstendig oversikt over pakken som skal fjernast.\n"
#: ../urpmq:100
#, c-format
@@ -3145,7 +3189,8 @@ msgstr " -y – Bruk òg ikkje-ordrett søk (same som «-fuzzy»).\
#: ../urpmq:108
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
-msgstr " -Y – som «-y», men ikkje skil mellom store og små bokstavar.\n"
+msgstr ""
+" -Y – som «-y», men ikkje skil mellom store og små bokstavar.\n"
#: ../urpmq:109
#, c-format
@@ -3179,13 +3224,16 @@ msgstr "Ingen xml-info for mediet «%s». Berre delvis resultat for pakkane «%s
#: ../urpmq:408
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
+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:409
#, 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»."
+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:473
#, c-format
@@ -3268,4 +3316,3 @@ msgstr "Fann ikkje endringslogg.\n"
#~ msgid " -c - clean headers cache directory.\n"
#~ msgstr " -c – Tøm hovudlinjemellomlageret.\n"
-
diff --git a/po/pa_IN.po b/po/pa_IN.po
index d507841c..09dfd54e 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+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"
@@ -27,7 +27,7 @@ msgstr "RPM ਇੰਸਟਾਲੇਸ਼ਨ"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "ਠੀਕ ਹੈ(_O)"
@@ -93,7 +93,7 @@ msgstr "ਇੰਸਟਾਲ(_I)"
msgid "_Save"
msgstr "ਸੰਭਾਲੋ(_S)"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "ਰੱਦ(_C)"
@@ -124,9 +124,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - print this help message.\n"
@@ -161,17 +160,17 @@ msgstr ""
" --verify-rpm - verify rpm signature before installation\n"
" (--no-verify-rpm disable it, default is enabled).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - use only the given media, separated by comma.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - allow search in provides to find package.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - do not search in provides to find package.\n"
@@ -212,7 +211,22 @@ msgstr "ਕਿਰਪਾ ਕਰਕੇ ਇੰਤਜ਼ਾਰ ਕਰੋ..."
msgid "Must be root"
msgstr "ਪ੍ਰਬੰਧਕ (root) ਬਣਨਾ ਪਵੇਗਾ"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "%s ਵੰਡਿਆ ਜਾਦਾ ਹ"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "ਪੈਕੇਜ ਇੰਸਟਾਲੇਸ਼ਨ..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "ਪੈਕੇਜ ਇੰਸਟਾਲੇਸ਼ਨ..."
+
+#: ../gurpmi2:111
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -228,37 +242,37 @@ msgstr ""
msgid "Warning"
msgstr "ਚੇਤਾਵਨੀ"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "ਠੀਕ ਹੈ"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (ਨਵੀਨੀਕਰਨ ਕਰਨ ਲਈ)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (ਇੰਸਟਾਲ ਕਰਨ ਲਈ)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜਾਂ ਦੀ ਲੋੜ ਹੈ:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "ਛੱਡੋ(_A)"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -269,13 +283,13 @@ msgstr ""
"%s\n"
"ਕੀ ਜਾਰੀ ਰੱਖਣਾ ਹੈ?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "ਨਿਰਭਰਤਾ ਹੱਲ ਕਰਨ ਲਈ, ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜ ਇੰਸਟਾਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ (%d ਮੈਬਾ)"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -283,49 +297,44 @@ msgstr ""
"ਨਿਰਭਰਤਾ ਸਮਾਪਤ ਕਰਨ ਲਈ, %d ਪੈਕੇਜ ਇੰਸਟਾਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ:\n"
"%s\n"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "ਪੈਕੇਜ ਇੰਸਟਾਲੇਸ਼ਨ..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "ਸਰੋਤ ਪੈਕੇਜ ਪ੍ਰਾਪਤ ਕਰਨ ਤੋਂ ਅਸਫਲ, ਅਧੂਰਾ ਛੱਡਿਆ ਜਾਦਾ ਹੈ"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "`%s' (%s/%s) ਪੈਕੇਜ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "ਕਿਪਾ ਕਰਕੇ \"%s\" ਨਾਂ ਮਾਧਿਅਮ [%s] ਜੰਤਰ ਵਿੱਚ ਪਾਓ"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "`%s' ਪੈਕੇਜ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "ਸਮਾਪਤ(_D)"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -336,28 +345,28 @@ msgstr ""
"%s\n"
"ਤੁਸੀਂ ਆਪਣੇ urpmi ਡਾਟਾਬੇਸ ਦਾ ਨਵੀਨੀਕਰਨ ਕਰ ਸਕਦੇ ਹੋ"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਅਸਫਲ ਹੋਈ"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "ਇੰਸਟਾਲੇਸ਼ ਸਮਾਪਤ"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "%s ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "urpmi ਮੁੜ ਚਾਲੂ"
@@ -396,7 +405,7 @@ msgstr " %s ਮੂਲ ਹੈ।\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -g - print groups with name also.\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "ਸਿਰਫ਼ ਪ੍ਰਬੰਧਕ ਨੂੰ ਪੈਕੇਜ ਇੰਸਟਾਲ ਕਰਨ ਦੀ ਇਜ਼ਾਜਤ ਹੈ"
@@ -406,134 +415,143 @@ msgstr "ਸਿਰਫ਼ ਪ੍ਰਬੰਧਕ ਨੂੰ ਪੈਕੇਜ ਇੰਸ
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "ਬੱਗ ਜਾਣਕਾਰੀ ਲਈ ਡਾਇਰੈਕਟਰੀ [%s] ਬਣਾਉਣ ਲਈ ਅਸਫਲ"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "`%s' ਪੈਕੇਜ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "%s ਤੇ ਖਾਸ ਵਾਤਾਵਰਣ ਦੀ ਵਰਤੋਂ ਕਰਕੇ\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "rpmdb ਖੋਲਣ ਲਈ ਅਸਫਲ"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "ਗਲਤ rpm ਫਾਇਲ ਨਾਂ [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "rpm ਫਾਇਲ [%s] ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਅਸਫਲ..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...ਪ੍ਰਾਪਤੀ ਹੋਈ"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...ਪ੍ਰਾਪਤੀ ਅਸਫਲ: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "rpm ਫਾਇਲ [%s] ਖੋਲਣ ਲਈ ਅਸਫਲ"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "ਫਾਇਲ [%s] ਵਿੱਚ \"%s\" ਨੂੰ ਪਾਰਸ ਕਰਨ ਲਈ ਅਸਫਲ"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "rpm ਫਾਇਲ ਰਜਿਸਟਰ ਕਰਨ ਲਈ ਅਸਫਲ"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "ਸਥਾਨਕ ਪੈਕੇਜ ਰਜਿਸਟਰ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "ਕਮਾਂਡ ਸਤਰ ਤੇ ਗਲਤ ਪਰਾਕਸੀ ਪ੍ਰਗਟਾ\n"
-#: ../urpm/args.pm:298
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: rpm ਫਾਇਲ \"%s\" ਪੜੀ ਨਹੀਂ ਜਾ ਸਕਦੀ\n"
-#: ../urpm/args.pm:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "ਦਸਤਖਤ (%s) ਗੁੰਮ ਹਨ"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "ਨਕਲ ਕਰਨੀ ਅਸਫਲ"
@@ -580,122 +598,122 @@ msgstr ""
msgid "unable to write config file [%s]"
msgstr "ਸੰਰਚਨਾ ਫਾਇਲ [%s] ਲਿਖਣ ਤੋਂ ਅਸਫਲ"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr ""
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr ""
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "ਉਪਭੋਗਤਾ ਨਾਂ:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "ਗੁਪਤ-ਕੋਡ:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr ""
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr ""
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, fuzzy, c-format
msgid "copy failed"
msgstr "ਨਕਲ ਕਰਨੀ ਅਸਫਲ"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, fuzzy, c-format
msgid "wget is missing\n"
msgstr "ਗੁੰਮ %s ਹੋਣ ਕਰਕੇ"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, fuzzy, c-format
msgid "curl is missing\n"
msgstr "ਗੁੰਮ %s ਹੋਣ ਕਰਕੇ"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr ""
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr ""
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr ""
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr ""
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr ""
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "ਗੁੰਮ %s ਹੋਣ ਕਰਕੇ"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr ""
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, fuzzy, c-format
msgid "retrieving %s"
msgstr "%s ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...ਪ੍ਰਾਪਤੀ ਅਸਫਲ: %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "%s ਲਈ ਅਣਜਾਣ ਪ੍ਰੋਟੋਕਾਲ"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr ""
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "ਕੋਈ webfetch ਨਹੀਂ ਲੱਭਿਆ ਹੈ, ਸਹਿਯੋਗ webfetch ਹਨ: %s\n"
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "ਪ੍ਰੋਟੋਕਾਲ ਹੈਂਡਲ ਕਰਨ ਲਈ ਅਸਫਲ: %s"
@@ -715,58 +733,58 @@ msgstr "ਪੈਕੇਜ %s ਨਹੀਂ ਲੱਭਿਆ ਹੈ।"
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "ਮਾਧਿਅ \"%s\" ਤੋਂ rpm ਫਾਇਲਾਂ ਪ੍ਰਾਪਤ ਕੀਤੀਆਂ ਜਾਦੀਆਂ ਹਨ..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr "%s ਤੇ ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਸੰਚਾਰ ਬਣਾਇਆ (ਹਟਾਏ=%d, ਇੰਸਟਾਲ=%d, ਨਵੀਨੀਕਰਨ=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "ਸੰਚਾਰ ਕਰਨ ਲਈ ਅਸਫਲ"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "ਪੈਕੇਜ %s ਹਟਾਉਣ ਲਈ ਅਸਫਲ"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "ਪੈਕੇਜ %s ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਅਸਫਲ"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "%s ਨੂੰ %s ਤੋਂ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾਦਾ ਹੈ"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "...ਪ੍ਰਾਪਤੀ ਅਸਫਲ: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "ਪੈਕੇਜ %s ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "ਪੈਕੇਜ %s ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "%s ਨੂੰ %s ਤੋਂ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾਦਾ ਹੈ"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "ਪੈਕੇਜ %s ਬਾਰੇ ਵਧੇਰੇ ਜਾਣਕਾਰੀ"
@@ -811,90 +829,80 @@ msgstr "ਚੇਤਾਵਨੀ"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਅਸਫਲ ਹੋਈ"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਅਸਫਲ ਹੋਈ"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜਾਂ ਤੇ ਗਲਤ ਦਸਤਖਤ ਹਨ"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜਾਂ ਤੇ ਗਲਤ ਦਸਤਖਤ ਹਨ"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "ਕੀ ਤੁਸੀਂ ਇੰਸਟਾਲੇਸ਼ਨ ਨਾਲ ਜਾਰੀ ਰਹਿਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "%s ਨੂੰ %s ਤੋਂ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾਦਾ ਹੈ"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "%s ਵੰਡਿਆ ਜਾਦਾ ਹ"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "%s ਨੂੰ %s ਤੋਂ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾਦਾ ਹੈ"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "%s ਇੰਸਟਾਲੇਸ਼ਨ ਜਾਰੀ"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "ਬਿਨਾਂ ਨਿਰਭਰਤਾਂ ਦੇ ਇੰਸਟਾਲੇਸ਼ਨ ਲਈ ਕੋਸ਼ਿਸ ਕਰਨੀ ਹੈ? (y/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਨੂੰ ਧੱਕੇ ਨਾਲ ਵਰਤਣਾ ਹੈ (--force)? (y/N) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਸੰਭਵ ਹੈ"
#: ../urpm/md5sum.pm:26
-#, fuzzy, c-format
-msgid "examining %s file"
-msgstr "MD5SUM ਫਾਇਲ ਪੜਤਾਲ ਜਾਰੀ"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "ਚੇਤਾਵਨੀ: %s ਲਈ md5sum MD5SUM ਫਾਇਲ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ"
@@ -968,228 +976,228 @@ msgstr "ਪੈਕੇਜ %s ਨਵੀਨੀਕਰਨ ਕਰਨ ਦੀ ਬਜਾ
msgid "medium \"%s\" already exists"
msgstr "ਮਾਧਿਅਮ \"%s\" ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "ਮਾਧਿਅਮ \"%s\" ਤੋਂ ਸਿਰਲੇਖ ਵੇਖੇ ਜਾ ਰਹੇ ਹਨ"
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "ਮਾਧਿਅਮ \"%s\" ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr ""
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "rpmdb ਖੋਲਣ ਲਈ ਅਸਫਲ"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "ਪਹਿਲੇ ਇੰਸਟਾਲੇਸ਼ਨ ਮਾਧਿਅਮ ਨੂੰ ਕੋਲਣ ਲ਼ਈ ਅਸਫਲ (ਕੋਈ hdlists ਫਾਇਲ ਨਹੀਂ ਲੱਭੀ)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "hdlists ਫਾਇਲ ਪ੍ਰਾਪਤ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "ਨਾ-ਮੌਜੂਦ ਮਾਧਿਅਮ \"%s\" ਨੂੰ ਚੁਣਨ ਦੀ ਕੋਸ਼ਿਸ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "ਕਈ ਮਾਧਿਅਮ ਚੁਣੇ ਜਾ ਰਹੇ ਹਨ: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "ਮਾਧਿਅਮ \"%s\" ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "\"%s\" ਮਾਧਿਅਮ ਲਈ urpmi ਮੁੜ-ਸੰਰਚਨਾ"
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...ਮੁੜ-ਸੰਰਚਨਾ ਅਸਫਲ"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "ਮੁੜ ਸੰਰਚਨਾ ਹੋਈ"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "ਮਾਧਿਅਮ \"%s\" ਚੁਣਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "ਸ਼ੰਸਲੇਸ਼ਨ ਫਾਇਲ [%s] ਪੜਤਾਲ ਜਾਰੀ"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "\"%s\" ਮਾਧਿਅਮ ਦੀ ਸੰਸਲੇਸ਼ਨ ਫਾਇਲ ਪੜਨ ਦੌਰਾਨ ਸਮੱਸਿਆ"
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "\"%s\" ਮਾਧਿਅਮ ਲਈ list ਫਾਇਲ ਲਿਖੀ ਜਾ ਰਹੀ ਹੈ"
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...ਨਕਲ ਅਸਫਲ"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "\"%s\" ਦੀ ਵੇਰਵਾ ਫਾਇਲ ਦੀ ਨਕਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...ਨਕਲ ਹੋਈ"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "[%s] ਦੀ ਨਕਲ ਅਸਫਲ (ਫਾਇਲ ਸ਼ੱਕੀ ਰੂਪ ਵਿੱਚ ਛੋਟੀ ਹੈ)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "ਪ੍ਰਾਪਤ ਸਰੋਤ hdlist (ਜਾਂ ਸੰਸਲੇਸ਼ਣ) ਦਾ md5sum ਕੱਢਿਆ ਜਾਦਾ ਹੈ"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "[%s] ਦੀ ਨਕਲ ਅਸਫਲ (md5sum ਮੇਲ ਨਹੀਂ ਖਾਂਦਾ)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "hdlist ਫਾਇਲ [%s] ਪੜਤਾਲ ਜਾਰੀ"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "%s ਨੂੰ %s ਤੋਂ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾਦਾ ਹੈ"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ਮਾਧਿਅਮ \"%s\" ਲਈ hdlist ਫਾਇਲ ਨਹੀਂ ਮਿਲੀ"
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "\"%s\" ਦੀ ਵੇਰਵਾ ਫਾਇਲ ਦੀ ਨਕਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "ਗਲਤ rpm ਫਾਇਲ ਨਾਂ [%s]"
-#: ../urpm/media.pm:1461
-#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "\"%s\" ਲਈ hdlist (ਜਾਂ ਸੰਸਲੇਸ਼ਨ) ਪ੍ਰਾਪਤ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
-
-#: ../urpm/media.pm:1478
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "%s ਵਾਂਗ hdlist (ਜਾਂ ਸੰਸਲੇਸ਼ਨ) ਖੋਜੀ ਗਈ"
+msgid "no metadata found for medium \"%s\""
+msgstr "ਮਾਧਿਅਮ \"%s\" ਲਈ hdlist ਫਾਇਲ ਨਹੀਂ ਮਿਲੀ"
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "ਮਾਧਿਅਮ \"%s\" ਲਈ hdlist ਫਾਇਲ ਨਹੀਂ ਮਿਲੀ"
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "\"%s\" ਲਈ hdlist (ਜਾਂ ਸੰਸਲੇਸ਼ਨ) ਪ੍ਰਾਪਤ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "\"%s\" ਦੀ ਸਵਰਜਨਕ ਕੁੰਜੀ ਫਾਇਲ ਵੇਖੀ ਜਾਦੀ ਹੈ..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...\"%s\" ਦੀ ਸਰਵਜਨਕ ਕੁੰਜੀ ਤੋਂ %s ਕੁੰਜੀ ਆਯਾਤੀ ਕੀਤੀ"
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "\"%s\" ਦੀ ਸਵਰਜਨਕ ਕੁੰਜੀ ਆਯਾਤ ਕਰਨੀ ਅਸਫਲ"
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "ਮਾਧਿਅਮ \"%s\" ਲਈ hdlist ਫਾਇਲ ਨਹੀਂ ਮਿਲੀ"
+
+#: ../urpm/media.pm:1612
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "ਮਾਧਿਅਮ %s ਸ਼ਾਮਲ"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "[%s] ਤੋਂ rpm ਫਾਇਲਾਂ ਪੜੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1260,7 +1268,7 @@ msgstr ""
msgid "TB"
msgstr ""
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1620,11 +1628,6 @@ msgstr " -f - print version, release and arch with name.\n"
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "%s ਤੇ ਖਾਸ ਵਾਤਾਵਰਣ ਦੀ ਵਰਤੋਂ ਕਰਕੇ\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1640,118 +1643,136 @@ msgstr "ਮਾਧਿਅਮ \"%s\" ਲਈ hdlist ਸੰਸਲੇਸ਼ਕ ਫਾਇ
msgid "no xml-info available for medium \"%s\""
msgstr "\"%s\" ਮਾਧਿਅਮ ਲਈ list ਫਾਇਲ ਲਿਖੀ ਜਾ ਰਹੀ ਹੈ"
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "ਕੋਈ ਪੈਕੇਜ %s ਨਾਂ ਨਾਲ ਨਹੀਂ"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜਾਂ ਵਿੱਚ %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "ਗੁੰਮ %s ਹੋਣ ਕਰਕੇ"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "ਨਾ-ਪੂਰਾ %s ਹੋਣ ਕਰਕੇ"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "%s ਨੂੰ ਵਧਾਉਣ ਦੀ ਕੋਸ਼ਿਸ ਦੌਰਾਨ"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "%s ਰੱਖਣ ਲਈ"
#: ../urpm/select.pm:607
+#, fuzzy, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"ਹੋਰ ਪੈਕੇਜਾਂ ਦਾ ਨਵੀਨੀਕਰਨ ਕਰਨ ਦੌਰਾਨ ਇਹ ਪੈਕੇਜ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"ਹੋਰ ਪੈਕੇਜਾਂ ਦਾ ਨਵੀਨੀਕਰਨ ਕਰਨ ਦੌਰਾਨ ਇਹ ਪੈਕੇਜ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ:\n"
+"%s"
+
+#: ../urpm/select.pm:635
#, c-format
msgid "in order to install %s"
msgstr "%s ਨੂੰ ਇੰਸਟਾਲ ਕਰਨ ਲਈ"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "%s ਨਾਲ ਅਪਵਾਦ ਕਰਕੇ"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "ਗਲਤ ਦਸਤਖਤ (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "ਗਲਤ ਕੁੰਜੀ ID (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "ਦਸਤਖਤ (%s) ਗੁੰਮ ਹਨ"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "ਫਾਇਲ [%s] ਲਿਖਣ ਲਈ ਅਸਫਲ"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "ਨਕਲ ਕਰਨੀ ਅਸਫਲ"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "ਨਕਲ ਕਰਨੀ ਅਸਫਲ"
@@ -1792,7 +1813,7 @@ msgstr " --test - verify if the removal can be achieved correctly.\n"
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - distributed urpmi across machines of alias.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - print tag packager: packager.\n"
@@ -1821,7 +1842,7 @@ msgstr ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
" to (un)install a chroot with --root option.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - verbose mode.\n"
@@ -1885,7 +1906,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "ਪੈਕੇਜ %s ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
msgstr[1] "ਪੈਕੇਜ %s ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (y/N) "
@@ -2143,17 +2164,22 @@ msgstr " --url - print tag url: url.\n"
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - print tag description: description.\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - print tag conflicts: all conflicts.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - packages which installation should be skipped\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, fuzzy, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --skip - packages which installation should be skipped\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2162,70 +2188,70 @@ msgstr ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - keep rpm not used in cache.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - upgrade only packages with the same architecture.\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - select all matches on command line.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - quiet mode.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --verbose - verbose mode.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " ਕਮਾਂਡ ਸਤਰ ਤੇ ਦਿੱਤੇ ਨਾਂ ਜਾਂ rpm ਫਾਇਲਾਂ ਨੂੰ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾਵੇਗਾ।\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "ਬਾਈਨਰੀ rpm ਫਾਇਲਾਂ ਨਾਲ ਕੀ ਕਰਨਾ ਹੈ, ਜਦੋਂ ਕਿ --install-src ਵਰਤੋਂ"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2234,17 +2260,12 @@ msgstr ""
"ਡਾਇਰੈਕਟਰੀ [%s] ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ, ਕਿਰਪਾ ਕਰਕੇ ਬੱਗ ਰਿਪੋਰਟ ਲਈ ਹੋਰ ਡਾਇਰੈਕਟਰੀ ਬਣਾਉ ਜਾਂ ਇਸ ਨੂੰ "
"ਹਟਾਓ"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "ਬੱਗ ਜਾਣਕਾਰੀ ਲਈ ਡਾਇਰੈਕਟਰੀ [%s] ਬਣਾਉਣ ਲਈ ਅਸਫਲ"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2253,48 +2274,48 @@ msgstr ""
"ਗਲਤੀ: %s ਸ਼ਾਇਦ ਪੜਨ ਲਈ ਹੀ ਮਾਊਟ ਕੀਤੀ ਗਈ ਹੈ।\n"
"ਧੱਕੇ ਕਰਨ ਲਈ --allow-force ਵਰਤੋਂ।"
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (ਨਵੀਨੀਕਰਨ ਕਰਨ ਲਈ)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (ਨਵੀਨੀਕਰਨ ਕਰਨ ਲਈ)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (ਇੰਸਟਾਲ ਕਰਨ ਲਈ)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (ਇੰਸਟਾਲ ਕਰਨ ਲਈ)"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "ਨਿਰਭਰਤਾ ਹੱਲ਼ ਕਰਨ ਲਈ, %d ਪੈਕੇਜ ਹਟਾਏ ਜਾਣਗੇ (%d ਮੈਬਾ)"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "ਤੁਹਾਡੀ ਚੋਣ ਕੀ ਹੈ? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2305,7 +2326,7 @@ msgstr ""
"ਇੰਸਟਾਲ ਕੀਤਿਆਂ ਤੋਂ ਪੁਰਾਣੇ ਹਨ:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2316,19 +2337,19 @@ msgstr ""
"ਇੰਸਟਾਲ ਕੀਤਿਆਂ ਤੋਂ ਪੁਰਾਣੇ ਹਨ:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "ਕਿਸੇ ਤਰਾਂ ਜਾਰੀ ਰਹੋ?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (Y/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2337,7 +2358,7 @@ msgstr ""
"ਮੰਗੇ ਕੁਝ ਪੈਕੇਜ ਇੰਸਟਾਲ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕਦੇ ਹਨ:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2346,12 +2367,12 @@ msgstr ""
"ਮੰਗੇ ਕੁਝ ਪੈਕੇਜ ਇੰਸਟਾਲ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕਦੇ ਹਨ:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "ਪੈਕੇਜ %s ਹਟਾਉਣ ਨਾਲ ਤੁਹਾਡਾ ਸਿਸਟਮ ਖਰਾਬ ਹੋ ਜਾਵੇਗਾ"
-#: ../urpmi:551
+#: ../urpmi:538
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2362,7 +2383,7 @@ msgstr ""
"ਹੋਰਾਂ ਦੇ ਨਵੀਨੀਕਰਨ ਲਈ ਹਟਾ ਦਿੱਤਾ ਗਿਆ ਹੈ:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2373,30 +2394,12 @@ msgstr ""
"ਹੋਰਾਂ ਦੇ ਨਵੀਨੀਕਰਨ ਲਈ ਹਟਾ ਦਿੱਤਾ ਗਿਆ ਹੈ:\n"
"%s\n"
-#: ../urpmi:560
-#, fuzzy, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"ਹੋਰ ਪੈਕੇਜਾਂ ਦਾ ਨਵੀਨੀਕਰਨ ਕਰਨ ਦੌਰਾਨ ਇਹ ਪੈਕੇਜ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"ਹੋਰ ਪੈਕੇਜਾਂ ਦਾ ਨਵੀਨੀਕਰਨ ਕਰਨ ਦੌਰਾਨ ਇਹ ਪੈਕੇਜ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2406,46 +2409,46 @@ msgstr ""
"ਤੁਹਾਨੂੰ ਇਹ ਨਿਰਭਰਤਾ ਹੱਲ਼ ਕਰਨ ਲਈ ਪ੍ਰਬੰਧਕ (root) ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "ਨਿਰਭਰਤਾ ਹੱਲ਼ ਕਰਨ ਲਈ, %d ਪੈਕੇਜ ਹਟਾਏ ਜਾਣਗੇ (%d ਮੈਬਾ)"
msgstr[1] "ਨਿਰਭਰਤਾ ਹੱਲ਼ ਕਰਨ ਲਈ, %d ਪੈਕੇਜ ਹਟਾਏ ਜਾਣਗੇ (%d ਮੈਬਾ)"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "ਰੱਦ ਕਰੋ"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "ਕਿਰਪਾ ਕਰਕੇ ਤਿਆਰ ਹੋਣ ਤੇ Enter ਦਬਾਓ..."
@@ -3182,6 +3185,14 @@ msgstr ""
msgid "No changelog found\n"
msgstr "ਕੋਈ changelog ਨਹੀਂ\n"
+#, fuzzy
+#~ msgid "examining %s file"
+#~ msgstr "MD5SUM ਫਾਇਲ ਪੜਤਾਲ ਜਾਰੀ"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "%s ਵਾਂਗ hdlist (ਜਾਂ ਸੰਸਲੇਸ਼ਨ) ਖੋਜੀ ਗਈ"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - create an update medium.\n"
diff --git a/po/pl.po b/po/pl.po
index b231c1de..775f27ba 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -18,18 +18,19 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2008-09-06 13:25+0200\n"
-"Last-Translator: Amazis.net sp. z o.o. - Tomasz Bednarski <tomasz.bednarski@mandriva.pl>\n"
+"Last-Translator: Amazis.net sp. z o.o. - Tomasz Bednarski <tomasz."
+"bednarski@mandriva.pl>\n"
"Language-Team: <pl@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
-#: ../gurpmi:31
-#: ../gurpmi2:74
+#: ../gurpmi:31 ../gurpmi2:74
#, c-format
msgid "RPM installation"
msgstr "Instalacja pakietów RPM"
@@ -37,11 +38,10 @@ msgstr "Instalacja pakietów RPM"
#: ../gurpmi:45
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
-msgstr "Błąd: odnalezienie pliku %s było niemożliwe, operacja zostanie anulowana"
+msgstr ""
+"Błąd: odnalezienie pliku %s było niemożliwe, operacja zostanie anulowana"
-#: ../gurpmi:46
-#: ../gurpmi2:175
-#: ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -53,7 +53,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 ""
@@ -66,8 +67,7 @@ msgstr ""
"\n"
"Co chcesz zrobić?"
-#: ../gurpmi:74
-#: ../gurpmi:85
+#: ../gurpmi:74 ../gurpmi:85
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -107,8 +107,7 @@ msgstr "Zainstaluj"
msgid "_Save"
msgstr "_Zapisz"
-#: ../gurpmi:100
-#: ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Anuluj"
@@ -118,19 +117,20 @@ msgstr "_Anuluj"
msgid "Choose location to save file"
msgstr "Wybierz miejsce zapisania pliku"
-#: ../gurpmi.pm:39
-#: ../urpmi:67
+#: ../gurpmi.pm:39 ../urpmi:67
#, c-format
msgid ""
"urpmi version %s\n"
"Copyright (C) 1999-2008 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 wersja %s\n"
"Copyright (C) 1999-2008 Mandriva.\n"
-"To jest otwarte oprogramowanie i może być rozpowszechniane na zasadach licencji GNU GPL.\n"
+"To jest otwarte oprogramowanie i może być rozpowszechniane na zasadach "
+"licencji GNU GPL.\n"
"\n"
"użycie:\n"
@@ -139,43 +139,37 @@ msgstr ""
msgid "Options:"
msgstr "Opcje:"
-#: ../gurpmi.pm:46
-#: ../urpm/search.pm:35
-#: ../urpme:46
-#: ../urpmf:35
-#: ../urpmi:72
-#: ../urpmi.addmedia:54
-#: ../urpmi.recover:33
-#: ../urpmi.removemedia:40
-#: ../urpmi.update:32
-#: ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - wyświetla ten komunikat pomocy.\n"
-#: ../gurpmi.pm:47
-#: ../urpmi:79
+#: ../gurpmi.pm:47 ../urpmi:79
#, c-format
-msgid " --auto - non-interactive mode, assume default answers to questions.\n"
-msgstr " --auto - tryb nieinteraktywny, stosuje domyślne odpowiedzi na pytania.\n"
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions.\n"
+msgstr ""
+" --auto - tryb nieinteraktywny, stosuje domyślne odpowiedzi na "
+"pytania.\n"
-#: ../gurpmi.pm:48
-#: ../urpmi:80
-#: ../urpmq:52
+#: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - automatycznie wybiera pakiety aktualizujące system.\n"
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - automatycznie wybiera pakiety aktualizujące system.\n"
-#: ../gurpmi.pm:49
-#: ../urpme:50
-#: ../urpmi:103
-#: ../urpmq:66
+#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - wymusza wywoływanie nawet przy braku niektórych pakietów.\n"
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - wymusza wywoływanie nawet przy braku niektórych "
+"pakietów.\n"
-#: ../gurpmi.pm:50
-#: ../urpmi:133
+#: ../gurpmi.pm:50 ../urpmi:133
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -184,45 +178,46 @@ msgstr ""
" --verify-rpm - bada podpis cyfrowy pakietu przed instalacją.\n"
" (--no-verify-rpm wyłącza, domyślnie włączone).\n"
-#: ../gurpmi.pm:52
-#: ../urpm/search.pm:41
-#: ../urpmf:41
-#: ../urpmi:73
-#: ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
-msgstr " --media - używa tylko podanych nośników, rozdzielonych przecinkami.\n"
+msgstr ""
+" --media - używa tylko podanych nośników, rozdzielonych "
+"przecinkami.\n"
-#: ../gurpmi.pm:53
-#: ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
-msgstr " -p - umożliwia wyszukiwanie serwerów przy szukaniu pakietów.\n"
+msgstr ""
+" -p - umożliwia wyszukiwanie serwerów przy szukaniu pakietów.\n"
-#: ../gurpmi.pm:54
-#: ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
-msgstr " -P - nie przeszukuje serwerów przy wyszukiwaniu pakietów.\n"
+msgstr ""
+" -P - nie przeszukuje serwerów przy wyszukiwaniu pakietów.\n"
-#: ../gurpmi.pm:55
-#: ../urpmi:110
-#: ../urpmq:69
+#: ../gurpmi.pm:55 ../urpmi:110 ../urpmq:69
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - używa innego katalogu głównego do instalacji 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 - sprawdza, czy instalacja zostanie przeprowadzona prawidłowo.\n"
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - sprawdza, czy instalacja zostanie przeprowadzona "
+"prawidłowo.\n"
-#: ../gurpmi.pm:57
-#: ../urpmi:76
+#: ../gurpmi.pm:57 ../urpmi:76
#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
-msgstr " --searchmedia - używa tylko podanych nośników podczas wyszukiwania wymaganych pakietów.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - używa tylko podanych nośników podczas wyszukiwania "
+"wymaganych pakietów.\n"
#: ../gurpmi.pm:100
#, c-format
@@ -239,7 +234,22 @@ msgstr "Proszę czekać..."
msgid "Must be root"
msgstr "Tylko root ma prawo do tego działania"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "rozpowszechnianie %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Instalacja pakietu..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Instalacja pakietu..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -255,38 +265,37 @@ msgstr ""
msgid "Warning"
msgstr "Ostrzeżenie"
-#: ../gurpmi2:134
-#: ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (do aktualizacji)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (do zainstalowania)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Wybór pakietów"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Wymagany jest jeden z następujących pakietów:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Przerwij"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -297,19 +306,21 @@ msgstr ""
"%s\n"
"Czy kontynuować mimo to?"
-#: ../gurpmi2:241
-#: ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
-msgstr "W celu spełnienia zależności zostanie zainstalowany następujący pakiet:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
+msgstr ""
+"W celu spełnienia zależności zostanie zainstalowany następujący pakiet:"
-#: ../gurpmi2:242
-#: ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
-msgstr "W celu spełnienia zależności zostaną zainstalowane następujące pakiety:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr ""
+"W celu spełnienia zależności zostaną zainstalowane następujące pakiety:"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
@@ -317,46 +328,37 @@ msgstr[0] "(%d pakiet, %d MB)"
msgstr[1] "(%d pakietów, %d MB)"
msgstr[2] "(%d pakietów, %d MB)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Instalacja pakietu..."
-
-#: ../gurpmi2:252
-#: ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "nie można pobrać pakietów źródłowych, zaniechanie"
-#: ../gurpmi2:266
-#: ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Przygotowywanie..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Instalowanie pakietu \"%s\" (%s/%s)..."
-#: ../gurpmi2:287
-#: ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Włóż nośnik o nazwie \"%s\" "
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Pobieranie pakietu \"%s\"..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "Gotowe"
-#: ../gurpmi2:332
-#: ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -367,33 +369,28 @@ msgstr ""
"%s\n"
"Może zachodzić potrzeba aktualizacji bazy danych urpmi"
-#: ../gurpmi2:338
-#: ../urpm/main_loop.pm:223
-#: ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259
-#: ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "Instalacja nie powiodła się:"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Wszystko zostało już zainstalowane"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Instalacja zakończona"
-#: ../gurpmi2:346
-#: ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "usuwanie %s"
-#: ../gurpmi2:354
-#: ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "ponownie uruchamianie urpmi"
@@ -432,8 +429,7 @@ msgstr " domyślną wartością jest %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - wyświetla pełną nazwę pakietu rpm (NVRA).\n"
-#: ../rurpmi:11
-#: ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Tylko administrator ma prawo instalować pakiety"
@@ -443,159 +439,162 @@ msgstr "Tylko administrator ma prawo instalować pakiety"
msgid "Running urpmi in restricted mode..."
msgstr "Uruchamianie urpmi w trybie restrykcyjnym..."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, c-format
msgid "fail to create directory %s"
msgstr "utworzenie katalogu %s było niemożliwe"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr "nieprawidłowy właściciel katalogu %s"
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, c-format
msgid "Can not download packages into %s"
msgstr "Pobranie pakietów do %s było niemożliwe"
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr "Katalog %s nie istnieje"
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "używając określonego środowiska na %s\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "nie można otworzyć bazy danych rpm"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "niepoprawna nazwa pliku rpm [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "pobieranie pliku rpm [%s] ..."
-#: ../urpm.pm:296
-#: ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...pobieranie zakończone"
-#: ../urpm.pm:299
-#: ../urpm/download.pm:731
-#: ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836
-#: ../urpm/media.pm:1287
-#: ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...pobieranie nie powiodło się: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "nie można uzyskać dostępu do pliku rpm [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "nie można przetworzyć pliku konfiguracyjnego %s [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "nie można zarejestrować pliku rpm"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Niezgodna architektura dla pakietu rpm [%s]"
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "błąd w trakcie rejestrowania pakietów lokalnych"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Operacja niedozwolona podczas pracy w trybie restrykcyjnym"
-#: ../urpm/args.pm:145
-#: ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "niepoprawna deklaracja serwera pośredniczącego w wierszu poleceń\n"
-#: ../urpm/args.pm:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "niespodziewane wyrażenie %s"
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "brakujące wyrażenie przed %s"
-#: ../urpm/args.pm:382
+#: ../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:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "brak wyrażenia do zamknięcia"
-#: ../urpm/args.pm:395
+#: ../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:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "Katalog chroot nie istnieje"
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr "Nie można użyć %s bez %s"
-#: ../urpm/args.pm:485
-#: ../urpm/args.pm:488
-#: ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr "Nie można użyć %s z %s"
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr "Zbyt wiele argumentów\n"
-#: ../urpm/bug_report.pm:51
-#: ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Kopiowanie zakończone niepowodzeniem"
#: ../urpm/cdrom.pm:66
#, c-format
-msgid "You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done automatically)"
-msgstr "Musisz zamontować CD-ROM samodzielnie (lub zainstalować perl-Hal-Cdroms, aby to zautomatyzować)"
+msgid ""
+"You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+"Musisz zamontować CD-ROM samodzielnie (lub zainstalować perl-Hal-Cdroms, aby "
+"to zautomatyzować)"
#: ../urpm/cdrom.pm:68
#, c-format
msgid "HAL daemon (hald) is not running or not ready"
msgstr "Usługa HAL (hald) nie działa lub nie jest gotowa"
-#: ../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 "nośnik %s jest niedostępny"
@@ -620,129 +619,129 @@ 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:251
-#: ../urpm/media.pm:497
-#: ../urpm/media.pm:503
+#: ../urpm/cfg.pm:251 ../urpm/media.pm:497 ../urpm/media.pm:503
#, c-format
msgid "unable to write config file [%s]"
msgstr "nie można zapisać pliku konfiguracyjnego [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "%s jest niedostępny, ponowne stosowanie %s"
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
-msgstr "odczytanie ustawień proxy było niemożliwe (niewystarczające prawa do odczytu %s)"
+msgstr ""
+"odczytanie ustawień proxy było niemożliwe (niewystarczające prawa do odczytu "
+"%s)"
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Aby uzyskać dostęp do proxy wprowadź informacje uwierzytelniające\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Nazwa użytkownika: "
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Hasło:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr "Nieznany program do pobierania plików %s!!!\n"
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr "%s nie powiodło się: zakończono z sygnałem %d"
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr "%s nie powiodło się: zakończono z %d"
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, c-format
msgid "copy failed"
msgstr "kopiowanie zakończone niepowodzeniem"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, c-format
msgid "wget is missing\n"
msgstr "brak programu wget\n"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, c-format
msgid "curl is missing\n"
msgstr "brak programu curl\n"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr "wystąpił błąd w programie curl: pobieranie przerwane\n"
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr "brak programu rsync\n"
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr "brak programu ssh\n"
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr "brak programu prozilla\n"
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr "Uruchomienie programu prozilla było niemożliwe\n"
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, c-format
msgid "aria2 is missing\n"
msgstr "brak programu aria2\n"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr " %s%% z %s zostało pobrane, ETA = %s, prędkość = %s"
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr " %s%% zakończono, prędkość = %s"
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, c-format
msgid "retrieving %s"
msgstr "pobieranie %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, c-format
msgid "retrieved %s"
msgstr "...pobrano %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "nieznany protokół zdefiniowany dla %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "%s jest niedostępny, ponowne stosowanie %s"
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, 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:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "nie można obsłużyć protokołu: %s"
@@ -762,58 +761,60 @@ msgstr "pakiet %s nie został odnaleziony."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "pobieranie plików rpm z nośnika \"%s\"..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr "[ponowne tworzenie pakietu]"
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "utworzono transakcję dla instalacji na %s (usuwanie=%d, instalacja=%d, aktualizacja=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"utworzono transakcję dla instalacji na %s (usuwanie=%d, instalacja=%d, "
+"aktualizacja=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "nie można utworzyć transakcji"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "nie można wypakować pakietu rpm z pakietu delta-rpm %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "nie można zainstalować pakietu %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "usuwanie niepoprawnego pakietu rpm (%s) z %s"
-#: ../urpm/install.pm:218
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, c-format
msgid "removing %s failed: %s"
msgstr "usuwanie %s nie powiodło się: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, c-format
msgid "Removing package %s"
msgstr "Usuwanie pakietu %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "usuwanie pakietu %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "usuwanie zainstalowanych pakietów rpm (%s) z %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Więcej informacji o pakiecie %s"
@@ -838,8 +839,7 @@ msgstr "Nie zdefiniowano serwera, brak URI lub hosta"
msgid "No base defined"
msgstr "Nie zdefiniowano podstawy"
-#: ../urpm/ldap.pm:172
-#: ../urpm/ldap.pm:175
+#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
#, c-format
msgid "Cannot connect to ldap uri:"
msgstr "Połączenie z Uri ldap było niemożliwe:"
@@ -859,22 +859,18 @@ msgstr "przerywanie"
msgid "%s database is locked (another program is already using it)"
msgstr "%s baza danych zablokowana (jest używana przez inny program)"
-#: ../urpm/main_loop.pm:110
-#: ../urpm/main_loop.pm:120
-#: ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230
-#: ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Instalacja nie powiodła się"
-#: ../urpm/main_loop.pm:112
-#: ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr "Czy chcesz kontynuować mimo to? (t/N)"
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -883,86 +879,78 @@ msgstr ""
"Instalacja nie powiodła się. Nieprawidłowe pakiety rpm:\n"
"%s"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, c-format
msgid "The following package has bad signature"
msgstr "Poniższy pakiet ma niepoprawny podpis"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Następujące pakiety zawierają niepoprawne podpisy"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Czy chcesz kontynuować instalację ?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, c-format
msgid "removing installed rpms (%s)"
msgstr "usuwanie zainstalowanych pakietów rpm (%s) "
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "rozpowszechnianie %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "instalowanie %s z %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "instalowanie %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Próbować instalować bez sprawdzania zależności? (t/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Czy chcesz spróbować wymusić instalację (--force)? (t/N) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr "Oprogramowanie jest zaktualizowane"
-#: ../urpm/main_loop.pm:306
-#: ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Instalacja jest możliwa"
#: ../urpm/md5sum.pm:26
#, c-format
-msgid "examining %s file"
-msgstr "analizowanie pliku %s"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr "nieprawidłowa suma MD5 pliku"
-
-#: ../urpm/md5sum.pm:28
-#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "ostrzeżenie: md5sum dla %s jest niedostępna w pliku MD5SUM"
#: ../urpm/media.pm:204
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "wirtualny nośnik \"%s\" powinien posiadać jasny URL, zignorowano nośnik"
+msgstr ""
+"wirtualny nośnik \"%s\" powinien posiadać jasny URL, zignorowano nośnik"
#: ../urpm/media.pm:206
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "nie można uzyskać dostępu do pliku listy związanego z \"%s\", zignorowano nośnik"
+msgstr ""
+"nie można uzyskać dostępu do pliku listy związanego z \"%s\", zignorowano "
+"nośnik"
#: ../urpm/media.pm:213
#, c-format
@@ -979,8 +967,7 @@ msgstr "próba przełączenia istniejącego nośnika \"%s\", anulowano"
msgid "failed to migrate removable device, ignoring media"
msgstr "migracja nośnika wymiennego była niemożliwa, ignorowanie"
-#: ../urpm/media.pm:499
-#: ../urpm/media.pm:505
+#: ../urpm/media.pm:499 ../urpm/media.pm:505
#, c-format
msgid "wrote config file [%s]"
msgstr "zapisywanie pliku konfiguracyjnego [%s]"
@@ -997,8 +984,12 @@ msgstr "użycie nośnika przypisanego dla trybu równoległego: %s"
#: ../urpm/media.pm:572
#, c-format
-msgid "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --update, --use-distrib or --parallel"
-msgstr "--synthesis nie można używać z opcjami --media, --excludemedia, --sortmedia, --update, --use-distrib i --parallel"
+msgid ""
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update, --use-distrib or --parallel"
+msgstr ""
+"--synthesis nie można używać z opcjami --media, --excludemedia, --sortmedia, "
+"--update, --use-distrib i --parallel"
#: ../urpm/media.pm:666
#, c-format
@@ -1020,241 +1011,233 @@ msgstr "mogłoby to spowodować zainstalowanie zamiast uaktualnienia pakietu %s"
msgid "medium \"%s\" already exists"
msgstr "nośnik \"%s\" już istnieje"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr "(domyślnie ignorowany)"
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "dodawanie nośnika %s przed zdalnym nośnikiem %s"
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, c-format
msgid "adding medium \"%s\""
msgstr "dodawanie nośnika %s"
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr "katalog %s nie istnieje"
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "wygląda na to, że we wskazanej lokalizacji nie ma dystrybucji"
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, c-format
msgid "unable to parse media.cfg"
msgstr "nie można przetworzyć media.cfg"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
-msgstr "uzyskanie dostępu do nośnika dystrybucji było niemożliwe (nie odnaleziono pliku media.cfg)"
+msgstr ""
+"uzyskanie dostępu do nośnika dystrybucji było niemożliwe (nie odnaleziono "
+"pliku media.cfg)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr "pomijanie nie zgodnych nośników '%s' (dla %s)"
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, c-format
msgid "retrieving media.cfg file..."
msgstr "pobieranie pliku media.cfg..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "próba wyboru nieistniejącego nośnika \"%s\""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "wybieranie wielu nośników: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "usuwanie nośnika \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "zmiana konfiguracji urpmi dla nośnika \"%s\""
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...zmiana konfiguracji zakończone niepowodzeniem"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "zmiana konfiguracji zakończona"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
-msgstr "Błąd podczas generowania pliku z nazwami: nie odnaleziono zależności %d"
+msgstr ""
+"Błąd podczas generowania pliku z nazwami: nie odnaleziono zależności %d"
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "nośnik %s jest aktualny"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "sprawdzanie pliku syntezy [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "wystąpił problem podczas odczytu pliku syntezy dla nośnika \"%s\""
-#: ../urpm/media.pm:1176
-#: ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "kopiowanie [%s] dla nośnika %s..."
-#: ../urpm/media.pm:1178
-#: ../urpm/media.pm:1233
-#: ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...kopiowanie zakończone niepowodzeniem"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopiowanie pliku opisowego związanego z \"%s\"..."
-#: ../urpm/media.pm:1231
-#: ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...kopiowanie zakończone"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopiowanie [%s] zakończone niepowodzeniem (plik jest podejrzanie mały)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "obliczanie sumy md5 pobranego pliku syntezy"
-#: ../urpm/media.pm:1312
-#: ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "pobieranie [%s] zakończone niepowodzeniem (niezgodna suma md5)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, c-format
msgid "genhdlist2 failed on %s"
msgstr "polecenie genhdlist2 spowodowało błąd w %s"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, c-format
msgid "comparing %s and %s"
msgstr "porównywanie %s i %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "nieprawidłowy plik hdlist %s dla nośnika %s"
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "kopiowanie pliku MD5SUM dla \"%s\"..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "nieprawidłowa suma MD5 pliku (pobrano z %s)"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
+#, fuzzy, c-format
+msgid "no metadata found for medium \"%s\""
+msgstr "nie znaleziono pliku syntezy dla nośnika \"%s\""
+
+#: ../urpm/media.pm:1475
#, c-format
msgid "retrieving source synthesis of \"%s\"..."
msgstr "pobieranie pliku syntezy związanego z \"%s\"..."
-#: ../urpm/media.pm:1478
-#, c-format
-msgid "found probed synthesis as %s"
-msgstr "znaleziono zbadany plik syntezy jako %s"
-
-#: ../urpm/media.pm:1485
-#: ../urpm/media.pm:1593
-#, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "nie znaleziono pliku syntezy dla nośnika \"%s\""
-
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "sprawdzanie pliku klucza publicznego związanego z \"%s\"..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...zaimportowany klucz %s z klucza publicznego związanego z \"%s\""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "nie można zaimportować pliku klucza publicznego związanego z \"%s\""
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "nie znaleziono pliku syntezy dla nośnika \"%s\""
+
+#: ../urpm/media.pm:1612
#, c-format
msgid "updated medium \"%s\""
msgstr "zaktualizowany nośnik %s"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr "pobieranie [%s] nie powiodło się"
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr "ponowna próba połączenia z serwerem %s"
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr "Odnalezienie serwera na liście serwerów %s nie było możliwe"
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
-msgstr "odnaleziono lokalizację geograficzną %s %.2f %.2f na podstawie strefy czasowej %s"
+msgstr ""
+"odnaleziono lokalizację geograficzną %s %.2f %.2f na podstawie strefy "
+"czasowej %s"
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, c-format
msgid "getting mirror list from %s"
msgstr "pobieranie listy serwerów z %s"
-#: ../urpm/msg.pm:63
-#: ../urpmi:514
-#: ../urpmi:529
-#: ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64
-#: ../urpme:38
-#: ../urpmi:568
-#: ../urpmi:663
-#: ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1320,18 +1303,25 @@ msgstr "MB"
msgid "GB"
msgstr "GB"
-#: ../urpm/msg.pm:190
-#: ../urpm/msg.pm:199
+#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
#, c-format
msgid "TB"
msgstr "TB"
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
-msgid "The following package is now orphan, use \"urpme --auto-orphans\" to remove it."
-msgid_plural "The following packages are now orphans, use \"urpme --auto-orphans\" to remove them."
-msgstr[0] "Poniżej wyświetlono osierocony pakiet. Użyj polecenia \"urpme --auto-orphans\", aby go usunąć."
-msgstr[1] "Poniżej wyświetlono osierocone pakiety. Użyj polecenia \"urpme --auto-orphans\", aby je usunąć."
+msgid ""
+"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
+"it."
+msgid_plural ""
+"The following packages are now orphans, use \"urpme --auto-orphans\" to "
+"remove them."
+msgstr[0] ""
+"Poniżej wyświetlono osierocony pakiet. Użyj polecenia \"urpme --auto-orphans"
+"\", aby go usunąć."
+msgstr[1] ""
+"Poniżej wyświetlono osierocone pakiety. Użyj polecenia \"urpme --auto-"
+"orphans\", aby je usunąć."
msgstr[2] ""
#: ../urpm/parallel.pm:14
@@ -1386,16 +1376,19 @@ msgstr "cp nie powiodło się na komputerze %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 nie zadziałał na komputerze %s (być może nie ma on odpowiedniej wersji urpmi?) (kod wyjściowy: %d)"
+msgid ""
+"%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
+"code: %d)"
+msgstr ""
+"%s nie zadziałał na komputerze %s (być może nie ma on odpowiedniej wersji "
+"urpmi?) (kod wyjściowy: %d)"
#: ../urpm/removable.pm:32
#, c-format
msgid "unable to access medium \"%s\"."
msgstr "nie można uzyskać dostępu do nośnika \"%s\"."
-#: ../urpm/removable.pm:72
-#: ../urpm/removable.pm:90
+#: ../urpm/removable.pm:72 ../urpm/removable.pm:90
#, c-format
msgid "mounting %s"
msgstr "montowanie %s"
@@ -1405,482 +1398,441 @@ msgstr "montowanie %s"
msgid "unmounting %s"
msgstr "odmontowywanie %s"
-#: ../urpm/search.pm:29
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
msgid ""
"urpmf version %s\n"
"Copyright (C) 2002-2006 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 wersja %s\n"
"Copyright (C) 2002-2006 Mandriva.\n"
-"To jest otwarte oprogramowanie i może być rozpowszechniane na zasadach licencji GNU GPL.\n"
+"To jest otwarte oprogramowanie i może być rozpowszechniane na zasadach "
+"licencji GNU GPL.\n"
"\n"
"użycie: urpmf [opcje] pattern-expression\n"
-#: ../urpm/search.pm:36
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
msgstr " --version - wyświetla numer wersji tego programu.\n"
-#: ../urpm/search.pm:37
-#: ../urpmf:37
-#: ../urpmi:132
-#: ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
-msgstr " --env - używa określonego środowiska (typowo raport błędów).\n"
+msgstr ""
+" --env - używa określonego środowiska (typowo raport błędów).\n"
-#: ../urpm/search.pm:38
-#: ../urpmf:38
-#: ../urpmi:74
-#: ../urpmq:49
+#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
-msgstr " --excludemedia - bez używania podanych nośników, rozdzielonych przecinkami.\n"
+msgstr ""
+" --excludemedia - bez używania podanych nośników, rozdzielonych "
+"przecinkami.\n"
-#: ../urpm/search.pm:39
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
#, c-format
-msgid " --literal, -l - don't match patterns, use argument as a literal string.\n"
-msgstr " --literal, -l - nie porównuj wzorców, użyj argumentu ciągu dosłownie.\n"
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+" --literal, -l - nie porównuj wzorców, użyj argumentu ciągu dosłownie.\n"
-#: ../urpm/search.pm:40
-#: ../urpme:54
-#: ../urpmf:40
-#: ../urpmi:111
-#: ../urpmi.addmedia:72
-#: ../urpmi.recover:36
-#: ../urpmi.removemedia:45
-#: ../urpmi.update:48
-#: ../urpmq:70
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
-msgstr " --urpmi-root - używa innego katalogu głównego bazy danych urpmi i instalacji rpm.\n"
+msgstr ""
+" --urpmi-root - używa innego katalogu głównego bazy danych urpmi i "
+"instalacji rpm.\n"
-#: ../urpm/search.pm:42
-#: ../urpmf:42
-#: ../urpmi:77
-#: ../urpmq:50
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../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 - sortuje nośniki w zależności od podciągów rozdzielonych\n"
" przecinkami.\n"
-#: ../urpm/search.pm:43
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
#, c-format
msgid " --use-distrib - use the given path to access media\n"
msgstr " --use-distrib - użyj podanej ścieżki do nośnika\n"
-#: ../urpm/search.pm:44
-#: ../urpmf:44
-#: ../urpmi:78
-#: ../urpmq:51
+#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - używa podanego pliku syntezy zamiast bazy urpmi.\n"
-#: ../urpm/search.pm:45
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
#, c-format
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - bez wyświetlania identycznych wierszy.\n"
-#: ../urpm/search.pm:46
-#: ../urpmf:46
-#: ../urpmi:75
-#: ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - używa tylko nośników aktualizacyjnych.\n"
-#: ../urpm/search.pm:47
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
#, c-format
msgid " --verbose - verbose mode.\n"
msgstr " --verbose - tryb komunikatywny.\n"
-#: ../urpm/search.pm:48
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
#, c-format
msgid " -i - ignore case distinctions in patterns.\n"
msgstr " -i - ignoruje wielkość liter we wszystkich wzorcach.\n"
-#: ../urpm/search.pm:49
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
#, c-format
msgid " -I - honor case distinctions in patterns (default).\n"
-msgstr " -i - bierze pod uwagę wielkość liter we wszystkich wzorcach (domyślnie).\n"
+msgstr ""
+" -i - bierze pod uwagę wielkość liter we wszystkich wzorcach "
+"(domyślnie).\n"
-#: ../urpm/search.pm:50
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
#, c-format
msgid " -F<str> - change field separator (defaults to ':').\n"
msgstr " -F<str> - zmień separator pola (domyślny to ':').\n"
-#: ../urpm/search.pm:51
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
#, c-format
msgid "Pattern expressions:\n"
msgstr "Wyrażenia wzorcowe:\n"
-#: ../urpm/search.pm:52
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
#, c-format
msgid " text - any text is parsed as a regexp, unless -l is used.\n"
-msgstr " text - jakikolwiek tekst jest przetwarzany jako regexp, do chwili wykorzystania -l .\n"
+msgstr ""
+" text - jakikolwiek tekst jest przetwarzany jako regexp, do "
+"chwili wykorzystania -l .\n"
-#: ../urpm/search.pm:53
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
#, c-format
msgid " -e - include perl code directly as perl -e.\n"
msgstr " -e - dołącza kod perla bezpośrednio jako perl -e.\n"
-#: ../urpm/search.pm:54
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
#, c-format
msgid " -a - binary AND operator.\n"
msgstr " -a - operator binarny AND.\n"
-#: ../urpm/search.pm:55
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
#, c-format
msgid " -o - binary OR operator.\n"
msgstr " -a - operator binarny AND.\n"
-#: ../urpm/search.pm:56
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
#, c-format
msgid " ! - unary NOT.\n"
msgstr " ! - modyfikator NOT.\n"
-#: ../urpm/search.pm:57
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
#, c-format
msgid " ( ) - left and right parentheses.\n"
msgstr " ( ) - lewy i prawy nawias.\n"
-#: ../urpm/search.pm:58
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
#, c-format
msgid "List of tags:\n"
msgstr "Lista znaczników:\n"
-#: ../urpm/search.pm:59
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
#, c-format
msgid " --qf - specify a printf-like output format\n"
msgstr " --qf - określa format wyjścia w stylu funkcji printf\n"
-#: ../urpm/search.pm:60
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
#, c-format
msgid " example: '%%name:%%files'\n"
msgstr " przykład: '%%name:%%files'\n"
-#: ../urpm/search.pm:61
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
#, c-format
msgid " --arch - architecture\n"
msgstr " --arch - architektura\n"
-#: ../urpm/search.pm:62
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
#, c-format
msgid " --buildhost - build host\n"
-msgstr " --buildhost - wyświetla znacznik buildhost: komputer budujący pakiet.\n"
+msgstr ""
+" --buildhost - wyświetla znacznik buildhost: komputer budujący pakiet.\n"
-#: ../urpm/search.pm:63
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
#, c-format
msgid " --buildtime - build time\n"
msgstr " --buildtime - czas utworzenia\n"
-#: ../urpm/search.pm:64
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
#, c-format
msgid " --conffiles - configuration files\n"
msgstr " --conffiles - pliki konfiguracyjne\n"
-#: ../urpm/search.pm:65
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
#, c-format
msgid " --conflicts - conflict tags\n"
msgstr " --conflicts - znaczniki konfliktów.\n"
-#: ../urpm/search.pm:66
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
#, c-format
msgid " --description - package description\n"
msgstr " --description - opis pakietu.\n"
-#: ../urpm/search.pm:67
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
#, c-format
msgid " --distribution - distribution\n"
msgstr " --distribution - dystrybucja\n"
-#: ../urpm/search.pm:68
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
#, c-format
msgid " --epoch - epoch\n"
msgstr " --epoch - iteracja\n"
-#: ../urpm/search.pm:69
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
#, c-format
msgid " --filename - filename of the package\n"
msgstr " --filename - nazwa pakietu.\n"
-#: ../urpm/search.pm:70
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
#, c-format
msgid " --files - list of files contained in the package\n"
msgstr " --files - lista plików zawartych w pakiecie\n"
-#: ../urpm/search.pm:71
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
#, c-format
msgid " --group - group\n"
msgstr " --group - grupa\n"
-#: ../urpm/search.pm:72
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
#, c-format
msgid " --license - license\n"
msgstr " --license - licencja\n"
-#: ../urpm/search.pm:73
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
#, c-format
msgid " --name - package name\n"
msgstr " --name - nazwa pakietu\n"
-#: ../urpm/search.pm:74
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - wszystkie przestarzałe znaczniki\n"
-#: ../urpm/search.pm:75
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr " --packager - osoba tworząca pakiet\n"
-#: ../urpm/search.pm:76
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - znacznik provides: wszystkie. pakiety.\n"
-#: ../urpm/search.pm:77
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - wszystkie zależności.\n"
-#: ../urpm/search.pm:78
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
#, c-format
msgid " --size - installed size\n"
msgstr " --size - rozmiar\n"
-#: ../urpm/search.pm:79
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - nazwa pakietu rpm ze źródłami\n"
-#: ../urpm/search.pm:80
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
#, c-format
msgid " --suggests - suggests tags\n"
msgstr " --suggests - znaczniki z sugestiami\n"
-#: ../urpm/search.pm:81
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr " --summary - podsumowanie\n"
-#: ../urpm/search.pm:82
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
#, c-format
msgid " --url - url\n"
msgstr " --URL - adres URL\n"
-#: ../urpm/search.pm:83
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
#, c-format
msgid " --vendor - vendor\n"
msgstr " --vendor - dostawca\n"
-#: ../urpm/search.pm:84
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
#, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -m - nośnik na którym znajduje się pakiet\n"
-#: ../urpm/search.pm:85
-#: ../urpmf:85
-#: ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - wyświetla wersję, wydanie oraz archiwum z nazwą.\n"
-#: ../urpm/search.pm:197
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Nieprawidłowy format: możesz używać tylko znaczniki wielowartościowe"
-#: ../urpm/search.pm:247
-#: ../urpmf:248
-#: ../urpmi:265
-#: ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "używając określonego środowiska na %s\n"
-
-#: ../urpm/search.pm:290
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "nie znaleziono pliku hdlist dla nośnika \"%s\""
-#: ../urpm/search.pm:297
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "brak pliku syntezy dla nośnika \"%s\""
-#: ../urpm/search.pm:304
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "brak informacji xml dla nośnika \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr "urpmi zostało uruchomione ponownie. Lista pakietów własnościowych nie uległa zmianie."
+msgstr ""
+"urpmi zostało uruchomione ponownie. Lista pakietów własnościowych nie uległa "
+"zmianie."
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "urpmi zostało uruchomione ponownie. Lista preferowanych pakietów uległa zmianie: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"urpmi zostało uruchomione ponownie. Lista preferowanych pakietów uległa "
+"zmianie: %s vs %s"
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Brak pakietu o nazwie %s"
-#: ../urpm/select.pm:170
-#: ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Następujące pakiety zawierają %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr "Użyj opcji \"-a\", aby wykorzystać wszystkie"
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "odnaleziono pakiet(y) %s w bazie danych urpmi, ale żaden nie jest zainstalowany"
+msgstr ""
+"odnaleziono pakiet(y) %s w bazie danych urpmi, ale żaden nie jest "
+"zainstalowany"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, c-format
msgid "Package %s is already installed"
msgstr "Pakiet %s jest już zainstalowany w systemie"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, c-format
msgid "Packages %s are already installed"
msgstr "Pakiet %s jest już zainstalowany w systemie"
-#: ../urpm/select.pm:562
-#: ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "z powodu brakującego %s"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, c-format
msgid "due to already installed %s"
msgstr "ponieważ w systemie zainstalowano %s"
-#: ../urpm/select.pm:564
-#: ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "z powodu niesatysfakcjonującego pakietu %s"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "próba ulepszenia %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "w celu zachowania pakietu %s"
#: ../urpm/select.pm:607
#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Poniższy pakiet musi zostać usunięte aby zaktualizować inne:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Poniższe pakiety muszą być usunięte aby zaktualizować inne:\n"
+"%s"
+
+#: ../urpm/select.pm:635
+#, c-format
msgid "in order to install %s"
msgstr "w celu zainstalowania pakietu %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "z powodu kolizji z pakietem %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Niepoprawny podpis (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Niepoprawny identyfikator klucza (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Brakujący podpis (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr "system"
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr "Uruchom ponownie %s dla %s"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't write file"
msgstr "Zapisanie pliku było niemożliwe "
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't open file"
msgstr "Otworzenie pliku było niemożliwe "
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, c-format
msgid "Can't move file %s to %s"
msgstr "Nie można przenieść pliku %s na %s"
@@ -1890,13 +1842,15 @@ msgstr "Nie można przenieść pliku %s na %s"
msgid ""
"urpme version %s\n"
"Copyright (C) 1999-2008 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 wersja %s\n"
"Copyright (C) 1999-2008 Mandriva.\n"
-"To jest otwarte oprogramowanie i może być rozpowszechniane na zasadach licencji GNU GPL.\n"
+"To jest otwarte oprogramowanie i może być rozpowszechniane na zasadach "
+"licencji GNU GPL.\n"
"\n"
"użycie:\n"
@@ -1913,17 +1867,16 @@ msgstr " --auto-orphans - usuń osierocone pakiety\n"
#: ../urpme:49
#, c-format
msgid " --test - verify if the removal can be achieved correctly.\n"
-msgstr " --test - sprawdza, czy instalacja zostanie przeprowadzona prawidłowo.\n"
+msgstr ""
+" --test - sprawdza, czy instalacja zostanie przeprowadzona "
+"prawidłowo.\n"
-#: ../urpme:51
-#: ../urpmi:109
-#: ../urpmq:68
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - rozproszone urpmi z użyciem komputerów aliasu.\n"
-#: ../urpme:52
-#: ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - przebuduj pakiet przed usunięciem\n"
@@ -1933,8 +1886,7 @@ msgstr " --repackage - przebuduj pakiet przed usunięciem\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - używa innego katalogu głównego do usunięcia rpm.\n"
-#: ../urpme:55
-#: ../urpmi:101
+#: ../urpme:55 ../urpmi:101
#, c-format
msgid " --justdb - update only the rpm db, not the filesystem.\n"
msgstr " --justdb - aktualizuj tylko bazę rpm, a nie system plików.\n"
@@ -1953,9 +1905,7 @@ msgstr ""
" --use-distrib - konfiguruje urpmi w locie z drzewa dystrybucyjnego,\n"
" użyteczne przy (od)instalowywaniu chroot z opcją --root.\n"
-#: ../urpme:59
-#: ../urpmi:152
-#: ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - tryb komunikatywny.\n"
@@ -2001,7 +1951,8 @@ msgstr "Brak osieroconych pakietów do usunięcia"
#: ../urpme:149
#, 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] "W celu spełnienia zależności zostanie usunięty następujący pakiet"
msgstr[1] "W celu spełnienia zależności usunięte zostaną %d pakiety"
msgstr[2] "W celu spełnienia zależności usunięte zostaną %d pakiety"
@@ -2022,10 +1973,7 @@ msgstr[0] "Usunąć pakiet %d?"
msgstr[1] "Usunąć pakiety %d?"
msgstr[2] "Usunąć pakiet %d?"
-#: ../urpme:161
-#: ../urpmi:569
-#: ../urpmi:664
-#: ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (t/N) "
@@ -2058,7 +2006,8 @@ msgstr " --auto-update - aktualizuje nośniki i aktualizuje system.\n"
#: ../urpmi:82
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
-msgstr " --no-md5sum - wyłącza sprawdzanie sumy kontrolnej MD5 dla pliku.\n"
+msgstr ""
+" --no-md5sum - wyłącza sprawdzanie sumy kontrolnej MD5 dla pliku.\n"
#: ../urpmi:83
#, c-format
@@ -2070,24 +2019,29 @@ msgstr " --force-key - wymusza aktualizację klucza gpg.\n"
msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - usuń osierocone pakiety bez pytania\n"
-#: ../urpmi:85
-#: ../urpmq:54
+#: ../urpmi:85 ../urpmq:54
#, c-format
msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
-msgstr " --no-suggests - nie wybieraj automatycznie pakietów oznaczonych jako \"sugerowane\" .\n"
+msgstr ""
+" --no-suggests - nie wybieraj automatycznie pakietów oznaczonych jako "
+"\"sugerowane\" .\n"
#: ../urpmi:86
#, c-format
-msgid " --no-uninstall - never ask to uninstall a package, abort the installation.\n"
-msgstr " --no-uninstall - nigdy nie pyta o odinstalowanie pakietu, przerywa instalację.\n"
+msgid ""
+" --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+" --no-uninstall - nigdy nie pyta o odinstalowanie pakietu, przerywa "
+"instalację.\n"
#: ../urpmi:87
#, c-format
msgid " --no-install - don't install packages (only download)\n"
-msgstr " --install-src - instalacja tylko pakietów źródłowych (bez binariów).\n"
+msgstr ""
+" --install-src - instalacja tylko pakietów źródłowych (bez binariów).\n"
-#: ../urpmi:88
-#: ../urpmq:56
+#: ../urpmi:88 ../urpmq:56
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -2130,7 +2084,8 @@ msgstr " --install-src - instaluje tylko pakiet źródłowy (bez binariów).\n
#: ../urpmi:99
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
-msgstr " --clean - zaczyna od usuwania plików rpm z pamięci podręcznej.\n"
+msgstr ""
+" --clean - zaczyna od usuwania plików rpm z pamięci podręcznej.\n"
#: ../urpmi:100
#, c-format
@@ -2139,8 +2094,11 @@ msgstr " --noclean - zachowuje pliki rpm w pamięci podręcznej.\n"
#: ../urpmi:102
#, c-format
-msgid " --replacepkgs - force installing packages which are already installed.\n"
-msgstr " --replacepkgs - wymuś instalację pakietów, które znajdują się już w systemie.\n"
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+" --replacepkgs - wymuś instalację pakietów, które znajdują się już w "
+"systemie.\n"
#: ../urpmi:104
#, c-format
@@ -2175,9 +2133,7 @@ msgstr ""
" --use-distrib - konfiguruje urpmi w locie z drzewa dystrybucyjnego,\n"
" opcja użyteczna przy instalacji chroot z opcją --root.\n"
-#: ../urpmi:114
-#: ../urpmi.addmedia:59
-#: ../urpmi.update:37
+#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:37
#, c-format
msgid " --metalink - generate and use a local metalink.\n"
msgstr " --metalink - wygeneruj i użyj lokalnego metalinku.\n"
@@ -2216,9 +2172,7 @@ msgstr " --prozilla-options - dodatkowe opcje prozilli\n"
msgid " --aria2-options - additional options to pass to aria2\n"
msgstr " --aria2-options - dodatkowe opcje aby przejść do aria2\n"
-#: ../urpmi:123
-#: ../urpmi.addmedia:60
-#: ../urpmi.update:38
+#: ../urpmi:123 ../urpmi.addmedia:60 ../urpmi.update:38
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - ogranicza szybkość pobierania.\n"
@@ -2232,10 +2186,7 @@ msgstr ""
" --resume - wznawia przesyłanie częściowo pobranych plików\n"
" (--no-resume wyłącza funkcję, domyślnie wyłączoną).\n"
-#: ../urpmi:126
-#: ../urpmi.addmedia:61
-#: ../urpmi.update:39
-#: ../urpmq:76
+#: ../urpmi:126 ../urpmi.addmedia:61 ../urpmi.update:39 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -2244,10 +2195,7 @@ msgstr ""
" --proxy - używa wybranego pośrednika HTTP, domyślnym portem\n"
" jest port 1080 (format <serwerproxy[:port]>).\n"
-#: ../urpmi:128
-#: ../urpmi.addmedia:63
-#: ../urpmi.update:41
-#: ../urpmq:78
+#: ../urpmi:128 ../urpmi.addmedia:63 ../urpmi.update:41 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -2278,29 +2226,37 @@ msgstr " --excludedocs - wyłącza pliki dokumentacji.\n"
#: ../urpmi:138
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
-msgstr " --ignoresize - anuluje sprawdzania miejsca na dysku przed instalacją.\n"
+msgstr ""
+" --ignoresize - anuluje sprawdzania miejsca na dysku przed instalacją.\n"
#: ../urpmi:139
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
-msgstr " --ignorearch - pozwól na instalację pakietów rpm przeznaczonych dla innych architektur.\n"
+msgstr ""
+" --ignorearch - pozwól na instalację pakietów rpm przeznaczonych dla "
+"innych architektur.\n"
#: ../urpmi:140
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - nie uruchamiaj skryptów pakietu\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - wyświetla listę konfliktów.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - pakiety, których instalacja powinna być pominięta\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --prefer - preferowane pakiety\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2309,43 +2265,45 @@ msgstr ""
" --more-choices - gdy kilka pakietów zostanie znalezionych, proponuje\n"
" większy wybór niż tylko domyślny.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - nie blokuj bazy pakietów rpm.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
-msgstr " --strict-arch - aktualizuj tylko pakiety przygotowane dla tej samej architektury.\n"
+msgstr ""
+" --strict-arch - aktualizuj tylko pakiety przygotowane dla tej samej "
+"architektury.\n"
-#: ../urpmi:148
-#: ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - wybiera wszystkie dopasowania w wierszu poleceń.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - tryb cichy.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --debug - tryb bardzo komunikatywny..\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
-msgstr " nazwy lub pliki rpm podane w wierszu poleceń zostaną zainstalowane.\n"
+msgstr ""
+" nazwy lub pliki rpm podane w wierszu poleceń zostaną zainstalowane.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr "Błąd: nie można użyć opcji --auto-select z listą pakietów.\n"
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2354,42 +2312,45 @@ msgstr ""
"Błąd: aby wygenerować raport o błędzie, określ argumenty linii poleceń\n"
"i dodaj opcję --bug.\n"
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
-msgstr "Nie można instalować pakietów binarnych przy włączonej opcji --install-src"
+msgstr ""
+"Nie można instalować pakietów binarnych przy włączonej opcji --install-src"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr "Instalacja plików spec była niemożliwa"
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr "domyślnie z opcją --buildrequires"
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
-msgstr "użyj opcji --buildrequires lub --install-src, domyślna opcja to --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgstr ""
+"użyj opcji --buildrequires lub --install-src, domyślna opcja to --"
+"buildrequires"
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
-msgid "Directory [%s] already exists, please use another directory for bug report or delete it"
-msgstr "Katalog [%s] już istnieje, użyj innego katalogu do zgłoszenia błędu lub go usuń"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Katalog [%s] już istnieje, użyj innego katalogu do zgłoszenia błędu lub go "
+"usuń"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "nie można utworzyć katalogu [%s] dla raportu o błędach"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr "Katalog %s nie istnieje"
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2398,46 +2359,49 @@ msgstr ""
"Błąd: wygląda na to, że %s został zamontowany tylko w trybie do odczytu.\n"
"Użyj opcji --allow-force aby wymusić działanie."
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr "Aktualizowanie nośnika...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (do aktualizacji)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (do aktualizacji)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (do zainstalowania)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (do zainstalowania)"
-#: ../urpmi:462
+#: ../urpmi:450
#, c-format
-msgid "In order to satisfy the '%s' dependency, one of the following packages is needed:"
-msgstr "W celu spełnienia zależności '%s' niezbędny jest jeden z poniższych pakietów:"
+msgid ""
+"In order to satisfy the '%s' dependency, one of the following packages is "
+"needed:"
+msgstr ""
+"W celu spełnienia zależności '%s' niezbędny jest jeden z poniższych pakietów:"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Jaki jest Twój wybór? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2449,18 +2413,18 @@ msgstr ""
" w systemie:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
"that are older than the installed ones:\n"
"%s"
msgstr ""
-"Poniższe pakiety nie mogą zostać zainstalowane ponieważ zawierają zależności\n"
+"Poniższe pakiety nie mogą zostać zainstalowane ponieważ zawierają "
+"zależności\n"
"z pakietami, które są starsze niż aktualnie zainstalowane w systemie:%s"
-#: ../urpmi:515
-#: ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2469,15 +2433,12 @@ msgstr ""
"\n"
"Czy kontynuować mimo to?"
-#: ../urpmi:516
-#: ../urpmi:531
-#: ../urpmi:628
-#: ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (T/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2486,7 +2447,7 @@ msgstr ""
"Wybrany pakiet nie może zostać zainstalowany:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2495,12 +2456,12 @@ msgstr ""
"Niektóre z wybranych pakietów nie mogą zostać zainstalowane:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "usuwanie pakietu %s spowoduje uszkodzenie systemu"
-#: ../urpmi:551
+#: ../urpmi:538
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2511,7 +2472,7 @@ msgstr ""
"musi zostać usunięty aby zaktualizować inne:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2522,39 +2483,23 @@ msgstr ""
"muszą zostać usunięte aby zaktualizować inne:\n"
"%s\n"
-#: ../urpmi:560
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Poniższy pakiet musi zostać usunięte aby zaktualizować inne:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Poniższe pakiety muszą być usunięte aby zaktualizować inne:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(to tylko test, usunięcie nie zostanie przeprowadzone)"
-#: ../urpmi:583
+#: ../urpmi:568
#, 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 ""
-"Aby zainstalować poniższe pakiety zależne uruchom polecenie urpmi z opcją --buildrequires.\n"
+"Aby zainstalować poniższe pakiety zależne uruchom polecenie urpmi z opcją --"
+"buildrequires.\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
@@ -2562,27 +2507,27 @@ msgstr[0] "Zostanie usunięty następujący osierocony pakiet."
msgstr[1] "Zostaną usunięte następujące osierocone pakiety."
msgstr[2] ""
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(to tylko test, instalacja nie będzie wykonana)"
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr "Zostanie wykorzystany dodatkowy obszar na dysku: %s"
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr "Zostanie zwolniony obszar na dysku: %s."
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr "Zostanie pobranych %s pakietów."
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2590,12 +2535,12 @@ msgstr[0] "Rozpocząć instalację jednego pakietu? "
msgstr[1] "Rozpocząć instalację %d pakietów?"
msgstr[2] "Rozpocząć instalację 1 pakietu? (%d MB)"
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Anuluj"
-#: ../urpmi:648
+#: ../urpmi:633
#, c-format
msgid "Press Enter when mounted..."
msgstr "Naciśnij Enter po zamontowaniu..."
@@ -2633,7 +2578,8 @@ msgstr ""
" cdrom://<ścieżka> \n"
"\n"
"użycie: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
-"użycie: urpmi.addmedia [options] --mirrorlist <url> <name> <względna ścieżka>\n"
+"użycie: urpmi.addmedia [options] --mirrorlist <url> <name> <względna "
+"ścieżka>\n"
"\n"
"przykłady:\n"
"\n"
@@ -2643,29 +2589,24 @@ msgstr ""
"\n"
"zaś [opcje] mogą przyjmować wartości\n"
-#: ../urpmi.addmedia:55
-#: ../urpmi.update:33
-#: ../urpmq:73
+#: ../urpmi.addmedia:55 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - używa wgeta do pobierania zdalnych plików.\n"
-#: ../urpmi.addmedia:56
-#: ../urpmi.update:34
-#: ../urpmq:74
+#: ../urpmi.addmedia:56 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - używa curla do pobierania zdalnych plików.\n"
-#: ../urpmi.addmedia:57
-#: ../urpmi.update:35
-#: ../urpmq:75
+#: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
-msgstr " --prozilla - użycie prozilli do odebrania plików ze zdalnej lokalizacji.\n"
+msgstr ""
+" --prozilla - użycie prozilli do odebrania plików ze zdalnej "
+"lokalizacji.\n"
-#: ../urpmi.addmedia:58
-#: ../urpmi.update:36
+#: ../urpmi.addmedia:58 ../urpmi.update:36
#, c-format
msgid " --aria2 - use aria2 to retrieve distant files.\n"
msgstr " --aria2 - użyj aria, aby odebrać zdalne pliki.\n"
@@ -2677,16 +2618,19 @@ msgid ""
" or discard non-update media (when used with --distrib)\n"
msgstr ""
" --update - utwórz nośnik aktualizacji, \n"
-" lub zrezygnuj z nośnika innego typu (użycie z opcją --distrib)\n"
+" lub zrezygnuj z nośnika innego typu (użycie z opcją --"
+"distrib)\n"
#: ../urpmi.addmedia:67
#, 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 - użyj jedną z zasad pobierania plików informacyjnych xml.\n"
-" Do wyboru są opcje: never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
+" Do wyboru są opcje: never, on-demand, update-only, "
+"always. cf urpmi.cfg(5)\n"
#: ../urpmi.addmedia:69
#, c-format
@@ -2715,7 +2659,8 @@ msgstr ""
#: ../urpmi.addmedia:75
#, c-format
msgid " --interactive - with --distrib, ask confirmation for each media\n"
-msgstr " --interactive - z --distrib, prośba o potwierdzenie dla każdego nośnika\n"
+msgstr ""
+" --interactive - z --distrib, prośba o potwierdzenie dla każdego nośnika\n"
#: ../urpmi.addmedia:76
#, c-format
@@ -2736,11 +2681,11 @@ msgstr ""
msgid " --virtual - create virtual media wich are always up-to-date.\n"
msgstr " --virtual - tworzy nośniki, które są zawsze aktualne,\n"
-#: ../urpmi.addmedia:80
-#: ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
-msgstr " --no-md5sum - wyłącza sprawdzanie sumy kontrolnej MD5 dla pliku.\n"
+msgstr ""
+" --no-md5sum - wyłącza sprawdzanie sumy kontrolnej MD5 dla pliku.\n"
#: ../urpmi.addmedia:81
#, c-format
@@ -2752,16 +2697,12 @@ msgstr " --nopubkey - bez importu klucza publicznego dodanego nośnika\n"
msgid " --raw - add the media in config, but don't update it.\n"
msgstr " --raw - dodaje nośnik, ale go nie aktualizuje.\n"
-#: ../urpmi.addmedia:83
-#: ../urpmi.removemedia:43
-#: ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - tryb cichy.\n"
-#: ../urpmi.addmedia:84
-#: ../urpmi.removemedia:44
-#: ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - tryb komunikatywny.\n"
@@ -2779,7 +2720,9 @@ msgstr "argument nie jest potrzebny dla opcji --distrib --mirrorlist <url>"
#: ../urpmi.addmedia:120
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
-msgstr "nieprawidłowy <url> (dla katalogu lokalnego wymagana jest ścieżka bezwzględna)"
+msgstr ""
+"nieprawidłowy <url> (dla katalogu lokalnego wymagana jest ścieżka "
+"bezwzględna)"
#: ../urpmi.addmedia:124
#, c-format
@@ -2799,7 +2742,8 @@ msgstr "Utworzenie pliku konfiguracyjnego było niemożliwe [%s]"
#: ../urpmi.addmedia:136
#, c-format
msgid "no need to give <relative path of synthesis> with --distrib"
-msgstr "nie ma potrzeby podawania <ścieżki względnej do syntezy> z opcją --distrib"
+msgstr ""
+"nie ma potrzeby podawania <ścieżki względnej do syntezy> z opcją --distrib"
#: ../urpmi.addmedia:144
#, c-format
@@ -2830,13 +2774,15 @@ msgstr "dodanie nośnika nie było możliwe"
msgid ""
"urpmi.recover version %s\n"
"Copyright (C) 2006 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 wersja %s\n"
"Copyright (C) 2006 Mandriva.\n"
-"To jest otwarte oprogramowanie i może być rozpowszechniane na zasadach licencji GNU GPL.\n"
+"To jest otwarte oprogramowanie i może być rozpowszechniane na zasadach "
+"licencji GNU GPL.\n"
"\n"
"użycie:\n"
@@ -2848,17 +2794,23 @@ msgstr " --checkpoint - ustawia start ponownego tworzenia pakietu\n"
#: ../urpmi.recover:35
#, c-format
msgid " --noclean - don't clean repackage directory on checkpoint\n"
-msgstr " --noclean - zachowuje pliki rpm w pamięci podręcznej w chwili wykonania opcji checkpoint.\n"
+msgstr ""
+" --noclean - zachowuje pliki rpm w pamięci podręcznej w chwili "
+"wykonania opcji checkpoint.\n"
#: ../urpmi.recover:37
#, c-format
-msgid " --list - list transactions since provided date/duration argument\n"
-msgstr " --list - pokazuje listę zdarzeń wykonanych od wskazanej daty/przez określony okres\n"
+msgid ""
+" --list - list transactions since provided date/duration argument\n"
+msgstr ""
+" --list - pokazuje listę zdarzeń wykonanych od wskazanej daty/przez "
+"określony okres\n"
#: ../urpmi.recover:38
#, c-format
msgid " --list-all - list all transactions in rpmdb (long)\n"
-msgstr " --list-all - wyświetla listę wszystkich zdarzeń w rpmdb (długie)\n"
+msgstr ""
+" --list-all - wyświetla listę wszystkich zdarzeń w rpmdb (długie)\n"
#: ../urpmi.recover:39
#, c-format
@@ -2887,7 +2839,9 @@ msgstr "Nieprawidłowa data lub długość okresu [%s]\n"
#: ../urpmi.recover:65
#, c-format
msgid "Repackage directory not defined\n"
-msgstr "Katalog wykorzystywany do ponownego utworzenia pakietu nie został zdefiniowany\n"
+msgstr ""
+"Katalog wykorzystywany do ponownego utworzenia pakietu nie został "
+"zdefiniowany\n"
#: ../urpmi.recover:68
#, c-format
@@ -2942,8 +2896,7 @@ msgstr "Nie odnaleziono żadnej transakcji od %s\n"
msgid "You must be superuser to do this"
msgstr "Aby wykonać tą operację musisz być superużytkownikiem (root)"
-#: ../urpmi.recover:143
-#: ../urpmi.recover:209
+#: ../urpmi.recover:143 ../urpmi.recover:209
#, c-format
msgid "Writing rpm macros file [%s]...\n"
msgstr "Zapisywanie pliku makr pakietu rpm [%s]...\n"
@@ -3033,7 +2986,9 @@ msgstr " --no-ignore - nie aktualizuj, oznacz nośnik jako włączony.\n"
#: ../urpmi.update:49
#, c-format
msgid " --probe-rpms - do not use synthesis, use rpm files directly\n"
-msgstr " --probe-rpms - nie korzysta z pliku syntezy, wykorzystuje bezpośrednio pliki rpm\n"
+msgstr ""
+" --probe-rpms - nie korzysta z pliku syntezy, wykorzystuje bezpośrednio "
+"pliki rpm\n"
#: ../urpmi.update:50
#, c-format
@@ -3058,7 +3013,8 @@ msgstr "Tylko administrator ma prawo aktualizować nośniki"
#: ../urpmi.update:78
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "brak elementów do aktualizacji (użyj urpmi.addmedia aby dodać nośnik)\n"
+msgstr ""
+"brak elementów do aktualizacji (użyj urpmi.addmedia aby dodać nośnik)\n"
#: ../urpmi.update:87
#, c-format
@@ -3089,20 +3045,26 @@ msgstr "włączanie nośnika \"%s\""
msgid ""
"urpmq version %s\n"
"Copyright (C) 2000-2006 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 wersja %s\n"
"Copyright (C) 2000-2006 Mandriva.\n"
-"To jest wolne oprogramowanie i może być rozpowszechniane na zasadach licencji GNU GPL.\n"
+"To jest wolne oprogramowanie i może być rozpowszechniane na zasadach "
+"licencji GNU GPL.\n"
"\n"
"użycie:\n"
#: ../urpmq:48
#, c-format
-msgid " --searchmedia - use only the given media to search requested (or updated) packages.\n"
-msgstr " --searchmedia - używa tylko podanych nośników podczas wyszukiwania (lub aktualizacji) pakietów.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested (or updated) "
+"packages.\n"
+msgstr ""
+" --searchmedia - używa tylko podanych nośników podczas wyszukiwania (lub "
+"aktualizacji) pakietów.\n"
#: ../urpmq:53
#, c-format
@@ -3132,7 +3094,9 @@ msgstr " --list-URL - wypisuje dostępne nośniki i ich URL-e.\n"
#: ../urpmq:61
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
-msgstr " --list-nodes - wypisuje dostępne węzły gdy używana jest opcja --parallel.\n"
+msgstr ""
+" --list-nodes - wypisuje dostępne węzły gdy używana jest opcja --"
+"parallel.\n"
#: ../urpmq:62
#, c-format
@@ -3141,17 +3105,21 @@ msgstr " --list-aliases - wypisuje dostępne równoległe aliasy.\n"
#: ../urpmq:63
#, c-format
-msgid " --dump-config - dump the config in form of urpmi.addmedia argument.\n"
-msgstr " --dump-config - zrzuca konfigurację w postaci urpmi.addmedia argument.\n"
+msgid ""
+" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+" --dump-config - zrzuca konfigurację w postaci urpmi.addmedia argument.\n"
#: ../urpmq:64
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
-msgstr " --src - następny pakiet jest pakietem źródłowym (tak jak -s).\n"
+msgstr ""
+" --src - następny pakiet jest pakietem źródłowym (tak jak -s).\n"
#: ../urpmq:65
#, c-format
-msgid " --sources - give all source packages before downloading (root only).\n"
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
msgstr ""
" --sources - wypisuje wszystkie pakiety źródłowe przed pobraniem\n"
" (tylko root).\n"
@@ -3159,7 +3127,9 @@ msgstr ""
#: ../urpmq:67
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
-msgstr " --ignorearch - pozwól na kolejkowanie pakietów rpm przeznaczonych dla innych architektur.\n"
+msgstr ""
+" --ignorearch - pozwól na kolejkowanie pakietów rpm przeznaczonych dla "
+"innych architektur.\n"
#: ../urpmq:71
#, c-format
@@ -3231,7 +3201,8 @@ msgid ""
" - extended reverse search (includes virtual packages).\n"
msgstr ""
" --whatrequires-recursive\n"
-" - rozszerzone wyszukiwanie odwrotne (obejmuje pakiety wirtualne).\n"
+" - rozszerzone wyszukiwanie odwrotne (obejmuje pakiety "
+"wirtualne).\n"
#: ../urpmq:95
#, c-format
@@ -3255,7 +3226,8 @@ msgstr " -g - wyświetla grupy wraz z ich nazwami.\n"
#: ../urpmq:101
#, c-format
msgid " -i - print useful information in human readable form.\n"
-msgstr " -i - wyświetla użyteczne informacje w czytelnej formie.\n"
+msgstr ""
+" -i - wyświetla użyteczne informacje w czytelnej formie.\n"
#: ../urpmq:102
#, c-format
@@ -3275,17 +3247,22 @@ msgstr " -r - wyświetla wersję i wydanie wraz z nazwą.\n"
#: ../urpmq:105
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
-msgstr " -s - następny pakiet jest pakietem źródłowym (tak jak --src).\n"
+msgstr ""
+" -s - następny pakiet jest pakietem źródłowym (tak jak --src).\n"
#: ../urpmq:106
#, c-format
-msgid " -u - remove package if a more recent version is already installed.\n"
-msgstr " -u - usuwa pakiet jeśli jest już zainstalowana lepsza wersja.\n"
+msgid ""
+" -u - remove package if a more recent version is already "
+"installed.\n"
+msgstr ""
+" -u - usuwa pakiet jeśli jest już zainstalowana lepsza wersja.\n"
#: ../urpmq:107
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
-msgstr " -y - wymusza wyszukiwanie niespójności (tak jak --fuzzy).\n"
+msgstr ""
+" -y - wymusza wyszukiwanie niespójności (tak jak --fuzzy).\n"
#: ../urpmq:108
#, c-format
@@ -3317,25 +3294,43 @@ msgstr "użyj opcji -l aby wyświetlić listę plików"
#: ../urpmq:404
#, 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"
+msgstr ""
+"brak informacji xml dla nośnika \"%s\", uzyskano częściowe wyniki dla "
+"pakietu %s"
#: ../urpmq:405
#, 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"
+msgstr ""
+"brak informacji xml dla nośnika %s, uzyskano częściowe wyniki dla pakietów "
+"%s"
#: ../urpmq:408
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
-msgstr "brak informacji xml dla nośnika %s, uzyskanie wyników dla pakietu %s było niemożliwe"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
+msgstr ""
+"brak informacji xml dla nośnika %s, uzyskanie wyników dla pakietu %s było "
+"niemożliwe"
#: ../urpmq:409
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
-msgstr "brak informacji xml dla nośnika %s, uzyskanie wyników dla pakietów %s było niemożliwe"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"brak informacji xml dla nośnika %s, uzyskanie wyników dla pakietów %s było "
+"niemożliwe"
#: ../urpmq:473
#, c-format
msgid "No changelog found\n"
msgstr "Nie znaleziono dziennika zmian\n"
+#~ msgid "examining %s file"
+#~ msgstr "analizowanie pliku %s"
+
+#~ msgid "invalid MD5SUM file"
+#~ msgstr "nieprawidłowa suma MD5 pliku"
+
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "znaleziono zbadany plik syntezy jako %s"
diff --git a/po/pt.po b/po/pt.po
index 14095692..b51928bb 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -25,7 +25,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2008-09-06 11:53+0100\n"
"Last-Translator: Zé <ze@mandriva.org>\n"
"Language-Team: Português <pt@li.org>\n"
@@ -45,7 +45,7 @@ msgstr "Instalação RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Erro: não é possível encontrar o ficheiro %s, irá cancelar a operação"
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -112,7 +112,7 @@ msgstr "_Instalar"
msgid "_Save"
msgstr "_Gravar"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Cancelar"
@@ -143,9 +143,8 @@ msgstr ""
msgid "Options:"
msgstr "Opções:"
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - mostra esta mensagem de ajuda.\n"
@@ -161,15 +160,18 @@ msgstr ""
#: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
msgstr ""
" --auto-select - selecciona automaticamente os pacotes para actualizar o "
"sistema.\n"
#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - força a execução mesmo que alguns pacotes não existam.\n"
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - força a execução mesmo que alguns pacotes não existam.\n"
#: ../gurpmi.pm:50 ../urpmi:133
#, c-format
@@ -180,21 +182,21 @@ msgstr ""
" --verify-rpm - verifica a assinatura do rpm antes de instalar.\n"
" (--no-verify-rpm desactiva, activo por predefinição).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - usa apenas a(s) média(s) indicada(s), separadas por "
"vírgula.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - permite a procura nos fornecidos (provides) para "
"encontrar o pacote.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
@@ -217,7 +219,8 @@ msgstr ""
#: ../gurpmi.pm:57 ../urpmi:76
#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
" --searchmedia - usa apenas a média indicada para procurar os pacotes "
"pedidos.\n"
@@ -237,7 +240,22 @@ msgstr "Por favor aguarde..."
msgid "Must be root"
msgstr "Deve ser root"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "a distribuir %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Instalação de pacotes..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Instalação de pacotes..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -253,37 +271,37 @@ msgstr ""
msgid "Warning"
msgstr "Aviso"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (para actualizar)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (para instalar)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Escolha de pacotes"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "É necessário um dos seguintes pacotes:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Abortar"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -295,59 +313,57 @@ msgstr ""
"%s\n"
"Continuar a instalação?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, 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 satisfazer as dependências, o seguinte pacote irá ser instalado:"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
-msgstr "Para satisfazer as dependências, os seguintes pacotes irão ser instalados:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr ""
+"Para satisfazer as dependências, os seguintes pacotes irão ser instalados:"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d pacote, %d MB)"
msgstr[1] "(%d pacotes, %d MB)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Instalação de pacotes..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "não é possível obter os pacotes fonte, abortar"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "A preparar..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "A instalar o pacote `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Por favor insira a média chamada \"%s\""
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "A transferir o pacote `%s'..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Terminado"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -358,28 +374,28 @@ msgstr ""
"%s\n"
"Talvez precise actualizar a sua base de dados urpmi."
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "Instalação falhada:"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Os pacote(s) já estão instalados"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Instalação finalizada"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "a remover %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "a reiniciar urpmi"
@@ -418,7 +434,7 @@ msgstr " predefinição para %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - mostra o nome completo do rpm (NVRA)\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Apenas o superutilizador pode instalar pacotes"
@@ -428,136 +444,145 @@ msgstr "Apenas o superutilizador pode instalar pacotes"
msgid "Running urpmi in restricted mode..."
msgstr "A correr o urpmi em modo restrito..."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, c-format
msgid "fail to create directory %s"
msgstr "falha ao criar o directório %s"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr "dono inválido do directório %s"
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, c-format
msgid "Can not download packages into %s"
msgstr "Não é possível transferir os pacotes para %s"
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr "O directório de ambiente %s não existe"
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "a usar um ambiente específico em %s\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "não é possível abrir rpmdb"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nome do ficheiro rpm inválido [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "a transferir o ficheiro rpm [%s] ..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...transferência terminada"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...transferência falhada: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "não é possível aceder ao ficheiro rpm [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "não é possível analisar o ficheiro spec %s [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "não é possível registar o ficheiro rpm"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Arquitectura incompatível para o rpm [%s]"
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "erro ao registar os pacotes locais"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Esta operação é proibida enquanto correr em modo restrito"
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "declaração inválida do proxy na linha de commando\n"
-#: ../urpm/args.pm:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "expressão inesperada %s"
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "expressão em falta antes de %s"
-#: ../urpm/args.pm:382
+#: ../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:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "nenhuma expressão para fechar"
-#: ../urpm/args.pm:395
+#: ../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:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "o directório chroot não existe"
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr "Não pode usar %s sem %s"
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr "Não pode usar %s com %s"
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr "Demasiados argumentos\n"
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Cópia falhada"
@@ -606,122 +631,123 @@ msgstr "média `%s' definida duas vezes, abortar"
msgid "unable to write config file [%s]"
msgstr "não é possível escrever o ficheiro de configuração [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "%s não está disponível, voltar atrás em %s"
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
-msgstr "não é possível ler as configurações do 'proxy' (sem permissão para ler %s)"
+msgstr ""
+"não é possível ler as configurações do 'proxy' (sem permissão para ler %s)"
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Por favor indique as suas credenciais para aceder ao 'proxy'\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Nome de utilizador:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Senha:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr "programa de transferências desconhecido `%s' !!!\n"
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr "%s falhado: saiu com o sinal %d"
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr "%s falhado: saiu com %d"
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, c-format
msgid "copy failed"
msgstr "cópia falhada"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, c-format
msgid "wget is missing\n"
msgstr "wget em falta\n"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, c-format
msgid "curl is missing\n"
msgstr "curl em falta\n"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr "curl falhado: transferência cancelada\n"
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr "rsync em falta\n"
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr "ssh em falta\n"
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr "prozilla em falta\n"
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr "Não foi possível executar o prozilla\n"
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, c-format
msgid "aria2 is missing\n"
msgstr "aria2 em falta\n"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr " %s%% de %s completo, ETA = %s, velocidade = %s"
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr " %s%% completo, velocidade = %s"
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, c-format
msgid "retrieving %s"
msgstr "a obter %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, c-format
msgid "retrieved %s"
msgstr "obtido %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "protocolo desconhecido definido para %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "%s não está disponível, voltar atrás em %s"
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "nenhum webfetch encontrado, os webfetch suportados são: %s\n"
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "não é possível usar o protocolo: %s"
@@ -741,57 +767,59 @@ msgstr "o pacote %s não foi encontrado."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "a transferir os ficheiros rpm a partir da média \"%s\"..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr "[reempacotamento]"
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "transacção criada para instalar em %s (remove=%d, instala=%d, actualiza=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"transacção criada para instalar em %s (remove=%d, instala=%d, actualiza=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "não é possível criar a transacção"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "não é possível extrair o rpm do pacote delta-rpm %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "não é possível instalar o pacote %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "a remover rpm danificado (%s) de %s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, c-format
msgid "removing %s failed: %s"
msgstr "remoção %s falhada: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, c-format
msgid "Removing package %s"
msgstr "A remover pacote %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "a remover o pacote %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "a remover rpms instalados (%s) de %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Mais informações no pacote %s"
@@ -836,18 +864,18 @@ msgstr "a abortar."
msgid "%s database is locked (another program is already using it)"
msgstr "base de dados %s trancada (já está a ser usada por outra aplicação)"
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Instalação falhada"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr "Continuar a tentar na mesma? (s/N) "
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -856,73 +884,63 @@ msgstr ""
"Instalação falhada, rpm danificado:\n"
"%s"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, c-format
msgid "The following package has bad signature"
msgstr "O seguinte pacote tem uma assinatura inválida"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Os seguintes pacotes têm assinaturas inválidas"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Deseja continuar a instalação?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, c-format
msgid "removing installed rpms (%s)"
msgstr "a remover rpms instalados (%s)"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "a distribuir %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "a instalar %s de %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "a instalar %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Tentar instalação sem verificar dependências? (s/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Tentar forçar a instalação (--force)? (s/N) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr "Os pacotes estão actualizados"
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "A instalação é possível"
#: ../urpm/md5sum.pm:26
#, c-format
-msgid "examining %s file"
-msgstr "a examinar ficheiro %s"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr "Ficheiro MD5SUM inválido"
-
-#: ../urpm/md5sum.pm:28
-#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "aviso: md5sum para %s não disponível no ficheiro MD5SUM"
@@ -995,230 +1013,231 @@ msgstr "instalaria em vez de actualizar o pacote %s"
msgid "medium \"%s\" already exists"
msgstr "a média \"%s\" já existe"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr "(ignorado por predefinição)"
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "a adicionar média \"%s\" antes da média remota \"%s\""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, c-format
msgid "adding medium \"%s\""
msgstr "a adicionar média \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr "o directório %s não existe"
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "esta localização não parece conter uma distribuição"
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, c-format
msgid "unable to parse media.cfg"
msgstr "não é possível analisar o ficheiro media.cfg"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"não é possível aceder à média de distribuição (nenhum ficheiro media.cfg "
"encontrado)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr "ignorar média não compatível `%s' (para %s)"
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, c-format
msgid "retrieving media.cfg file..."
msgstr "a transferir o ficheiro media.cfg..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "a tentar seleccionar uma média \"%s\" não existente"
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "seleccionar várias médias: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "a remover a média \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "a reconfigurar urpmi para a média \"%s\""
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...reconfiguração falhada"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "reconfiguração terminada"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Erro ao gerar ficheiro de nomes: dependência %d não encontrada"
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "a média \"%s\" está actualizada"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "a examinar o ficheiro synthesis [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problema ao ler o ficheiro synthesis da média \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "a copiar [%s] para a média \"%s\"..."
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...copia falhada"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "a copiar o ficheiro de descrição de \"%s\"..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...copia terminada"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "cópia de [%s] falhada (o ficheiro é suspeitosamente pequeno)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "a calcular o md5sum da fonte synthesis transferida"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "obtenção de [%s] falhada (md5sum diferente)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, c-format
msgid "genhdlist2 failed on %s"
msgstr "o genhdlist2 falhou em %s"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, c-format
msgid "comparing %s and %s"
msgstr "a comprar %s e %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ficheiro hdlist %s inválido para a média \"%s\""
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "a copiar o ficheiro MD5SUM de \"%s\"..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "ficheiro MD5SUM inválido (transferido de %s)"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
+#, fuzzy, c-format
+msgid "no metadata found for medium \"%s\""
+msgstr "nenhum ficheiro synthesis encontrado para a média \"%s\""
+
+#: ../urpm/media.pm:1475
#, c-format
msgid "retrieving source synthesis of \"%s\"..."
msgstr "a transferir a fonte synthesis de \"%s\"..."
-#: ../urpm/media.pm:1478
-#, c-format
-msgid "found probed synthesis as %s"
-msgstr "synthesis encontrado e testado como %s"
-
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
-#, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "nenhum ficheiro synthesis encontrado para a média \"%s\""
-
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "a examinar o ficheiro de chaves públicas de \"%s\"..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...chave %s importada do ficheiro de chaves públicas de \"%s\""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
-msgstr "não é possível importar o ficheiro de chaves públicas (pubkey) de \"%s\""
+msgstr ""
+"não é possível importar o ficheiro de chaves públicas (pubkey) de \"%s\""
+
+#: ../urpm/media.pm:1579
+#, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "nenhum ficheiro synthesis encontrado para a média \"%s\""
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1612
#, c-format
msgid "updated medium \"%s\""
msgstr "média actualizada \"%s\""
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr "obtenção de [%s] falhada"
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr "a tentar novamente o espelho %s"
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr "Não foi possível encontrar um espelho da lista de espelhos %s"
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr "encontrada a geolocalização%s %.2f %.2f do fuso horário %s"
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, c-format
msgid "getting mirror list from %s"
msgstr "a obter lista de espelhos de %s"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1289,7 +1308,7 @@ msgstr "GB"
msgid "TB"
msgstr "TB"
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1413,7 +1432,8 @@ msgstr " --excludemedia - não usa a média indicada, separada por vírgula.\n"
#: ../urpm/search.pm:39 ../urpmf:39
#, c-format
-msgid " --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
" --literal, -l - não combina médias padrões, usa o argumento como uma "
"string literal.\n"
@@ -1429,7 +1449,8 @@ msgstr ""
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../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 - organiza as médias de acordo com as substrings separadas "
"por vírgula.\n"
@@ -1655,18 +1676,14 @@ msgstr " -m - a média onde o pacote foi encontrado\n"
#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
#, c-format
msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - mostra a versão, a saída e a arquitectura com o nome.\n"
+msgstr ""
+" -f - mostra a versão, a saída e a arquitectura com o nome.\n"
#: ../urpm/search.pm:197 ../urpmf:198
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Formato incorrecto: pode apenas usar uma marca multi-avaliada"
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "a usar um ambiente específico em %s\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1682,119 +1699,140 @@ msgstr "nenhum ficheiro synthesis disponível para a média \"%s\""
msgid "no xml-info available for medium \"%s\""
msgstr "nenhuma informação xml disponível para a média \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr "o urpmi foi reiniciado, e a lista de prioridade de pacotes não foi alterada"
+msgstr ""
+"o urpmi foi reiniciado, e a lista de prioridade de pacotes não foi alterada"
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
"o urpmi foi reiniciado, e a lista de prioridades de pacotes foi alterada: %s "
"vs %s"
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Nenhum pacote chamado %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Os seguintes pacotes contêm %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr "Deve usar \"-a\" para escolher todos"
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "encontrados %s pacotes na bd urpmi, mas nenhum se encontra instalado"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, c-format
msgid "Package %s is already installed"
msgstr "O pacote %s já se encontra instalado"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, c-format
msgid "Packages %s are already installed"
msgstr "Os pacote %s já se encontram instalados"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "devido a faltar %s"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, c-format
msgid "due to already installed %s"
msgstr "devido a já se encontrar instalado %s"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "devido a não satisfazer %s"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "a tentar promover %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "para guardar %s"
#: ../urpm/select.pm:607
#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"O seguinte pacote tem que ser removido para que outros sejam actualizados:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Os seguintes pacotes têm que ser removidos para que outros sejam "
+"actualizados:\n"
+"%s"
+
+#: ../urpm/select.pm:635
+#, c-format
msgid "in order to install %s"
msgstr "para instalar %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "devido a conflitos com %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Assinatura inválida (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "ID de chave inválida (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Assinatura em falta (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr "sistema"
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr "Deve reiniciar %s para %s"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't write file"
msgstr "Não é possível escrever escrever o ficheiro"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't open file"
msgstr "Não é possível abrir o ficheiro"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, c-format
msgid "Can't move file %s to %s"
msgstr "Não é possível mover o ficheiro %s para %s"
@@ -1818,7 +1856,8 @@ msgstr ""
#: ../urpme:47
#, c-format
msgid " --auto - automatically select a package in choices.\n"
-msgstr " --auto - selecciona automaticamente um pacote nas escolhas.\n"
+msgstr ""
+" --auto - selecciona automaticamente um pacote nas escolhas.\n"
#: ../urpme:48
#, c-format
@@ -1828,14 +1867,16 @@ msgstr " --auto-orphans - remove os orfãos\n"
#: ../urpme:49
#, c-format
msgid " --test - verify if the removal can be achieved correctly.\n"
-msgstr " --test - verifica se a remoção pode ser conseguida correctamente.\n"
+msgstr ""
+" --test - verifica se a remoção pode ser conseguida correctamente.\n"
#: ../urpme:51 ../urpmi:109 ../urpmq:68
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
-msgstr " --parallel - urpmi distribuído através das máquinas dos apelidos.\n"
+msgstr ""
+" --parallel - urpmi distribuído através das máquinas dos apelidos.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Reempacota os ficheiros antes de os apagar\n"
@@ -1867,7 +1908,7 @@ msgstr ""
"distribuição,\n"
" útil para (des)instalar um chroot com opção --root.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - modo detalhado.\n"
@@ -1875,7 +1916,8 @@ msgstr " --verbose, -v - modo detalhado.\n"
#: ../urpme:60
#, c-format
msgid " -a - select all packages matching expression.\n"
-msgstr " -a - selecciona todos os pacotes correspondentes à expressão.\n"
+msgstr ""
+" -a - selecciona todos os pacotes correspondentes à expressão.\n"
#: ../urpme:73
#, c-format
@@ -1912,9 +1954,11 @@ msgstr "Nenhuns orfãos a remover"
#: ../urpme:149
#, 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 satisfazer as dependências, o seguinte pacote será removido"
-msgstr[1] "Para satisfazer as dependências, os seguintes %d pacotes serão removidos"
+msgstr[1] ""
+"Para satisfazer as dependências, os seguintes %d pacotes serão removidos"
#: ../urpme:154
#, c-format
@@ -1930,7 +1974,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "Remover %d pacote?"
msgstr[1] "Remover %d pacotes?"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (s/N) "
@@ -1978,7 +2022,8 @@ msgstr " --auto-orphans - remove os orfãos sem perguntar\n"
#: ../urpmi:85 ../urpmq:54
#, c-format
msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
-msgstr " --no-suggests - não selecciona automaticamente os pacotes \"sugeridos\".\n"
+msgstr ""
+" --no-suggests - não selecciona automaticamente os pacotes \"sugeridos\".\n"
#: ../urpmi:86
#, c-format
@@ -2017,7 +2062,8 @@ msgstr ""
#: ../urpmi:94
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
-msgstr " --split-length - pequeno comprimento de transacção, predefinido é %d.\n"
+msgstr ""
+" --split-length - pequeno comprimento de transacção, predefinido é %d.\n"
#: ../urpmi:96
#, c-format
@@ -2046,7 +2092,8 @@ msgstr " --noclean - não apaga os rpms da cache.\n"
#: ../urpmi:102
#, 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ça a instalação de pacotes que já se encontram "
"instalados.\n"
@@ -2072,7 +2119,8 @@ msgstr ""
#: ../urpmi:108
#, c-format
msgid " --allow-suggests - auto select \"suggested\" packages.\n"
-msgstr " --allow-suggests - selecciona automaticamente os pacotes \"sugeridos\".\n"
+msgstr ""
+" --allow-suggests - selecciona automaticamente os pacotes \"sugeridos\".\n"
#: ../urpmi:112
#, c-format
@@ -2179,7 +2227,8 @@ msgstr " --excludedocs - exclui os ficheiros de documentação.\n"
#: ../urpmi:138
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
-msgstr " --ignoresize - não verifica o espaço em disco antes da instalação\n"
+msgstr ""
+" --ignoresize - não verifica o espaço em disco antes da instalação\n"
#: ../urpmi:139
#, c-format
@@ -2193,17 +2242,22 @@ msgstr ""
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - não executa o(s) script(s) do(s) pacote(s)\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - mostra os conflitos\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - pacotes cuja instalação deve ser ignorada\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --prefer - pacotes que devem ser preferidos\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2212,44 +2266,46 @@ msgstr ""
" --more-choices - quando vários pacotes são encontrados, propõe mais\n"
" escolhas do que o está predefinido.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - não tranca a base de dados rpm.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
-msgstr " --strict-arch - apenas actualiza os pacotes com a mesma arquitectura.\n"
+msgstr ""
+" --strict-arch - apenas actualiza os pacotes com a mesma arquitectura.\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
-msgstr " -a - escolhe todas as correspondências na linha de comando.\n"
+msgstr ""
+" -a - escolhe todas as correspondências na linha de comando.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - modo silencioso.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --debug - modo muito detalhado.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
" os nomes ou os ficheiros rpm dados na linha de comando irão ser "
"instalados.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr "Erro: não é possível usar --auto-select com a lista de pacotes.\n"
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2258,29 +2314,30 @@ msgstr ""
"Erro: para gerar um relatório de erros, indique os argumentos de linha de "
"comando usuais com --bug.\n"
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "Não pode instalar ficheiros rpm binários quando usar --install-src"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr "Não pode instalar ficheiros spec"
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr "a predefinir para --buildrequires"
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
"por favor use --buildrequires ou --install-src, predefinição para --"
"buildrequires"
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2289,17 +2346,12 @@ msgstr ""
"O directório [%s] já existe, por favor use outro para comunicar erros ou "
"apague-o"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Não é possível criar o directório [%s] para comunicação de erros"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr "O directório de ambiente %s não existe"
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2308,48 +2360,49 @@ msgstr ""
"Erro: %s parece estar montado apenas como leitura.\n"
"Use --allow-force para forçar a operação."
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr "A actualizar média...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (para actualizar)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (para actualizar)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (para instalar)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (para instalar)"
-#: ../urpmi:462
+#: ../urpmi:450
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
-msgstr "Para satisfazer as '%s' dependências, é necessário um dos seguintes pacotes:"
+msgstr ""
+"Para satisfazer as '%s' dependências, é necessário um dos seguintes pacotes:"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Qual é a sua escolha? (1-%d)"
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2360,7 +2413,7 @@ msgstr ""
"que são mais antigos do que os que estão instalados:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2371,7 +2424,7 @@ msgstr ""
"pacotes que são mais antigos do que os instalados:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2380,12 +2433,12 @@ msgstr ""
"\n"
"Continuar a instalação na mesma?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (S/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2394,7 +2447,7 @@ msgstr ""
"Um pacote pedido não pode ser instalado:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2403,12 +2456,12 @@ msgstr ""
"Alguns pacotes pedidos não podem ser instalados:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "a remoção do pacote %s irá danificar o seu sistema"
-#: ../urpmi:551
+#: ../urpmi:538
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2419,7 +2472,7 @@ msgstr ""
"que ser removido para que outros sejam actualizados:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2430,31 +2483,12 @@ msgstr ""
"que ser removidos para que outros sejam actualizados:\n"
"%s\n"
-#: ../urpmi:560
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"O seguinte pacote tem que ser removido para que outros sejam actualizados:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Os seguintes pacotes têm que ser removidos para que outros sejam "
-"actualizados:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(testa apenas, a remoção não é executada)"
-#: ../urpmi:583
+#: ../urpmi:568
#, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2465,46 +2499,46 @@ msgstr ""
"seguintes dependências:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "O seguinte pacote orfão será removido."
msgstr[1] "Os seguintes pacotes orfãos serão removidos."
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(testa apenas, a instalação não é executada)"
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr "%s adicionais do espaço do disco irão ser usados."
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr "%s do espaço do disco irão ser libertados"
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr "%s dos pacotes serão transferidos."
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
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:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Cancelar"
-#: ../urpmi:648
+#: ../urpmi:633
#, c-format
msgid "Press Enter when mounted..."
msgstr "Prima Enter quando estiver montado..."
@@ -2566,7 +2600,8 @@ msgstr " --curl - usa curl para transferir ficheiros distantes.\n"
#: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
-msgstr " --prozilla - usa o prozilla para transferir ficheiros distantes.\n"
+msgstr ""
+" --prozilla - usa o prozilla para transferir ficheiros distantes.\n"
#: ../urpmi.addmedia:58 ../urpmi.update:36
#, c-format
@@ -2580,7 +2615,8 @@ msgid ""
" or discard non-update media (when used with --distrib)\n"
msgstr ""
" --update - cria uma média de actualização,\n"
-" ou descarta médias não actualizaveis (quando usado com --distrib)\n"
+" ou descarta médias não actualizaveis (quando usado com --"
+"distrib)\n"
#: ../urpmi.addmedia:67
#, c-format
@@ -2640,7 +2676,8 @@ msgstr ""
#: ../urpmi.addmedia:79
#, c-format
msgid " --virtual - create virtual media wich are always up-to-date.\n"
-msgstr " --virtual - cria uma média virtual que está sempre actualizada.\n"
+msgstr ""
+" --virtual - cria uma média virtual que está sempre actualizada.\n"
#: ../urpmi.addmedia:80 ../urpmi.update:44
#, c-format
@@ -2655,7 +2692,8 @@ msgstr " --nopubkey - não importa a chave pública da média adicionada\n"
#: ../urpmi.addmedia:82
#, c-format
msgid " --raw - add the media in config, but don't update it.\n"
-msgstr " --raw - adiciona a média na configuração, mas não a actualiza.\n"
+msgstr ""
+" --raw - adiciona a média na configuração, mas não a actualiza.\n"
#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
#, c-format
@@ -2680,7 +2718,8 @@ msgstr "não é necessário nenhum argumento para --distrib --mirrorlist <url>"
#: ../urpmi.addmedia:120
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
-msgstr "<url> inválido (para directórios locais, a localização tem que ser absoluta)"
+msgstr ""
+"<url> inválido (para directórios locais, a localização tem que ser absoluta)"
#: ../urpmi.addmedia:124
#, c-format
@@ -2700,7 +2739,8 @@ msgstr "Não pode criar o ficheiro de configuração [%s]"
#: ../urpmi.addmedia:136
#, c-format
msgid "no need to give <relative path of synthesis> with --distrib"
-msgstr "não é necessário indicar o <localização relativa do synthesis> com --distrib"
+msgstr ""
+"não é necessário indicar o <localização relativa do synthesis> com --distrib"
#: ../urpmi.addmedia:144
#, c-format
@@ -2756,7 +2796,8 @@ msgstr ""
#: ../urpmi.recover:37
#, c-format
-msgid " --list - list transactions since provided date/duration argument\n"
+msgid ""
+" --list - list transactions since provided date/duration argument\n"
msgstr ""
" --list - lista transacções desde que dado o argumento de data/"
"duração\n"
@@ -2956,7 +2997,8 @@ msgstr " -f - força a actualização dos ficheiros synthesis.\n"
#: ../urpmi.update:52
#, c-format
msgid " -ff - really force updating synthesis\n"
-msgstr " -f - força realmente a actualização dos ficheiros synthesis.\n"
+msgstr ""
+" -f - força realmente a actualização dos ficheiros synthesis.\n"
#: ../urpmi.update:69
#, c-format
@@ -3045,7 +3087,8 @@ msgstr " --list-url - lista as médias disponíveis e as suas url.\n"
#: ../urpmq:61
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
-msgstr " --list-nodes - lista os nós disponíveis quando a usar --parallel.\n"
+msgstr ""
+" --list-nodes - lista os nós disponíveis quando a usar --parallel.\n"
#: ../urpmq:62
#, c-format
@@ -3054,7 +3097,8 @@ msgstr " --list-aliases - lista as aliases paralelas disponíveis.\n"
#: ../urpmq:63
#, 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 - deixa a configuração na forma de argumento urpmi."
"addmedia.\n"
@@ -3062,11 +3106,13 @@ msgstr ""
#: ../urpmq:64
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
-msgstr " --src - o próximo pacote é um pacote fonte (o mesmo que -s).\n"
+msgstr ""
+" --src - o próximo pacote é um pacote fonte (o mesmo que -s).\n"
#: ../urpmq:65
#, c-format
-msgid " --sources - give all source packages before downloading (root only).\n"
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
msgstr ""
" --sources - indica todos os pacotes fonte antes de transferir (apenas "
"root).\n"
@@ -3147,7 +3193,8 @@ msgstr " --whatrequires - reverte a procura para o que o pacote requer.\n"
msgid ""
" --whatrequires-recursive\n"
" - extended reverse search (includes virtual packages).\n"
-msgstr " -R - procura revertida extendida (inclui pacotes virtuais).\n"
+msgstr ""
+" -R - procura revertida extendida (inclui pacotes virtuais).\n"
#: ../urpmq:95
#, c-format
@@ -3192,7 +3239,8 @@ msgstr " -r - mostra a versão e o lançamento com o nome também.\
#: ../urpmq:105
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
-msgstr " -s - o próximo pacote é um pacote fonte (o mesmo que --src).\n"
+msgstr ""
+" -s - o próximo pacote é um pacote fonte (o mesmo que --src).\n"
#: ../urpmq:106
#, c-format
@@ -3206,17 +3254,20 @@ msgstr ""
#: ../urpmq:107
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
-msgstr " -y - impõe uma procura aproximada (o mesmo que --fuzzy).\n"
+msgstr ""
+" -y - impõe uma procura aproximada (o mesmo que --fuzzy).\n"
#: ../urpmq:108
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
-msgstr " -Y - como -y, mas força para corresponder sem capitalização.\n"
+msgstr ""
+" -Y - como -y, mas força para corresponder sem capitalização.\n"
#: ../urpmq:109
#, c-format
msgid " names or rpm files given on command line are queried.\n"
-msgstr " os nomes ou os ficheiros rpm dados na linha de comando são verificados.\n"
+msgstr ""
+" os nomes ou os ficheiros rpm dados na linha de comando são verificados.\n"
#: ../urpmq:156
#, c-format
@@ -3249,14 +3300,16 @@ msgstr ""
#: ../urpmq:408
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
"nenhuma informação xml da média \"%s\", não é possível devolver qualquer "
"resultado do pacote %s"
#: ../urpmq:409
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
"nenhuma informação xml da média \"%s\", não é possível devolver qualquer "
"resultado dos pacotes %s"
@@ -3266,3 +3319,11 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Nenhum registo de mudanças (changelog) encontrado\n"
+#~ msgid "examining %s file"
+#~ msgstr "a examinar ficheiro %s"
+
+#~ msgid "invalid MD5SUM file"
+#~ msgstr "Ficheiro MD5SUM inválido"
+
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "synthesis encontrado e testado como %s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 34494bbd..3bed74fb 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -23,7 +23,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pt_BR\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2008-09-05 16:52-0300\n"
"Last-Translator: Felipe Arruda <felipemiguel@gmail.com>\n"
"Language-Team: Brazilian Portuguese <kde-i18n-pt_br@mail.kde.org>\n"
@@ -43,7 +43,7 @@ msgstr "Instalação de RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Erro: não foi possível encontrar arquivo %s, cancelando operação"
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -112,7 +112,7 @@ msgstr "_Instalar"
msgid "_Save"
msgstr "_Salvar"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Cancelar"
@@ -144,9 +144,8 @@ msgstr ""
msgid "Options:"
msgstr "Opções:"
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - imprime esta mensagem de ajuda.\n"
@@ -162,14 +161,16 @@ msgstr ""
#: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
msgstr ""
" --auto-select - automaticamente seleciona os pacotes necessários para \n"
" atualizar o sistema.\n"
#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
msgstr " --force - força mesmo se alguns pacotes não existem.\n"
#: ../gurpmi.pm:50 ../urpmi:133
@@ -181,20 +182,23 @@ msgstr ""
" --verify-rpm - verifica a assinatura do rpm antes da instalação.\n"
" (--no-verify-rpm desabilita, por padrão é habilitado).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
-msgstr " --media - use somente as mídias listadas (separadas por vírgula).\n"
+msgstr ""
+" --media - use somente as mídias listadas (separadas por vírgula).\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
-msgstr " -p - permite a busca em 'provides' para achar o pacote.\n"
+msgstr ""
+" -p - permite a busca em 'provides' para achar o pacote.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
-msgstr " -P - não procure em 'provides' para encontrar o pacote.\n"
+msgstr ""
+" -P - não procure em 'provides' para encontrar o pacote.\n"
#: ../gurpmi.pm:55 ../urpmi:110 ../urpmq:69
#, c-format
@@ -212,7 +216,8 @@ msgstr ""
#: ../gurpmi.pm:57 ../urpmi:76
#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
msgstr " --searchmedia - usa apenas a mídia fornecida para buscar pacotes.\n"
#: ../gurpmi.pm:100
@@ -230,7 +235,22 @@ msgstr "Por favor aguarde..."
msgid "Must be root"
msgstr "É necesssário super usuário"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "distribuindo %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Instalação de pacotes..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Instalação de pacotes..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -246,37 +266,37 @@ msgstr ""
msgid "Warning"
msgstr "Aviso"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (para atualizar)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (para instalar)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Escolha de pacotes"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Um dos pacotes a seguir é necessário:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Abortar"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -287,59 +307,57 @@ msgstr ""
"%s\n"
"Prosseguir com a instalação mesmo assim?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, 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 satisfazer as dependências, o seguinte pacote será instalado:"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
-msgstr "Para satisfazer as dependências, os seguintes pacotes serão instalados:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr ""
+"Para satisfazer as dependências, os seguintes pacotes serão instalados:"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d pacote, %d MB)"
msgstr[1] "(%d pacotes, %d MB)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Instalação de pacotes..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "incapaz de obter pacotes fonte, abortando"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Preparando..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Instalando pacote `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Por favor insira a mídia chamada \"%s\""
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Baixando o pacote `%s'..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Pronto"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -350,28 +368,28 @@ msgstr ""
"%s\n"
"Você deve atualizar a sua base de dados urpmi"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "A Instalação falhou:"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Tudo já está instalado"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Instalação concluída"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "removendo %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "reiniciando urpmi"
@@ -410,7 +428,7 @@ msgstr " por padrão é %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - imprime nome completo do rpm (NVRA).\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Apenas o super-usuário tem permissão para instalar pacotes"
@@ -420,134 +438,144 @@ msgstr "Apenas o super-usuário tem permissão para instalar pacotes"
msgid "Running urpmi in restricted mode..."
msgstr "Executando o urpmi no modo restrito..."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, c-format
msgid "fail to create directory %s"
msgstr "falha ao criar diretório %s"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr "dono inválido para diretório %s"
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, c-format
msgid "Can not download packages into %s"
msgstr "Não foi possível fazer o download dos pacotes em %s"
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr "Diretório de ambiente %s não existe"
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "usando o ambiente específico em %s\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "incapaz de abrir rpmdb"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nome rpm inválido [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "buscando o arquivo rpm [%s]...."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...busca completa"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...a busca falhou: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "incapaz de acessar o arquivo rpm [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "incapaz de processar arquivo spec %s [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "incapaz de registrar arquivo rpm"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Arquitetura incompatível para o rpm [%s]"
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "erro ao registrar pacotes locais"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Esta operação não é permitida no modo restrito"
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "declaração de proxy errada na linha de comando\n"
-#: ../urpm/args.pm:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "expressão inesperada %s"
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "expressão faltando antes %s"
-#: ../urpm/args.pm:382
+#: ../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:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "sem expressão para fechar"
-#: ../urpm/args.pm:395
+#: ../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\""
+msgstr ""
+"por padrão urpmf espera uma regexp. você pode usar a opção \"--literal\""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "diretório chroot não existe"
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr "Não é possível usar %s sem %s"
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr "Não é possível usar %s com %s"
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr "Muitos parâmetros\n"
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Falha na cópia"
@@ -596,124 +624,124 @@ msgstr "mídia `%s' está definida duas vezes, abortando"
msgid "unable to write config file [%s]"
msgstr "incapaz de gravar o arquivo de configuração [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "%s não está disponível, utilizando %s no lugar"
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
"não foi possível ler configuração do proxy (permissões de leitura "
"insuficientes %s)"
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Favor entrar com suas credenciais para acesso ao proxy\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Nome do usuário:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Senha:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr "Webfetch desconhecido `%s' !!!\n"
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr "%s falhou: saiu com sinal %d"
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr "%s falhou: saiu com %d"
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, c-format
msgid "copy failed"
msgstr "falha na cópia"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, c-format
msgid "wget is missing\n"
msgstr "wget não encontrado\n"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, c-format
msgid "curl is missing\n"
msgstr "curl não encontrado\n"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr "curl falhou: download cancelado\n"
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr "rsync não encontrado\n"
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr "ssh não encontrado\n"
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr "prozila não encontrado\n"
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr "Não foi possível executar o prozilla\n"
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, c-format
msgid "aria2 is missing\n"
msgstr "aria2 não encontrado\n"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr " %s%% de %s completados, ETA = %s, velocidade = %s"
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr " %s%% completados, velocidade = %s"
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, c-format
msgid "retrieving %s"
msgstr "buscando %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, c-format
msgid "retrieved %s"
msgstr "recebido %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "protocolo desconhecido definido para %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "%s não está disponível, utilizando %s no lugar"
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "nenhuma webfetch encontrada, webfetch suportadas são: %s\n"
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "incapaz de usar protocolo: %s"
@@ -733,57 +761,59 @@ msgstr "o pacote %s não foi encontrado."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "buscando os arquivos rpm da mídia \"%s\"..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr "[reempacotamento]"
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "transação criada para instalar %s (remover=%d, instalar=%d, atualizar=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"transação criada para instalar %s (remover=%d, instalar=%d, atualizar=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "incapaz de criar a transação"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "incapaz de extrair rpm do pacote delta-rpm %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "incapaz de instalar o pacote %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "removendo rpm ruim (%s) de %s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, c-format
msgid "removing %s failed: %s"
msgstr "removendo %s com falha: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, c-format
msgid "Removing package %s"
msgstr "Removendo pacote %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "removendo pacote %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "removendo rpms instalados (%s) de %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Mais informações no pacote %s"
@@ -828,18 +858,18 @@ msgstr "cancelando"
msgid "%s database is locked (another program is already using it)"
msgstr "base de dados %s está bloqueada (sendo usada por outro programa)"
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "A Instalação falhou"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr "Continuar mesmo assim? (S/N)"
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -848,73 +878,63 @@ msgstr ""
"A instalação falhou, rpms ruins:\n"
"%s"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, c-format
msgid "The following package has bad signature"
msgstr "O seguinte pacote contém assinaturas erradas"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Os seguintes pacotes contêm assinaturas erradas"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Você deseja continuar a instalação?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, c-format
msgid "removing installed rpms (%s)"
msgstr "removendo rpms instalados (%s)"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "distribuindo %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "instalando %s a partir de %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "instalando %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Tentar instalar sem checar as dependências? (s/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Forçar instalação (--force)? (s/N) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr "Pacotes estão atualizados"
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Instalação é possível"
#: ../urpm/md5sum.pm:26
#, c-format
-msgid "examining %s file"
-msgstr "examinando arquivo %s"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr "arquivo inválido de MD5SUM"
-
-#: ../urpm/md5sum.pm:28
-#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "aviso: o arquivo MD5SUM não contém o md5sum para %s"
@@ -987,228 +1007,229 @@ msgstr "é necessário instalar ao invés de atualizar o pacote %s"
msgid "medium \"%s\" already exists"
msgstr "mídia \"%s\" já existe"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr "(ignorado por default)"
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "adicionando mídia \"%s\" antes da mídia remota \"%s\""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, c-format
msgid "adding medium \"%s\""
msgstr "adicionando a mídia \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr "diretório %s não existe"
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "não foi encontrada uma distribuinão nesta localização"
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, c-format
msgid "unable to parse media.cfg"
msgstr "incapaz de analisar media.cfg"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
-msgstr "incapaz de acessar as mídias da distribuição (media.cfg não encontrado)"
+msgstr ""
+"incapaz de acessar as mídias da distribuição (media.cfg não encontrado)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr "ignorando mídias não compatívieis `%s' (para %s)"
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, c-format
msgid "retrieving media.cfg file..."
msgstr "recuperando o arquivo media.cfg"
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "tentando selecionar mídia inexistente \"%s\""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "selecionando múltiplas mídias: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "removendo a mídia \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "reconfigurando o urpmi para as mídias \"%s\""
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...falha na reconfiguração"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "reconfiguração terminada"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Erro gerando arquivo de nomes: dependência %d não encontrada"
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "mídia \"%s\" já está atualizada"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "examinando arquivo synthesis [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problema ao ler arquivo synthesis da mídia \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "copiando [%s] para a mídia \"%s\"..."
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...falha na cópia"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "Copiando o arquivo de descrição de \"%s\"..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "..cópia terminada"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "cópia de [%s] falhou (arquivo é suspeitamente pequeno)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "computando o md5sum de uma fonte synthesis"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "baixa de [%s] falhou (md5sum não é igual)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, c-format
msgid "genhdlist2 failed on %s"
msgstr "genhdlist2 falhou em %s"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, c-format
msgid "comparing %s and %s"
msgstr "comparando %s e %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "hdlist inválido %s para a mídia \"%s\""
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "copiando arquivo MD5SUM de \"%s\"..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "arquivo MD5SUM inválido (baixado de %s)"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
+#, fuzzy, c-format
+msgid "no metadata found for medium \"%s\""
+msgstr "nenhum arquivo synthesis encontrado para a mídia \"%s\""
+
+#: ../urpm/media.pm:1475
#, c-format
msgid "retrieving source synthesis of \"%s\"..."
msgstr "obtendo a fonte synthesis de \"%s\"..."
-#: ../urpm/media.pm:1478
-#, c-format
-msgid "found probed synthesis as %s"
-msgstr "encontrado synthesis como %s"
-
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
-#, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "nenhum arquivo synthesis encontrado para a mídia \"%s\""
-
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "examinando arquivo de chave pública em \"%s\"..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...importando chave %s do arquivo de chaves públicas de \"%s\""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "incapaz de importar arquivo de chave pública de \"%s\""
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "nenhum arquivo synthesis encontrado para a mídia \"%s\""
+
+#: ../urpm/media.pm:1612
#, c-format
msgid "updated medium \"%s\""
msgstr "atualizada a mídia \"%s\""
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr "busca de [%s] falhou"
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr "tentando novamente com o espelho %s"
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr "Não foi possível encontar um espelho da lista %s"
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr "encontrada geolocalização %s %.2f %.2f do fuso horário %s"
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, c-format
msgid "getting mirror list from %s"
msgstr "obtendo a lista de espelhos de %s"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1279,7 +1300,7 @@ msgstr "GB"
msgid "TB"
msgstr "TB"
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1287,7 +1308,8 @@ msgid ""
msgid_plural ""
"The following packages are now orphans, use \"urpme --auto-orphans\" to "
"remove them."
-msgstr[0] "O seguinte pacote está órfão. Use \"urpme --auto-orphans\" para removê-lo."
+msgstr[0] ""
+"O seguinte pacote está órfão. Use \"urpme --auto-orphans\" para removê-lo."
msgstr[1] ""
#: ../urpm/parallel.pm:14
@@ -1345,7 +1367,9 @@ msgstr "cp falhou no host %s (%d)"
msgid ""
"%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
"code: %d)"
-msgstr "%s falhou no host %s (talvez ele não tenha a versão ideal do urpmi?) (código de interrupção: %d)"
+msgstr ""
+"%s falhou no host %s (talvez ele não tenha a versão ideal do urpmi?) (código "
+"de interrupção: %d)"
#: ../urpm/removable.pm:32
#, c-format
@@ -1394,11 +1418,13 @@ msgstr ""
#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
-msgstr " --excludemedia - não usa as mídias fornecidas (separadas por vírgula).\n"
+msgstr ""
+" --excludemedia - não usa as mídias fornecidas (separadas por vírgula).\n"
#: ../urpm/search.pm:39 ../urpmf:39
#, c-format
-msgid " --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
" --literal, -l - não combina com padrão, utilize argumento como uma\n"
" string de literais.\n"
@@ -1412,7 +1438,8 @@ msgstr " --urpmi-root - use outro root para o urpmi e instalação rpm.\n"
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../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 - ordena as mídias (separadas por vírgulas).\n"
#: ../urpm/search.pm:43 ../urpmf:43
@@ -1445,7 +1472,8 @@ msgstr " --verbose - modo detalhado.\n"
#: ../urpm/search.pm:48 ../urpmf:48
#, c-format
msgid " -i - ignore case distinctions in patterns.\n"
-msgstr " -i - ignora a distinção de maiúscula/minúscula em tudo.\n"
+msgstr ""
+" -i - ignora a distinção de maiúscula/minúscula em tudo.\n"
#: ../urpm/search.pm:49 ../urpmf:49
#, c-format
@@ -1472,7 +1500,8 @@ msgstr ""
#: ../urpm/search.pm:53 ../urpmf:53
#, c-format
msgid " -e - include perl code directly as perl -e.\n"
-msgstr " -e - inclui o código perl diretamente como em 'perl -e'.\n"
+msgstr ""
+" -e - inclui o código perl diretamente como em 'perl -e'.\n"
#: ../urpm/search.pm:54 ../urpmf:54
#, c-format
@@ -1634,17 +1663,14 @@ msgstr " -m - a mídia onde o pacote foi encontrado\n"
#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
#, c-format
msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - imprime versão, 'release' e arquitetura, com nome.\n"
+msgstr ""
+" -f - imprime versão, 'release' e arquitetura, com nome.\n"
#: ../urpm/search.pm:197 ../urpmf:198
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Formato incorreto: você deve utilizar somente uma opção com múltiplos valores"
-
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "usando o ambiente específico em %s\n"
+msgstr ""
+"Formato incorreto: você deve utilizar somente uma opção com múltiplos valores"
#: ../urpm/search.pm:290 ../urpmf:291
#, c-format
@@ -1661,117 +1687,138 @@ msgstr "synthesis não disponível para a mídia \"%s\""
msgid "no xml-info available for medium \"%s\""
msgstr "xml-info não disponível para a mídia \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr "o urpmi foi reiniciado, e a lista de pacotes prioritários não mudou"
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "o urpmi foi reiniciado, e a lista de pacotes prioritários mudou: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"o urpmi foi reiniciado, e a lista de pacotes prioritários mudou: %s vs %s"
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Nenhum nome de pacote %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Os seguintes pacotes contém %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr "Você deve usar a opção \"-a\" para usar que o urpmi use todas"
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "encontrado(s) o(s) pacote(s) %s no urpmi db, mas nenhum deles está instalado"
+msgstr ""
+"encontrado(s) o(s) pacote(s) %s no urpmi db, mas nenhum deles está instalado"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, c-format
msgid "Package %s is already installed"
msgstr "Pacote %s já está instalado"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, c-format
msgid "Packages %s are already installed"
msgstr "Pacotes %s já estão instalados"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "devido estar faltando %s"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, c-format
msgid "due to already installed %s"
msgstr "devido ao pacote já instalado %s"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "devido a estar faltando %s"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "tentando promover %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "para manter %s"
#: ../urpm/select.pm:607
#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Este pacote precisa ser removido para que os outros sejam atualizados:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Estes pacotes precisam ser removidos para que os outros sejam atualizados:\n"
+"%s"
+
+#: ../urpm/select.pm:635
+#, c-format
msgid "in order to install %s"
msgstr "para instalar %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "devido a conflitos com %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Assinatura inválida (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Chave Inválida ID (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Assinatura não encontrada (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr "sistema"
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr "Você deve reiniciar %s para %s"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't write file"
msgstr "Não foi possível escrever arquivo"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't open file"
msgstr "Não foi possível abrir arquivo"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, c-format
msgid "Can't move file %s to %s"
msgstr "Não é possível mover arquivo %s para %s"
@@ -1806,14 +1853,15 @@ msgstr " --auto-orphans - remove pacotes órfãos\n"
#: ../urpme:49
#, c-format
msgid " --test - verify if the removal can be achieved correctly.\n"
-msgstr " --test - verifica se a remoção pode ser feita corretamente.\n"
+msgstr ""
+" --test - verifica se a remoção pode ser feita corretamente.\n"
#: ../urpme:51 ../urpmi:109 ../urpmq:68
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - urpmi distribuído.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - reempacota os arquivos antes da remoção\n"
@@ -1826,7 +1874,8 @@ msgstr " --root - use outro root para desisntalação de rpm.\n"
#: ../urpme:55 ../urpmi:101
#, c-format
msgid " --justdb - update only the rpm db, not the filesystem.\n"
-msgstr " --justdb - atualiza somente a base rpm, não o sistema de arquivos.\n"
+msgstr ""
+" --justdb - atualiza somente a base rpm, não o sistema de arquivos.\n"
#: ../urpme:56
#, c-format
@@ -1843,7 +1892,7 @@ msgstr ""
" de distribuição, útil para (des)instalar em um chroot\n"
" com a opção --root.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - modo detalhado.\n"
@@ -1851,7 +1900,8 @@ msgstr " --verbose, -v - modo detalhado.\n"
#: ../urpme:60
#, c-format
msgid " -a - select all packages matching expression.\n"
-msgstr " -a - seleciona todos os pacotes que combinam com a expressão.\n"
+msgstr ""
+" -a - seleciona todos os pacotes que combinam com a expressão.\n"
#: ../urpme:73
#, c-format
@@ -1888,9 +1938,11 @@ msgstr "Nenhum pacote órfão para ser removido"
#: ../urpme:149
#, 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 satisfazer as dependências, o seguinte pacote será removido"
-msgstr[1] "Para satisfazer as dependências, os %d pacotes seguintes serão removidos"
+msgstr[1] ""
+"Para satisfazer as dependências, os %d pacotes seguintes serão removidos"
#: ../urpme:154
#, c-format
@@ -1906,7 +1958,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "Remover %d pacote?"
msgstr[1] "Remover %d pacotes?"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (s/N) "
@@ -2008,7 +2060,8 @@ msgstr " --buildrequires - instala buildrequires dos pacotes\n"
#: ../urpmi:98
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
-msgstr " --install-src - instala somente o pacote de fontes (sem binários).\n"
+msgstr ""
+" --install-src - instala somente o pacote de fontes (sem binários).\n"
#: ../urpmi:99
#, c-format
@@ -2022,7 +2075,8 @@ msgstr " --noclean - não remove os rpms do cache.\n"
#: ../urpmi:102
#, 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ça a reinstalação de pacotes já instalados.\n"
#: ../urpmi:104
@@ -2152,29 +2206,36 @@ msgstr " --excludedocs - exclui arquivos de documentação.\n"
#: ../urpmi:138
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
-msgstr " --ignoresize - não verifica o espaço em disco antes da instalação.\n"
+msgstr ""
+" --ignoresize - não verifica o espaço em disco antes da instalação.\n"
#: ../urpmi:139
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
-msgstr " --ignorearch - permite instalar rpms de arquiteturas divergentes.\n"
+msgstr ""
+" --ignorearch - permite instalar rpms de arquiteturas divergentes.\n"
#: ../urpmi:140
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - não executa script(s) dos pacotes\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - lista conflitos.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - pacotes que a instalação deve ignorá-los.\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --prefer - pacotes que a instalação deve dar preferência\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2183,42 +2244,42 @@ msgstr ""
" --more-choices - quando diversos pacotes forem encontrados, proponha mais\n"
" escolhas por padrão.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - não bloqueia o banco de dados rpm.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - só atualiza os pacotes com a mesma arquitectura.\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - seleciona todos os listados na linha de comando.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - modo silencioso.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --debug - modo muito detalhado.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " nomes ou arquivos rpm dados na linha de comando serão instalados.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr "Erro: não se pode usar --auto-select com uma lista de pacotes.\n"
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2228,29 +2289,30 @@ msgstr ""
"parâmetros utilizados\n"
"e acrescente --bug.\n"
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "Você não pode instalar arquivos rpm binários ao usar --install-src"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr "Você não pode instalar arquivos spec"
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr "padrão para --buildrequires"
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
"favor usar --buildrequires ou --install-src, preferencialmente --"
"buildrequires"
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2259,17 +2321,12 @@ msgstr ""
"Diretório [%s] já existe, favor usar outro diretório para reportar o "
"problema ou apague-o"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Incapaz de criar o diretório [%s] para relatório de falhas"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr "Diretório de ambiente %s não existe"
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2278,48 +2335,49 @@ msgstr ""
"Erro: %s parece estar montado apenas como leitura.\n"
"Usar --allow-force para forçar a operação."
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr "Atualizando mídias...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (para atualizar)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (para atualizar)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (para instalar)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (para instalar)"
-#: ../urpmi:462
+#: ../urpmi:450
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
-msgstr "Para satisfazer a dependência '%s', um dos seguintes pacotes é necessário:"
+msgstr ""
+"Para satisfazer a dependência '%s', um dos seguintes pacotes é necessário:"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Qual é a sua escolha? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2330,7 +2388,7 @@ msgstr ""
"que são mais antigos que os atualmente instalados:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2341,7 +2399,7 @@ msgstr ""
"que são mais antigos que os atualmente instalados:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2350,12 +2408,12 @@ msgstr ""
"\n"
"Prosseguir instalação mesmo assim?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (S/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2364,7 +2422,7 @@ msgstr ""
"Um pacote não pôde ser instalado:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2373,12 +2431,12 @@ msgstr ""
"Alguns pacotes não puderam ser instalados:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "a remoção do pacote %s irá danificar seu sistema"
-#: ../urpmi:551
+#: ../urpmi:538
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2389,7 +2447,7 @@ msgstr ""
"precisa ser removido para que os outros possam ser atualizados:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2400,30 +2458,12 @@ msgstr ""
"precisam ser removidos para que os outros possam ser atualizados:\n"
"%s\n"
-#: ../urpmi:560
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Este pacote precisa ser removido para que os outros sejam atualizados:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Estes pacotes precisam ser removidos para que os outros sejam atualizados:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(somente teste, remoções não serão efetivadas)"
-#: ../urpmi:583
+#: ../urpmi:568
#, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2434,46 +2474,46 @@ msgstr ""
"dependências:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "O seguinte pacote órfão será removido"
msgstr[1] "Os seguintes pacotes órfãos serão removidos"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(somente teste, instalações não serão efetivadas)"
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr "%s de espaço adicional em disco serão usados."
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr "%s de espaço em disco serão liberados."
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr "%s de pacotes serão baixados."
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
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:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Cancelar"
-#: ../urpmi:648
+#: ../urpmi:633
#, c-format
msgid "Press Enter when mounted..."
msgstr "Tecle Enter quando estiver pronto..."
@@ -2548,7 +2588,8 @@ msgid ""
" or discard non-update media (when used with --distrib)\n"
msgstr ""
" --update - cria uma mídia de atualização, \n"
-" ou descarta mídias que não sejam de atualização (quando usado com a opção --distrib)\n"
+" ou descarta mídias que não sejam de atualização (quando "
+"usado com a opção --distrib)\n"
#: ../urpmi.addmedia:67
#, c-format
@@ -2609,7 +2650,8 @@ msgstr ""
#: ../urpmi.addmedia:79
#, c-format
msgid " --virtual - create virtual media wich are always up-to-date.\n"
-msgstr " --virtual - cria mídias virtuais que estão sempre atualizadas.\n"
+msgstr ""
+" --virtual - cria mídias virtuais que estão sempre atualizadas.\n"
#: ../urpmi.addmedia:80 ../urpmi.update:44
#, c-format
@@ -2724,7 +2766,8 @@ msgstr " --noclean - não remove rpms reempacotados no checkpoint.\n"
#: ../urpmi.recover:37
#, c-format
-msgid " --list - list transactions since provided date/duration argument\n"
+msgid ""
+" --list - list transactions since provided date/duration argument\n"
msgstr " --list - lista transações desde data/duração fornecida\n"
#: ../urpmi.recover:38
@@ -2903,7 +2946,8 @@ msgstr " --no-ignore - não atualizar, marcar a mídia como habilitada.\n"
#: ../urpmi.update:49
#, c-format
msgid " --probe-rpms - do not use synthesis, use rpm files directly\n"
-msgstr " --probe-rpms - não usar synthesis, usando arquivos rpm diretamente\n"
+msgstr ""
+" --probe-rpms - não usar synthesis, usando arquivos rpm diretamente\n"
#: ../urpmi.update:50
#, c-format
@@ -3008,7 +3052,8 @@ msgstr " --list-url - lista mídias disponíveis e suas url's.\n"
#: ../urpmq:61
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
-msgstr " --list-nodes - lista os nós disponíveis quando --parallel é usada.\n"
+msgstr ""
+" --list-nodes - lista os nós disponíveis quando --parallel é usada.\n"
#: ../urpmq:62
#, c-format
@@ -3017,7 +3062,8 @@ msgstr " --list-aliases - lista os apelidos paralelos disponíveis\n"
#: ../urpmq:63
#, 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 - mostrar a configuração como argumentos para o\n"
" urpmi.addmedia.\n"
@@ -3025,11 +3071,13 @@ msgstr ""
#: ../urpmq:64
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
-msgstr " --src - o próximo pacote é um pacote fonte (o mesmo que -s).\n"
+msgstr ""
+" --src - o próximo pacote é um pacote fonte (o mesmo que -s).\n"
#: ../urpmq:65
#, c-format
-msgid " --sources - give all source packages before downloading (root only).\n"
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
msgstr ""
" --sources - fornece todos os pacotes fonte antes de baixar\n"
" (somente root).\n"
@@ -3037,7 +3085,8 @@ msgstr ""
#: ../urpmq:67
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
-msgstr " --ignorearch - permite consultar pacotes de arquiteturas divergentes.\n"
+msgstr ""
+" --ignorearch - permite consultar pacotes de arquiteturas divergentes.\n"
#: ../urpmq:71
#, c-format
@@ -3134,7 +3183,8 @@ msgstr " -g - imprime grupos, com nome também.\n"
#: ../urpmq:101
#, c-format
msgid " -i - print useful information in human readable form.\n"
-msgstr " -i - imprime informações úteis em formato que pode ser lido\n"
+msgstr ""
+" -i - imprime informações úteis em formato que pode ser lido\n"
#: ../urpmq:102
#, c-format
@@ -3154,7 +3204,8 @@ msgstr " -r - imprime versão e 'release' com nome também.\n"
#: ../urpmq:105
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
-msgstr " -s - o próximo pacote é um pacote fonte (o mesmo que --src).\n"
+msgstr ""
+" -s - o próximo pacote é um pacote fonte (o mesmo que --src).\n"
#: ../urpmq:106
#, c-format
@@ -3173,7 +3224,8 @@ msgstr " -y - impõe uma busca aproximada (igual a --fuzzy).\n"
#: ../urpmq:108
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
-msgstr " -Y - como -y, ignorando a distinção de maiúscula/minúscula.\n"
+msgstr ""
+" -Y - como -y, ignorando a distinção de maiúscula/minúscula.\n"
#: ../urpmq:109
#, c-format
@@ -3207,14 +3259,16 @@ msgstr "sem xml info para a mídia \"%s\", resultado parcial para os pacotes %s"
#: ../urpmq:408
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
+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 o "
"pacote %s"
#: ../urpmq:409
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
+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 os "
"pacotes %s"
@@ -3224,6 +3278,15 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Arquivo com as alterações não foi encontrado \n"
+#~ msgid "examining %s file"
+#~ msgstr "examinando arquivo %s"
+
+#~ msgid "invalid MD5SUM file"
+#~ msgstr "arquivo inválido de MD5SUM"
+
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "encontrado synthesis como %s"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - cria uma mídia de atualização.\n"
@@ -3621,4 +3684,3 @@ msgstr "Arquivo com as alterações não foi encontrado \n"
#~ msgid "The following package names were assumed: %s"
#~ msgstr "Os seguintes nomes de pacotes serão assumidos: %s"
-
diff --git a/po/ro.po b/po/ro.po
index 80090c2f..451654b2 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-ro\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2008-07-24 22:21+0200\n"
"Last-Translator: Pîrîu Cristian Ionuţ <piriu.cristian@rdslink.ro>\n"
"Language-Team: Romanian <rtfs-project@lists.sourceforge.net>\n"
@@ -37,7 +37,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ţiunea"
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_OK"
@@ -105,7 +105,7 @@ msgstr "_Instalare"
msgid "_Save"
msgstr "_Salvare"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Renunţă"
@@ -137,9 +137,8 @@ msgstr ""
msgid "Options:"
msgstr "Opţiuni:"
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../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"
@@ -177,19 +176,19 @@ msgstr ""
" (--no-verify-rpm o dezactivează, implicit este "
"activată).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - foloseşte numai mediile date, separate prin virgulă.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - permite căutarea în provides pentru găsirea pachetelor.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - nu căuta în provides pentru găsirea pachetelor.\n"
@@ -232,7 +231,22 @@ msgstr "Vă rog să aşteptaţi..."
msgid "Must be root"
msgstr "Trebuie să fiţi administrator"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "distribui %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Instalare pachete..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Instalare pachete..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -248,37 +262,37 @@ msgstr ""
msgid "Warning"
msgstr "Avertisment"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "OK"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (pentru actualizare)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (pentru instalare)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Alegerea pachetului"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Unul din următoarele pachete e necesar:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Abandonaţi"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -289,20 +303,20 @@ msgstr ""
"%s\n"
"Continuaţi instalarea?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Pentru satisfacerea dependenţelor, următorul pachet va fi instalat:"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, 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:"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
@@ -310,42 +324,37 @@ msgstr[0] "(%d pachet, %d MB)"
msgstr[1] "(%d pachete, %d MB)"
msgstr[2] "(%d pachete, %d MB)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Instalare pachete..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "nu se pot prelua pachetele sursă, se întrerupe"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Pregătire..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Instalarea pachetului `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Vă rog să introduceţi mediul numit \"%s\""
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Se descarcă pachetul `%s'..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Gata"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -356,28 +365,28 @@ msgstr ""
"%s\n"
"Probabil ar trebui să actualizaţi baza de date urpmi"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "Instalarea a eşuat:"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "totul este deja instalat"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Instalare terminată"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "elimin %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "repornesc urpmi"
@@ -416,7 +425,7 @@ msgstr " implicit este %s \n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - afişează numele complet al rpm-ului (NVRA)\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Doar administratorul poate instala pachete"
@@ -426,134 +435,143 @@ msgstr "Doar administratorul poate instala pachete"
msgid "Running urpmi in restricted mode..."
msgstr "Se rulează urpmi în mod restricţionat..."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, c-format
msgid "fail to create directory %s"
msgstr "nu se poate crea directorul %s"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr "proprietar nevalid pentru directorul %s"
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, c-format
msgid "Can not download packages into %s"
msgstr "Nu se pot descărca pachetele în %s"
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr "Directorul %s din sistem nu există"
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "folosind mediul specific pe %s\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "nu pot deschide rpmdb"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nume de fişier rpm nevalid [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "primire fişier rpm [%s] ..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...copierea este terminată"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...copierea eşuată: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "nu pot accesa fişierul rpm [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "nu se poate parcurge fişierul %s [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "nu pot înregistra fişierul rpm"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Arhitectură incompatibilă pentru rpm [%s]"
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "eroare la înregistrarea pachetelor locale"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Operaţiune interzisă în timpul rulării în mod restricţionat"
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "declarare proxy greşită în linia de comandă\n"
-#: ../urpm/args.pm:298
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: nu pot citi fişierul rpm \"%s\"\n"
-#: ../urpm/args.pm:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "expresie neprevăzută %s"
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "lipsă expresie înaintea %s"
-#: ../urpm/args.pm:382
+#: ../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:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "nici o expresie de închis"
-#: ../urpm/args.pm:395
+#: ../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. utilizaţi opţiunea \"--literal\""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "directorul chroot nu există"
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr "Nu se poate utiliza %s fără %s"
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr "Nu se poate utiliza %s cu %s"
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr "Prea multe argumente\n"
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Copierea a eşuat"
@@ -602,124 +620,124 @@ msgstr "mediul `%s' este definit de două ori, se renunţă"
msgid "unable to write config file [%s]"
msgstr "nu pot scrie în fişierul de configurare [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "%s indisponibil, revenire la %s"
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
"citirea setărilor proxy este imposibilă (drepturi insuficiente pentru "
"citirea %s) "
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Introduceţi acreditările pentru accesarea proxy-ului\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Nume utilizator:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Parola:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr "Descărcare necunoscută `%s' !!!\n"
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr "%s a eşuat: terminare cu mesajul %d"
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr "%s a eşuat: terminare cu %d"
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, c-format
msgid "copy failed"
msgstr "copierea a eşuat"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, c-format
msgid "wget is missing\n"
msgstr "datorită lipsei wget\n"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, c-format
msgid "curl is missing\n"
msgstr "datorită lipsei curl\n"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr "curl a eşuat: descărcare anulată\n"
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr "lipseşte rsync\n"
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr "lipseşte ssh\n"
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr "lipseşte prozilla\n"
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr "Nu s-a putut rula prozilla\n"
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, c-format
msgid "aria2 is missing\n"
msgstr "datorită lipsei aria2\n"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr " %s%% din %s terminat, ETA = %s, viteza = %s"
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr " %s%% terminat, viteza = %s"
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, c-format
msgid "retrieving %s"
msgstr "primire %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, c-format
msgid "retrieved %s"
msgstr "s-a primit %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "protocol necunoscut definit pentru %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "%s indisponibil, revenire la %s"
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "nu gasesc webfech, versiunile suportate sunt: %s\n"
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "nu pot folosi protocolul: %s"
@@ -739,12 +757,12 @@ msgstr "pachetul %s nu a fost găsit."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "copiere fişiere rpm de pe mediul \"%s\"..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr "[reîmpachetare]"
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -752,47 +770,47 @@ msgstr ""
"tranzacţie creeată pentru instalarea pe %s (ştergere=%d, instalare=%d, "
"actualizare=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "nu se poate crea tranzacţia"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "nu se poate extrage rpm-ul din pachetul delta-rpm %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "nu pot instala pachetul %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "ştergere rpm deteriorat (%s) din %s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, c-format
msgid "removing %s failed: %s"
msgstr "ştergerea %s eşuată: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, c-format
msgid "Removing package %s"
msgstr "Se şterge pachetul %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "şterg pachetul %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "ştergere rpm-uri instalate (%s) din %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Mai multe informaţii despre pachetul %s"
@@ -837,18 +855,18 @@ msgstr "întrerupere"
msgid "%s database is locked (another program is already using it)"
msgstr "baza de date %s este blocată (utilizată deja de alt program)"
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Instalarea a eşuat"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr "Încercaţi totuşi? (d/N)"
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -857,73 +875,63 @@ msgstr ""
"Instalarea a eşuat, rpm-uri eronate:\n"
"%s"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, c-format
msgid "The following package has bad signature"
msgstr "Următoarele pachete au semnături greşite"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Următoarele pachete au semnături greşite"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Doriţi să continuaţi instalarea?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, c-format
msgid "removing installed rpms (%s)"
msgstr "ştergere rpm-uri instalate (%s)"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "distribui %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "instalare %s din %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "instalez %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Să încerc instalarea fără verificarea dependenţelor? (d/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Încercare instalare forţată (--force)? (d/N) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr "Pachetele sunt actualizate"
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Instalarea este posibilă"
#: ../urpm/md5sum.pm:26
#, c-format
-msgid "examining %s file"
-msgstr "examinare fişier %s"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr "fişier nevalid MD5SUM "
-
-#: ../urpm/md5sum.pm:28
-#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "atenţie: md5sum pentru %s este indisponibil din fişierul MD5SUM"
@@ -997,229 +1005,229 @@ msgstr "instalare în locul actualizării pachetului %s"
msgid "medium \"%s\" already exists"
msgstr "mediul \"%s\" deja există"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr "(se ignoră implicit)"
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "adăugare mediu \"%s\" înaintea mediului extern \"%s\""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, c-format
msgid "adding medium \"%s\""
msgstr "se adaugă mediul \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr "directorul %s nu există"
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "această locaţie nu pare să conţină nici o distribuţie"
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, c-format
msgid "unable to parse media.cfg"
msgstr "nu se poate parcurge media.cfg"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, 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)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr "se ignoră mediul incompatibil `%s' (pentru %s)"
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, c-format
msgid "retrieving media.cfg file..."
msgstr "se obţine fişierul media.cfg..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "se încearcă selectarea unui mediu inexistent \"%s\""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "selectez medii multiple: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "se elimină mediul \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "reconfigurez urpmi pentru mediul \"%s\""
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...reconfigurarea a eşuat"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "reconfigurarea s-a încheiat"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Eroare la generarea fişierelor denumirilor: dependenţa %d lipseşte"
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "mediul \"%s\" este actualizat"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "examinez fişierul synthesis [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problemă la citirea fişierului synthesis al mediului \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "copiere [%s] pentru mediul \"%s\"..."
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...copierea a eşuat"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "copiez fişierul cu descrieri pentru \"%s\"..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...copierea s-a terminat"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "copierea fişierului [%s] a eşuat (fişier suspect de mic)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "se calculează md5sum pentru fişierului synthesis descărcat"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "descărcarea [%s] a eşuat (eroare md5sum)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, c-format
msgid "genhdlist2 failed on %s"
msgstr "genhdlist2 a eşuat pentru %s"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, c-format
msgid "comparing %s and %s"
msgstr "comparare %s şi %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "fişierul hdlist %s pentru mediul \"%s\" nu este valid"
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "copiere fişier MD5SUM al \"%s\"..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "fişier nevalid MD5SUM (descărcat de la %s)"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
+#, fuzzy, c-format
+msgid "no metadata found for medium \"%s\""
+msgstr "nu s-a găsit fişierul synthesis pentru mediul \"%s\""
+
+#: ../urpm/media.pm:1475
#, c-format
msgid "retrieving source synthesis of \"%s\"..."
msgstr "se primeşte sursa synthesis pentru \"%s\"..."
-#: ../urpm/media.pm:1478
-#, c-format
-msgid "found probed synthesis as %s"
-msgstr "s-a găsit synthesis verificat ca %s"
-
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
-#, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "nu s-a găsit fişierul synthesis pentru mediul \"%s\""
-
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "examinez fişierul cheie publică pentru \"%s\"..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...cheia importată %s din fişierul cheie publică pentru \"%s\""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "nu pot importa fişierul cheie publică pentru \"%s\""
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "nu s-a găsit fişierul synthesis pentru mediul \"%s\""
+
+#: ../urpm/media.pm:1612
#, c-format
msgid "updated medium \"%s\""
msgstr "mediul \"%s\" actualizat"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr "primirea [%s] a eşuat"
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr "se reîncearcă cu serverul %s"
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr "Nu s-a găsit un server din lista de servere %s"
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr "localizarea geografică %s %.2f % găsită.2f din fusul orar %s"
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, c-format
msgid "getting mirror list from %s"
msgstr "primire listă servere de la %s"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1290,7 +1298,7 @@ msgstr "GB"
msgid "TB"
msgstr "TB"
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1665,11 +1673,6 @@ msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
"Format incorect: puteţi utiliza numai o singură etichetă cu valori multiple"
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "folosind mediul specific pe %s\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1685,119 +1688,137 @@ msgstr "nu este disponibil un synthesis pentru mediul \"%s\""
msgid "no xml-info available for medium \"%s\""
msgstr "nu sunt disponibile informaţii xml pentru mediul \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr "urpmi s-a repornit, lista pachetelor prioritare este neschimbată"
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
"urpmi s-a repornit, lista pachetelor prioritare s-a modificat: %s contra %s"
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Nici un pachet numit %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Următoarele pachete conţin %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "s-a găsit pachetul(ele) %s în urpmi db, dar nu este instalat"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, c-format
msgid "Package %s is already installed"
msgstr "Pachetul %s este instalat deja"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, c-format
msgid "Packages %s are already installed"
msgstr "Pachetele %s sunt instalate deja"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "datorită lipsei %s"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, c-format
msgid "due to already installed %s"
msgstr "%s este deja instalat"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "datorită %s nesatisfăcute"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "încerc să promovez %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "pentru a păstra %s"
#: ../urpm/select.pm:607
#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Următoarele pachete trebuie şterse pentru ca altele să fie actualizate:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Unrmătoarele pachete trebuie şterse pentru ca altele să fie actualizate:\n"
+"%s"
+
+#: ../urpm/select.pm:635
+#, c-format
msgid "in order to install %s"
msgstr "pentru a instala %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "datorita conflictelor cu %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Semnătură incorectă (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "ID cheie incorect (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Semnătură lipsă (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr "sistem"
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr "Trebuie să reporniţi %s pentru %s"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't write file"
msgstr "Nu se poate scrie fişierul"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't open file"
msgstr "Nu se poate deschide fişierul"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, c-format
msgid "Can't move file %s to %s"
msgstr "Nu se poate muta fişierul %s la %s"
@@ -1840,7 +1861,7 @@ msgstr ""
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - urpmi distribuit între maşinile cu alias.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Reîmpachetarea fişierelor înaintea ştergerii\n"
@@ -1874,7 +1895,7 @@ msgstr ""
"distribuţie, utilă\n"
" pentru (dez)instalarea chroot cu opţiunea --root .\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose , -v - mod detaliat.\n"
@@ -1945,7 +1966,7 @@ msgstr[0] "Se şterge %d pachet?"
msgstr[1] "Se şterg %d pachete?"
msgstr[2] "Se şterg %d pachete?"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (d/N) "
@@ -2217,17 +2238,22 @@ msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr ""
" --noscripts - nu se execută algoritmul(ii) suplimentar al pachetului\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - afişare conflicte.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - packetele a căror instalare poate fi sărită\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --prefer - pachete preferate\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2237,45 +2263,45 @@ msgstr ""
"opţiuni\n"
" decât implicit.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - nu se blochează rpm db.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
" --strict-arch - actualizaţi numai pachetele pentru aceeaşi arhitectură.\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - selectează toate potrivirile în linia de comandă.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - mod silenţios.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --debug - mod detaliat.\n"
-#: ../urpmi:154
+#: ../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"
-#: ../urpmi:182
+#: ../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"
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2285,22 +2311,22 @@ msgstr ""
"consolă\n"
"împreună cu --bug.\n"
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "Nu se pot instala fişierele rpm binare când se foloseşte --install-src"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr "Nu puteţi instala fişierele spec"
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr "implicit revenire la --buildrequires"
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
@@ -2308,7 +2334,7 @@ msgstr ""
"utilizaţi --buildrequires sau --install-src, implicit revenire la --"
"buildrequires"
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2317,17 +2343,12 @@ msgstr ""
"Directorul [%s] există deja, folosiţi un alt director pentru raportarea "
"erorilor sau ştergeţi-l"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Nu pot creea directorul [%s] pentru raportul de erori"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr "Directorul %s din sistem nu există"
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2336,36 +2357,36 @@ msgstr ""
"Eroare: %s pare să nu permită scrierea.\n"
"Utilizaţi --allow-force pentru forţarea operaţiei."
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr "Actualizare mediu...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (pentru actualizare)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (pentru actualizare)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (pentru instalare)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (pentru instalare)"
-#: ../urpmi:462
+#: ../urpmi:450
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2374,12 +2395,12 @@ msgstr ""
"Pentru satisfacerea dependenţelor lui '%s', unul dintre următoarele pachete "
"este necesar: "
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Ce alegeţi? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2390,7 +2411,7 @@ msgstr ""
"mai vechi decât cele instalate:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2401,7 +2422,7 @@ msgstr ""
"mai vechi decât cele instalate:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2410,12 +2431,12 @@ msgstr ""
"\n"
"Continuaţi totuşi instalarea?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (D/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2424,7 +2445,7 @@ msgstr ""
"Pachetul cerut nu poate fi instalat:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2433,12 +2454,12 @@ msgstr ""
"Unele pachete cerute nu pot fi instalate:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "ştergerea pachetului %s va deteriora sistemul dvs"
-#: ../urpmi:551
+#: ../urpmi:538
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2449,7 +2470,7 @@ msgstr ""
"trebuie şterse pentru ca altele să fie actualizate:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2460,30 +2481,12 @@ msgstr ""
"trebuie şterse pentru ca altele să fie actualizate:\n"
"%s\n"
-#: ../urpmi:560
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Următoarele pachete trebuie şterse pentru ca altele să fie actualizate:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Unrmătoarele pachete trebuie şterse pentru ca altele să fie actualizate:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(numai test, nu se va efectua ştergerea)"
-#: ../urpmi:583
+#: ../urpmi:568
#, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2494,7 +2497,7 @@ msgstr ""
"dependenţe:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
@@ -2502,27 +2505,27 @@ msgstr[0] "Următorul pachet inutil va fi şters."
msgstr[1] "Următoarele pachete inutile vor fi şterse."
msgstr[2] "Următoarele pachete inutile vor fi şterse."
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(numai test, nu se va efectua instalare)"
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr "vor fi utilizaţi adiţional %s din spaţiul de pe disc."
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr "vor fi eliberaţi %s din spaţiul de pe disc."
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr "%s de pachete vor fi primiţi."
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2530,12 +2533,12 @@ msgstr[0] "Continuaţi cu instalarea unui pachet?"
msgstr[1] "Continuaţi cu instalarea a %d pachete?"
msgstr[2] "Continuaţi cu instalarea a %d pachete?"
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Renunţă"
-#: ../urpmi:648
+#: ../urpmi:633
#, c-format
msgid "Press Enter when mounted..."
msgstr "Apăsaţi Enter după montare..."
@@ -3319,6 +3322,15 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Nu s-a gasit changelog\n"
+#~ msgid "examining %s file"
+#~ msgstr "examinare fişier %s"
+
+#~ msgid "invalid MD5SUM file"
+#~ msgstr "fişier nevalid MD5SUM "
+
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "s-a găsit synthesis verificat ca %s"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - creează un mediu de actualizare.\n"
diff --git a/po/ru.po b/po/ru.po
index ecec621e..14bc5d91 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2008-09-09 22:18+0500\n"
"Last-Translator: Alexander Kazancev <kazancas@gmail.com>\n"
"Language-Team: Russian <gnu@mx.ru>\n"
@@ -36,7 +36,7 @@ msgstr "Установка RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Ошибка: не удаётся найти файл %s, операция отменяется"
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_ОК"
@@ -102,7 +102,7 @@ msgstr "_Установить"
msgid "_Save"
msgstr "_Сохранить"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Отмена"
@@ -134,9 +134,8 @@ msgstr ""
msgid "Options:"
msgstr "Параметры:"
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - вывести это справочное сообщение\n"
@@ -152,12 +151,15 @@ msgstr ""
#: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - автоматический выбор пакетов для обновления системы.\n"
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - автоматический выбор пакетов для обновления системы.\n"
#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
msgstr ""
" --force - принудительное выполнение, даже если некоторые пакеты\n"
" не существуют\n"
@@ -171,19 +173,19 @@ msgstr ""
" --verify-rpm - проверять подписи rpm перед установкой\n"
" (--no-verify-rpm отключает её; по умолчанию включена)\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - использовать только указанные источники,\n"
" перечисленные через запятую.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - разрешить искать пакеты в provides\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - не искать пакеты в provides\n"
@@ -202,7 +204,8 @@ msgstr " --test - проверить возможность корре
#: ../gurpmi.pm:57 ../urpmi:76
#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
" --searchmedia - использование только указанных источников для поиска\n"
" запрошенных пакетов.\n"
@@ -222,7 +225,22 @@ msgstr "Подождите, пожалуйста..."
msgid "Must be root"
msgstr "Необходимы права root'а"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "распределяется %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Устанавливается пакет..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Устанавливается пакет..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -238,37 +256,37 @@ msgstr ""
msgid "Warning"
msgstr "Внимание"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "ОК"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (обновить)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (установить)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Выбор пакета"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Нужен один из следующих пакетов:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Прервать"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -279,59 +297,56 @@ msgstr ""
"%s\n"
"Всё равно продолжить установку?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, 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 "Для удовлетворения зависимостей будет установлен следующий пакет:"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Для удовлетворения зависимостей будут установлены следующие пакеты:"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d пакет, %d МБ)"
msgstr[1] "(%d пакетов, %d МБ)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Устанавливается пакет..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "не удаётся получить пакеты с исходными кодами, аварийное завершение"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Подготовка..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Устанавливается пакет `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Вставьте носитель под названием \"%s\""
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Загружается пакет `%s'..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Готово"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -342,28 +357,28 @@ msgstr ""
"%s\n"
"Возможно вам необходимо обновить базу данных urpmi"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "Установка не удалась:"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Все уже установлено"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Установка завершена"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "удаляется %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "urpmi перезапускается"
@@ -402,7 +417,7 @@ msgstr " по умолчанию %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - выводить полное имя rpm (NVRA)\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Только суперпользователю разрешается устанавливать пакеты"
@@ -412,136 +427,146 @@ msgstr "Только суперпользователю разрешается
msgid "Running urpmi in restricted mode..."
msgstr "Запуск urpmi в ограниченном режиме..."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, c-format
msgid "fail to create directory %s"
msgstr "не удалось создать каталог %s"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr "недопустимый владелец каталога %s"
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, c-format
msgid "Can not download packages into %s"
msgstr "Не удаётся загрузить пакеты в %s"
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr "Каталог окружения %s не существует"
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "используется специфическое окружение для %s\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "не удаётся открыть базу данных RPM"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "неверное имя rpm-файла [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "извлекается rpm-файл [%s] ..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...извлечение выполнено"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...извлечение не удалось: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "нет доступа к rpm-файлу [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "не удаётся разобрать spec-файл %s [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "не удаётся зарегистрировать rpm-файл"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Несовместимая архитектура для [%s]"
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "ошибка регистрации локальных пакетов"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Эта операция запрещена при работе в ограниченном режиме"
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "неверное объявление proxy в командной строке\n"
-#: ../urpm/args.pm:298
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: не удаётся прочитать rpm-файл \"%s\"\n"
-#: ../urpm/args.pm:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "неожиданное выражение %s"
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "перед %s отсутствует выражение"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
-msgstr "неожиданное выражение %s (рекомендация: используйте параметр -a или -o)"
+msgstr ""
+"неожиданное выражение %s (рекомендация: используйте параметр -a или -o)"
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "отсутствует выражения для закрытия"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"по умолчанию urpmf ожидает регулярное выражение. Используйте параметр \"--"
"literal\""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "Каталог chroot не существует"
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr "%s нельзя использовать без %s"
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr "%s нельзя использовать без %s"
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr "Слишком много аргументов\n"
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Копирование не удалось"
@@ -590,124 +615,124 @@ msgstr "источник '%s' определён дважды; останов"
msgid "unable to write config file [%s]"
msgstr "не удаётся записать конфигурационный файл [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "%s недоступен, выполняется откат до %s"
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
"не удаётся прочитать параметры прокси-сервера (недостаточно прав, чтобы "
"прочитать %s)"
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Укажите данные для доступа к прокси-серверу\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Имя пользователя:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Пароль:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr "Неизвестный webfetch `%s' !!!\n"
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr "сбой %s: завершён с сигналом %d"
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr "сбой %s: завершён с %d"
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, c-format
msgid "copy failed"
msgstr "сбой копирования"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, c-format
msgid "wget is missing\n"
msgstr "Отсутствует wget\n"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, c-format
msgid "curl is missing\n"
msgstr "Отсутствует curl\n"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr "сбой curl: загрузка отменена\n"
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr "Отсутствует rsync\n"
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr "Отсутствует ssh\n"
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr "Отсутствует prozilla\n"
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr "Не удаётся запустить prozilla\n"
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, c-format
msgid "aria2 is missing\n"
msgstr "Отсутствует aria2\n"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr " %s%% из %s завершено, осталось времени = %s, скорость = %s"
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr " %s%% завершено, скорость = %s"
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, c-format
msgid "retrieving %s"
msgstr "загружается %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, c-format
msgid "retrieved %s"
msgstr "загружено %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "для %s определён неизвестный протокол"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "%s недоступен, выполняется откат до %s"
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "не найден webfetch; поддерживаемые webfetch: %s\n"
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "не удаётся обработать протокол: %s"
@@ -727,57 +752,59 @@ msgstr "пакет %s не найден."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "извлекаются rpm-файлы из источника \"%s\"..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr "[повторная упаковка]"
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "создана транзакция для установки на %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"создана транзакция для установки на %s (remove=%d, install=%d, upgrade=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "не удаётся создать транзакцию"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "не удаётся извлечь rpm-файл из пакета delta-rpm %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "не удаётся установить пакет %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "удаляются неверные rpm-файлы (%s) из %s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, c-format
msgid "removing %s failed: %s"
msgstr "не удалось удалить %s: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, c-format
msgid "Removing package %s"
msgstr "Удаляется пакет %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "удаляется пакет %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "удаляются установленные rpm-файлы (%s) из %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Дополнительная информация о пакете %s"
@@ -822,18 +849,18 @@ msgstr "прерывается"
msgid "%s database is locked (another program is already using it)"
msgstr "%s база заблокирована (возможно ее использует другая программа)"
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Установка не удалась"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr "Попробовать в любом случае? (y/N)"
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -842,73 +869,63 @@ msgstr ""
"Не удалось установить; неверные rpm-файлы:\n"
"%s"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, c-format
msgid "The following package has bad signature"
msgstr "Следующий пакет имеет неверную подпись"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Следующие пакеты имеют неверные подписи"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Продолжить установку?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, c-format
msgid "removing installed rpms (%s)"
msgstr "удаляются установленные rpm-файлы (%s)"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "распределяется %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "устанавливается %s из %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "устанавливается %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Попробовать установить без проверки зависимостей? (y/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Попробовать принудительную установку (--force)? (y/N)"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr "Пакеты находятся в актуальном состоянии"
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Установка возможна."
#: ../urpm/md5sum.pm:26
#, c-format
-msgid "examining %s file"
-msgstr "изучается файл %s"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr "Неверный файл MD5SUM"
-
-#: ../urpm/md5sum.pm:28
-#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "предупреждение: в файле MD5SUM нет md5-суммы для %s"
@@ -937,7 +954,8 @@ msgstr "попытка переопределить существующий и
#: ../urpm/media.pm:456
#, c-format
msgid "failed to migrate removable device, ignoring media"
-msgstr "не удалось выполнить миграцию съёмного устройства; источник игнорируется"
+msgstr ""
+"не удалось выполнить миграцию съёмного устройства; источник игнорируется"
#: ../urpm/media.pm:499 ../urpm/media.pm:505
#, c-format
@@ -983,228 +1001,228 @@ msgstr "будет произведена установка вместо обн
msgid "medium \"%s\" already exists"
msgstr "источник \"%s\" уже существует"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr "(игнорируется по умолчанию)"
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "добавляется источник \"%s\" (перед удалённым источником \"%s\")"
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, c-format
msgid "adding medium \"%s\""
msgstr "добавляется источник \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr "Каталог %s не существует"
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "не удаётся найти дистрибутив по указанному адресу"
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, c-format
msgid "unable to parse media.cfg"
msgstr "не удаётся обработать файл media.cfg"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "нет доступа к источнику с дистрибутивом (не найден файл media.cfg)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr "пропускается несовместимый источник `%s' (для %s)"
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, c-format
msgid "retrieving media.cfg file..."
msgstr "загружается файл media.cfg..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "был выбран несуществующий источник \"%s\""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "выбирается составной источник: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "удаляется источник \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "перенастраивается urpmi для источника \"%s\""
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...перенастройка не удалась"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "перенастройка выполнена"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Ошибка создания файла имён: не найдена зависимость %d"
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "источник \"%s\" уже обновлён"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "изучается файл synthesis [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "проблема чтения файла synthesis источника \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "копируется [%s] для источника \"%s\"..."
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...копирование не удалось"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "копируется файл описания для \"%s\"..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...копирование выполнено"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "копирование [%s] не удалось (файл подозрительно короткий)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "вычисляется md5-сумма для загруженного synthesis-файла источника"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "копирование [%s] не удалось (md5-суммы не совпадают)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, c-format
msgid "genhdlist2 failed on %s"
msgstr "ошибка выполнения genhdlist2 для %s"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, c-format
msgid "comparing %s and %s"
msgstr "сравниваются %s и %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "неверный файл hdlist %s для источника \"%s\""
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "копируется файл MD5SUM для \"%s\"..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "неверный файл MD5SUM (загружен из %s)"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
+#, fuzzy, c-format
+msgid "no metadata found for medium \"%s\""
+msgstr "не найден synthesis-файл для источника \"%s\""
+
+#: ../urpm/media.pm:1475
#, c-format
msgid "retrieving source synthesis of \"%s\"..."
msgstr "загружается synthesis-файл источника из \"%s\"..."
-#: ../urpm/media.pm:1478
-#, c-format
-msgid "found probed synthesis as %s"
-msgstr "найден искомый synthesis-файл: %s"
-
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
-#, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "не найден synthesis-файл для источника \"%s\""
-
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "проверяется файл открытого ключа для \"%s\"..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...импортирован ключ %s из файла открытого ключа \"%s\""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "не удаётся импортировать файл открытого ключа \"%s\""
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "не найден synthesis-файл для источника \"%s\""
+
+#: ../urpm/media.pm:1612
#, c-format
msgid "updated medium \"%s\""
msgstr "обновлён источник \"%s\""
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr "не удалось загрузить [%s]"
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr "повторная попытка с зеркала %s"
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr "Не удаётся найти зеркало из списка зеркал %s"
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr "найдено географическое расположение %s %.2f %.2f из часового пояса %s"
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, c-format
msgid "getting mirror list from %s"
msgstr "загружается список зеркал из %s"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "NnНн"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1275,7 +1293,7 @@ msgstr "ГБ"
msgid "TB"
msgstr "ТБ"
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1402,7 +1420,8 @@ msgstr ""
#: ../urpm/search.pm:39 ../urpmf:39
#, c-format
-msgid " --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
" --literal, -l - не искать соответствия шаблону, использовать аргумент\n"
" как буквенную строку.\n"
@@ -1418,7 +1437,8 @@ msgstr ""
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../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 - сортировать источники по подстрокам, перечисленным\n"
" через запятую.\n"
@@ -1647,11 +1667,6 @@ msgstr ""
"Неверный формат: вы можете использовать только один тег с несколькими "
"значениями"
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "используется специфическое окружение для %s\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1667,117 +1682,137 @@ msgstr "не найден synthesis-файл для источника \"%s\""
msgid "no xml-info available for medium \"%s\""
msgstr "не найден файл xml-info для источника \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr "urpmi был перезапущен; список приоритетов пакетов не изменился"
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "urpmi был перезапущен; список приоритетов пакетов изменился: %s против %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"urpmi был перезапущен; список приоритетов пакетов изменился: %s против %s"
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Нет пакета с именем %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Следующие пакеты содержат %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr "Вы должны использовать \"-a\"для выбора их всех"
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "в базе данных найдены пакеты %s, но не установлены"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, c-format
msgid "Package %s is already installed"
msgstr "Пакет %s уже установлен"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, c-format
msgid "Packages %s are already installed"
msgstr "Пакеты %s уже установлен"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "из-за отсутствия %s"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, c-format
msgid "due to already installed %s"
msgstr "из-за того, что %s уже установлен"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "из-за неудовлетворённости %s"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "попытка активизировать %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "чтобы сохранить %s"
#: ../urpm/select.pm:607
#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Следующий пакет будет удалён для обновления остальных:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Следующие пакеты будут удалены для обновления остальных:\n"
+"%s"
+
+#: ../urpm/select.pm:635
+#, c-format
msgid "in order to install %s"
msgstr "чтобы установить %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "из-за конфликтов с %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Неверная подпись (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Неверный Key ID (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Отсутствует подпись (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr "система"
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr "Необходимо перезапустить %s для %s"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't write file"
msgstr "Не удаётся записать файл"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't open file"
msgstr "Не удаётся открыть файл"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, c-format
msgid "Can't move file %s to %s"
msgstr "Не удаётся переместить файл %s в %s"
@@ -1819,7 +1854,7 @@ msgstr " --test - проверить возможность корре
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - распределённый urpmi через машины алиаса\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - повторно упаковывать файлы перед удалением\n"
@@ -1832,7 +1867,8 @@ msgstr " --root - использовать другой корень д
#: ../urpme:55 ../urpmi:101
#, c-format
msgid " --justdb - update only the rpm db, not the filesystem.\n"
-msgstr " --justdb - обновить базу данных, но не изменять файловую систему.\n"
+msgstr ""
+" --justdb - обновить базу данных, но не изменять файловую систему.\n"
#: ../urpme:56
#, c-format
@@ -1848,7 +1884,7 @@ msgstr ""
" --use-distrib - настроить urpme на лету из дерева distrib; полезно\n"
" для установки/удаления в/из chroot с параметром --root\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - подробный режим.\n"
@@ -1877,8 +1913,10 @@ msgstr "неизвестный пакет"
#, c-format
msgid "Removing the following package will break your system:"
msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "после удаления следующего пакета будет нарушена работа всей системы:"
-msgstr[1] "после удаления следующих пакетов будет нарушена работа всей системы:"
+msgstr[0] ""
+"после удаления следующего пакета будет нарушена работа всей системы:"
+msgstr[1] ""
+"после удаления следующих пакетов будет нарушена работа всей системы:"
#: ../urpme:126
#, c-format
@@ -1893,7 +1931,8 @@ msgstr "Нет осиротевших пакетов для удаления"
#: ../urpme:149
#, 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] "Для удовлетворения зависимостей будет удалён следующий пакет"
msgstr[1] "Для удовлетворения зависимостей будут удалены следующие %d пакетов"
@@ -1911,7 +1950,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "Удалить %d пакет?"
msgstr[1] "Удалить %d пакетов?"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (y/N) "
@@ -1959,7 +1998,8 @@ msgstr " --auto-orphans - удаления сирот без запроса\n"
#: ../urpmi:85 ../urpmq:54
#, c-format
msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
-msgstr " --no-suggests - не выбирать автоматически \"рекомендованные\" пакеты.\n"
+msgstr ""
+" --no-suggests - не выбирать автоматически \"рекомендованные\" пакеты.\n"
#: ../urpmi:86
#, c-format
@@ -2030,8 +2070,10 @@ msgstr " --noclean - не удалять rpm из кэша.\n"
#: ../urpmi:102
#, c-format
-msgid " --replacepkgs - force installing packages which are already installed.\n"
-msgstr " --replacepkgs - принудительная установка уже установленных пакетов.\n"
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+" --replacepkgs - принудительная установка уже установленных пакетов.\n"
#: ../urpmi:104
#, c-format
@@ -2054,7 +2096,8 @@ msgstr ""
#: ../urpmi:108
#, c-format
msgid " --allow-suggests - auto select \"suggested\" packages.\n"
-msgstr " --allow-suggests - автоматически выбирать \"рекомендованные\" пакеты.\n"
+msgstr ""
+" --allow-suggests - автоматически выбирать \"рекомендованные\" пакеты.\n"
#: ../urpmi:112
#, c-format
@@ -2097,12 +2140,14 @@ msgstr " --wget-options - дополнительные параметры, пе
#: ../urpmi:121
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
-msgstr " --prozilla-options - дополнительные параметры, передаваемые в prozilla\n"
+msgstr ""
+" --prozilla-options - дополнительные параметры, передаваемые в prozilla\n"
#: ../urpmi:122
#, c-format
msgid " --aria2-options - additional options to pass to aria2\n"
-msgstr " --aria2-options- дополнительные параметры, передаваемые в программу aria2\n"
+msgstr ""
+" --aria2-options- дополнительные параметры, передаваемые в программу aria2\n"
#: ../urpmi:123 ../urpmi.addmedia:60 ../urpmi.update:38
#, c-format
@@ -2158,7 +2203,8 @@ msgstr " --excludedocs - исключить файлы документаци
#: ../urpmi:138
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
-msgstr " --ignoresize - не проверять дисковое пространство перед установкой\n"
+msgstr ""
+" --ignoresize - не проверять дисковое пространство перед установкой\n"
#: ../urpmi:139
#, c-format
@@ -2172,17 +2218,22 @@ msgstr ""
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - не выполнять scriptlet'ы пакета\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - показать конфликты\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - пакеты, установка которых будет пропущена\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --prefer - предпочитаемые пакеты\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2191,44 +2242,45 @@ msgstr ""
" --more-choices - если найдены разные пакеты, предложить больше\n"
" вариантов, чем предлагается по умолчанию\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - не блокировать базу данных rpm\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - обновить пакеты только с такой же архитектурой\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - выбрать все совпадения из командной строки\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - тихий режим (quiet).\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --debug - очень подробный режим.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
-msgstr " будут установлены имена или rpm-файлы, указанные в командной строке.\n"
+msgstr ""
+" будут установлены имена или rpm-файлы, указанные в командной строке.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
"Ошибка: параметр --auto-select нельзя использовать вместе со списком "
"пакетов.\n"
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2237,31 +2289,32 @@ msgstr ""
"Ошибка: чтобы создать отчёт об ошибке, нужно указать обычные аргументы\n"
"командной строки вместе с параметром --bug.\n"
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
"При использовании параметра --install-src нельзя устанавливать бинарные rpm-"
"файлы"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr "Вы не можете установить файл spec"
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr "умолчания для --buildrequires"
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
"используйте параметр --buildrequires или --install-src (по умолчанию "
"используется --buildrequires)"
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2270,17 +2323,12 @@ msgstr ""
"Каталог [%s] уже существует, используйте другой каталог для отчёта об ошибке "
"или удалите его"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Не удаётся создать каталог [%s] для отчёта об ошибке"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr "Каталог окружения %s не существует"
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2289,48 +2337,48 @@ msgstr ""
"Ошибка: похоже, что %s примонтирован только для чтения.\n"
"Используйте --allow-force для принудительного выполнения операции."
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr "Обновляется источник...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (для обновления)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (для обновления)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (для установки)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (для установки)"
-#: ../urpmi:462
+#: ../urpmi:450
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "Для удовлетворения зависимости '%s' нужен один из следующих пакетов:"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Ваш выбор? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2341,7 +2389,7 @@ msgstr ""
"более старых, чем установленные:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2352,7 +2400,7 @@ msgstr ""
"более старых, чем установленные:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2361,12 +2409,12 @@ msgstr ""
"\n"
"Продолжить установку?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (Y/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2375,7 +2423,7 @@ msgstr ""
"Не удаётся установить запрошенный пакет:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2384,12 +2432,12 @@ msgstr ""
"Не удаётся установить некоторые из запрошенных пакетов:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "удаление пакета %s нарушит работу вашей системы"
-#: ../urpmi:551
+#: ../urpmi:538
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2400,7 +2448,7 @@ msgstr ""
"пакет для обновления остальных:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2411,30 +2459,12 @@ msgstr ""
"пакеты для обновления остальных:\n"
"%s\n"
-#: ../urpmi:560
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Следующий пакет будет удалён для обновления остальных:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Следующие пакеты будут удалены для обновления остальных:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(только проверка; ничего удалено не будет)"
-#: ../urpmi:583
+#: ../urpmi:568
#, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2445,46 +2475,46 @@ msgstr ""
"следующие зависимости:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "Будет удалён следующий осиротевший пакет."
msgstr[1] "Будут удалены следующие осиротевшие пакеты."
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(только проверка, без установки)"
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr "Будет использовано %s дополнительного дискового пространства."
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr "Будет особождено %s дискового пространства."
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr "Будет загружено %s пакетов."
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Установить один пакет?"
msgstr[1] "Установить %d пакетов?"
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Отмена"
-#: ../urpmi:648
+#: ../urpmi:633
#, c-format
msgid "Press Enter when mounted..."
msgstr "Нажмите 'Enter' после монтирования..."
@@ -2546,7 +2576,8 @@ msgstr " --curl - использовать curl для загрузки
#: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
-msgstr " --prozilla - использовать prozilla для загрузки удалённых файлов\n"
+msgstr ""
+" --prozilla - использовать prozilla для загрузки удалённых файлов\n"
#: ../urpmi.addmedia:58 ../urpmi.update:36
#, c-format
@@ -2560,7 +2591,8 @@ msgid ""
" or discard non-update media (when used with --distrib)\n"
msgstr ""
" --update - создание источника обновления, \n"
-" или сброс не обновляемого источника (при использовании с --distrib)\n"
+" или сброс не обновляемого источника (при использовании с "
+"--distrib)\n"
#: ../urpmi.addmedia:67
#, c-format
@@ -2745,7 +2777,8 @@ msgstr ""
#: ../urpmi.recover:37
#, c-format
-msgid " --list - list transactions since provided date/duration argument\n"
+msgid ""
+" --list - list transactions since provided date/duration argument\n"
msgstr ""
" --list - список транзакций относительно указанной\n"
" даты/продолжительности\n"
@@ -3033,7 +3066,8 @@ msgstr " --list-url - список доступных источников
#: ../urpmq:61
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
-msgstr " --list-nodes - список доступных узлов при использовании --parallel.\n"
+msgstr ""
+" --list-nodes - список доступных узлов при использовании --parallel.\n"
#: ../urpmq:62
#, c-format
@@ -3042,17 +3076,21 @@ msgstr " --list-aliases - список доступных алиасов parall
#: ../urpmq:63
#, c-format
-msgid " --dump-config - dump the config in form of urpmi.addmedia argument.\n"
-msgstr " --dump-config - дамп config'а в виде аргумента для urpmi.addmedia.\n"
+msgid ""
+" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+" --dump-config - дамп config'а в виде аргумента для urpmi.addmedia.\n"
#: ../urpmq:64
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
-msgstr " --src - следующий пакет содержит исходные коды (эквивалент -s).\n"
+msgstr ""
+" --src - следующий пакет содержит исходные коды (эквивалент -s).\n"
#: ../urpmq:65
#, c-format
-msgid " --sources - give all source packages before downloading (root only).\n"
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
msgstr ""
" --sources - вывод всех пакетов с исходными кодами перед загрузкой\n"
" (только для root'a).\n"
@@ -3159,7 +3197,8 @@ msgstr " -g - вывод групп с именами.\n"
#: ../urpmq:101
#, c-format
msgid " -i - print useful information in human readable form.\n"
-msgstr " -i - вывод полезной информации в удобной для чтения форме.\n"
+msgstr ""
+" -i - вывод полезной информации в удобной для чтения форме.\n"
#: ../urpmq:102
#, c-format
@@ -3188,7 +3227,8 @@ msgstr ""
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
-msgstr " -u - удалить пакет, если уже установлена более новая версия.\n"
+msgstr ""
+" -u - удалить пакет, если уже установлена более новая версия.\n"
#: ../urpmq:107
#, c-format
@@ -3238,14 +3278,16 @@ msgstr ""
#: ../urpmq:408
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
"для источника \"%s\" отсутствует xml-info; невозможно возвратить результат "
"для пакета %s"
#: ../urpmq:409
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
"для источника \"%s\" отсутствует xml-info; невозможно возвратить результат "
"для пакетов %s"
@@ -3255,3 +3297,11 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Не найден журнал изменений\n"
+#~ msgid "examining %s file"
+#~ msgstr "изучается файл %s"
+
+#~ msgid "invalid MD5SUM file"
+#~ msgstr "Неверный файл MD5SUM"
+
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "найден искомый synthesis-файл: %s"
diff --git a/po/sc.po b/po/sc.po
index c88b73ba..331cfa71 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+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"
@@ -29,7 +29,7 @@ msgstr "Aposentadura RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -95,7 +95,7 @@ msgstr "_Aposenta"
msgid "_Save"
msgstr "_Sarva"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "A_nnudda"
@@ -127,9 +127,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - amosta custa missada de ajudu.\n"
@@ -165,19 +164,19 @@ msgstr ""
" --verify-rpm - aberiga sa firma rpm innantis de aposentai\n"
" (--no-verify-rpm da disabivat, abivada desinuncas).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - imprea feti is mèdius indidaus, pratzius de vìrgula.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - permiti de circai in is provides po agatai su pakitu.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - no cirkist in is provides po agatai su pakitu.\n"
@@ -217,7 +216,22 @@ msgstr "Abeta..."
msgid "Must be root"
msgstr "Depis essi root"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "seu distribuendi %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Aposentadura pakitus..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Aposentadura pakitus..."
+
+#: ../gurpmi2:111
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -233,37 +247,37 @@ msgstr ""
msgid "Warning"
msgstr "Atentu"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Andat"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (de ajorronai)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (de aposentai)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Sçoberu de is pakitus"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Dui bolit unu de is pakitus ki sighint:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "L_assa"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -274,14 +288,14 @@ msgstr ""
"%s\n"
"Sigu?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
"Po satisfai is dependèntzias, megu a aposentai su pakitu ki sighit (%d MB)"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -289,49 +303,44 @@ msgstr ""
"Po satisfai is dependèntzias, megu a aposentai is %d pakitus ki sighint:\n"
"%s\n"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, fuzzy, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "%d pakitus"
msgstr[1] "%d pakitus"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Aposentadura pakitus..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "no potzu lompi a is pakitus mitza, bessu"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Apariçu..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Aposentu su pakitu `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Intra su mèdiu nominau \"%s\" in su trastu [%s]"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Scarrigamentu de su pakitu `%s'..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Fatu"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -342,28 +351,28 @@ msgstr ""
"%s\n"
"Forsis bolis ajorronai su database de urpmi"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Aposentadura faddia"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Pakitu(s) jai aposentau(s)"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Aposentadura acabada"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "srèxinu %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "torru a aberri urpmi"
@@ -402,7 +411,7 @@ msgstr " predefiniu est %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -g - amosta is grupus cun su nòmini puru.\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Feti superuser podit aposentai pakitus"
@@ -412,134 +421,143 @@ msgstr "Feti superuser podit aposentai pakitus"
msgid "Running urpmi in restricted mode..."
msgstr "Fatzu girai urpmi in modalidadi strinta..."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "No potzu creai sa directory [%s] po arrelatai is fartas"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "Scarrigamentu de su pakitu `%s'..."
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "impreu unu ambienti indidau in %s\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "no potzu aberri su database rpm"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nòmini file rpm [%s] no bàlidu"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "agatu su file rpm [%s] ..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...agataus"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...no agataus: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "no potzu lompi a su file rpm [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "no potzu analisai \"%s\" in su file [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "no potzu assentai su file rpm"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "faddina assentendi is pakitus localis"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
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:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "decrarada de proxy mala in arraya de cumandu\n"
-#: ../urpm/args.pm:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Amancat sa firma (%s)"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Còpia faddia"
@@ -586,122 +604,122 @@ msgstr ""
msgid "unable to write config file [%s]"
msgstr "no potzu scriri su file de assètiu [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr ""
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Po praxeri, intra is scedas tuas po lompi a su proxy\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Nòmini umperadori:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Password:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr ""
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr ""
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, fuzzy, c-format
msgid "copy failed"
msgstr "Còpia faddia"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, fuzzy, c-format
msgid "wget is missing\n"
msgstr "ca amancat %s"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, fuzzy, c-format
msgid "curl is missing\n"
msgstr "ca amancat %s"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr ""
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr ""
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr ""
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr ""
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr ""
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "ca amancat %s"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr ""
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, fuzzy, c-format
msgid "retrieving %s"
msgstr "srèxinu %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...no agataus: %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "protocollu disconnotu indidau po %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr ""
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "no apu agatau webfetch, cuddus suportaus funt: %s\n"
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "no potzu mainjai su protocollu: %s"
@@ -721,12 +739,12 @@ msgstr "no apu agatau su pakitu %s"
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "agatu is file rpm de su mèdiu \"%s\"..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -734,47 +752,47 @@ msgstr ""
"fata sa transatzioni po aposentai in %s (srèxina=%d, aposenta=%d, ajorrona=%"
"d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "no potzu creai sa transatzioni"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "no potzu strai su rpm de su pakitu delta-rpm %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "no potzu aposentai su pakitu %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "aposentu %s de %s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "...no agataus: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "srèxinu su pakitu %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "srèxinu su pakitu %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "aposentu %s de %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Atra sceda apitzus de su pakitu %s"
@@ -819,90 +837,80 @@ msgstr "Atentu"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Aposentadura faddia"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Aposentadura faddia"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Is pakitus ki sighint tenint firmas malas"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Is pakitus ki sighint tenint firmas malas"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Bolis sighiri a aposentai?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "aposentu %s de %s"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "seu distribuendi %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "aposentu %s de %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "aposentu %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Provu a aposentai sentza de controllai is dependèntzias? (y/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Provu a aposentai de manera finas prus forti (--force)? (y/N) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Fait a aposentai"
#: ../urpm/md5sum.pm:26
-#, fuzzy, c-format
-msgid "examining %s file"
-msgstr "controllu su file MD5SUM"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "atentu: md5sum po %s no disponiditzu in su file MD5SUM"
@@ -976,228 +984,228 @@ msgstr "iat a aposentai su pakitu %s in logu de d'ajorronai"
msgid "medium \"%s\" already exists"
msgstr "su mèdiu \"%s\" esistit jai"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "liju is header de su mèdiu \"%s\""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "burru su mèdiu \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr ""
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "no potzu aberri su database rpm"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "no potzu lompi a su primu mèdiu de aposentadura (no agatu hdlist)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "agatu is file hdlist..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "provu a sçoberai su mèdiu \"%s\" ki no esistit"
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "sçoberu prus mèdius: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "burru su mèdiu \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "torru a assetiai urpmi po is mèdius \"%s\""
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...assètiu faddiu"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "assètiu fatu"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "su mèdiu \"%s\" no d'as sçoberau"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "Controllu su file synthesis [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "barrancu ligendi sa synthesis de su mèdiu \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "scriu sa llist po su mèdiu \"%s\""
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...còpia faddia"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "còpiu su file descriidori de \"%s\"..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...còpia fata"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "còpia de [%s] faddia (est stranu ki unu file aici piticu)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "càrculu su md5sum de sa hdlist (o synthesis) agatada"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "còpia de [%s] faddia (su md5sum no cunsonat)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "controllu su file hdlist [%s]"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "aposentu %s de %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "no apu agatau hdlist po su mèdiu \"%s\""
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "còpiu su file descriidori de \"%s\"..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "nòmini file rpm [%s] no bàlidu"
-#: ../urpm/media.pm:1461
-#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "agatu sa hdlist (o synthesis) de \"%s\"..."
-
-#: ../urpm/media.pm:1478
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "apu agatau una hdlist (o synthesis) analisada ke %s"
+msgid "no metadata found for medium \"%s\""
+msgstr "no apu agatau hdlist po su mèdiu \"%s\""
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "no apu agatau hdlist po su mèdiu \"%s\""
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "agatu sa hdlist (o synthesis) de \"%s\"..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "controllu sa crai pùbriga de \"%s\"..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...apu importau sa crai %s de sa crai pùbriga de \"%s\""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "no potzu importai sa crai pùbriga de \"%s\""
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "no apu agatau hdlist po su mèdiu \"%s\""
+
+#: ../urpm/media.pm:1612
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "apu açuntu su mèdiu %s"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "liju is file rpm de [%s]"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1268,7 +1276,7 @@ msgstr ""
msgid "TB"
msgstr ""
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1637,11 +1645,6 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "impreu unu ambienti indidau in %s\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1657,118 +1660,136 @@ msgstr "apu fraigau sa hdlist synthesis po su mèdiu \"%s\""
msgid "no xml-info available for medium \"%s\""
msgstr "scriu sa llist po su mèdiu \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Nisçunu pakitu nominau %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Is pakitus ki sighint cuntenint %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Pakitu(s) jai aposentau(s)"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Pakitu(s) jai aposentau(s)"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Pakitu(s) jai aposentau(s)"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "ca amancat %s"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "Pakitu(s) jai aposentau(s)"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "ca no est satisfatu %s"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "provu a sçoberai %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "po podi apoderai %s"
#: ../urpm/select.pm:607
+#, fuzzy, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Is pakitus ki sighint bolint srexinaus po ndi podi ajorronai atrus:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Is pakitus ki sighint bolint srexinaus po ndi podi ajorronai atrus:\n"
+"%s"
+
+#: ../urpm/select.pm:635
#, c-format
msgid "in order to install %s"
msgstr "po podi aposentai %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "ca gherrat cun %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Firma (%s) no bàlida"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Crai ID (%s) no bàlida"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Amancat sa firma (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "No fait a creai su file de assètiu [%s]"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "Còpia faddia"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "Còpia faddia"
@@ -1811,7 +1832,7 @@ msgstr " --test - aberiga ki fait a srexinai in manera lìmpia.\n"
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - urpmi distribuiu intr''e màkinas diferentis.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr ""
@@ -1841,7 +1862,7 @@ msgstr ""
" --use-distrib - assètia urpmi a sa bolada de una mata de ditribuidura,\n"
" utilosu po (dis)aposentai a chroot cun scera --root.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - po ndi sciri de prus.\n"
@@ -1910,7 +1931,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "srèxinu su pakitu %s"
msgstr[1] "srèxinu su pakitu %s"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (y/N) "
@@ -2167,17 +2188,22 @@ msgstr " --url - amosta su tag url: url.\n"
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - amosta su tag description: descriidura.\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - amosta tag conflicts: totu su ki nci gherrat.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - pakitus de ndi sartai s'aposentadura\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, fuzzy, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --skip - pakitus de ndi sartai s'aposentadura\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2186,72 +2212,72 @@ msgstr ""
" --more-choices - candu agatas prus pakitus, proponi prus sçoberus\n"
" de su predefiniu.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - no boghist is rpm de sa cache.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
" --strict-arch - ajorrona feti is pakitus cun sa pròpiu arkidetura.\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - sçobera totu su ki cunsonat in arraya de cumandu.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - modalidadi citia.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --verbose - po ndi sciri de prus.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
" is nòminis o is file rpm in arraya de cumandu, dus apu a aposentai.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "Ita fait a fai cun is file rpm binàrius candu impreas --install-src"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2260,17 +2286,12 @@ msgstr ""
"Sa directory [%s] esistit jai, imprea una atra directory po arrelatai fartas "
"o burradda"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "No potzu creai sa directory [%s] po arrelatai is fartas"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2279,36 +2300,36 @@ msgstr ""
"Faddina: %s parit carrigau a ligi-feti.\n"
"Impreu --allow-force po fortzai s'atzioni."
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (de ajorronai)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (de ajorronai)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (de aposentai)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (de aposentai)"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2317,12 +2338,12 @@ msgstr ""
"Po satisfai is dependèntzias, is %d pakitus ki sighint dus apu a srexinai (%"
"d MB)"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Ita sçoberas? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2333,7 +2354,7 @@ msgstr ""
"beçus de cuddus aposentaus:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2344,19 +2365,19 @@ msgstr ""
"beçus de cuddus aposentaus:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Sigu comuncas?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (Y/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2365,7 +2386,7 @@ msgstr ""
"Cancu pakitu bòfiu no fait a d'aposentai:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2374,12 +2395,12 @@ msgstr ""
"Cancu pakitu bòfiu no fait a d'aposentai:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "srexinai su pakitu %s at a arrogai su sistema"
-#: ../urpmi:551
+#: ../urpmi:538
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2390,7 +2411,7 @@ msgstr ""
"bolint srexinaus po ndi podi ajorronai atrus:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2401,30 +2422,12 @@ msgstr ""
"bolint srexinaus po ndi podi ajorronai atrus:\n"
"%s\n"
-#: ../urpmi:560
-#, fuzzy, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Is pakitus ki sighint bolint srexinaus po ndi podi ajorronai atrus:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Is pakitus ki sighint bolint srexinaus po ndi podi ajorronai atrus:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2434,7 +2437,7 @@ msgstr ""
"Depis essi root po aposentai is dependèntzias ki sighint:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
@@ -2445,39 +2448,39 @@ msgstr[1] ""
"Po satisfai is dependèntzias, is %d pakitus ki sighint dus apu a srexinai (%"
"d MB)"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../urpmi:619
+#: ../urpmi:604
#, fuzzy, c-format
msgid "Proceed with the installation of one package?"
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:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Annudda"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Craca Enter candu ses prontu..."
@@ -3225,6 +3228,14 @@ msgstr ""
msgid "No changelog found\n"
msgstr "No apu agatau s'arrelata de is mudas\n"
+#, fuzzy
+#~ msgid "examining %s file"
+#~ msgstr "controllu su file MD5SUM"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "apu agatau una hdlist (o synthesis) analisada ke %s"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - crea unu mèdiu de ajorronamentu.\n"
diff --git a/po/sk.po b/po/sk.po
index 98edd73d..c705b99e 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+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"
@@ -27,7 +27,7 @@ msgstr "Inštalácia RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -93,7 +93,7 @@ msgstr "_Inštalácia"
msgid "_Save"
msgstr "_Uložiť"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Zrušiť"
@@ -125,9 +125,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - zobraziť túto pomoc.\n"
@@ -163,19 +162,19 @@ msgstr ""
"rpm\n"
" zakáže overovanie, štandardne sa podpis overuje).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - použiť len zadané zdroje; viaceré je možné oddeliť "
"čiarkou.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - pre nájdenie balíka hľadať aj v poskytovaných.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - pre nájdenie balíka nehľadať v poskytovaných.\n"
@@ -216,7 +215,22 @@ msgstr "Čakajte prosím..."
msgid "Must be root"
msgstr "Sú vyžadované právomoci root-a"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "distribuovanie %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Inštalácia balíkov..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Inštalácia balíkov..."
+
+#: ../gurpmi2:111
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -232,37 +246,37 @@ msgstr ""
msgid "Warning"
msgstr "Varovanie"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (na aktualizáciu)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (na inštaláciu)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Výber balíka"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Jeden z nasledujúcich balíkov je potrebný:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Zrušiť"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -273,7 +287,7 @@ msgstr ""
"%s\n"
"Pokračovať?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
@@ -281,7 +295,7 @@ msgstr ""
"Kvôli zachovaniu závislostí, by mali byť nainštalované nasledujúce balíky (%"
"d MB)"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -289,7 +303,7 @@ msgstr ""
"Kvôli zachovaniu závislostí, by mali byť nainštalované nasledujúce balíky (%"
"d MB)"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
@@ -297,42 +311,37 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Inštalácia balíkov..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "nie je možné získať zdrojové balíky, prerušenie"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Príprava..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Inštalácia balíka `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Prosím vložte médium \"%s\" do zariadenia [%s]"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Získavanie balíka `%s'..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Hotovo"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -343,28 +352,28 @@ msgstr ""
"%s\n"
"Možno budete chcieť aktualizovať Vašu urpmi databázu"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Inštalácia zlyhala"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Všetko je už nainštalované"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Inštalácia ukončená"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "odstraňovanie %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "znovuspustenie urpmi"
@@ -404,7 +413,7 @@ msgstr " implicitná je %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -g - zobraziť skupiny aj s menami.\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Inštalovať balíky má dovolené len superužívateľ"
@@ -414,134 +423,143 @@ msgstr "Inštalovať balíky má dovolené len superužívateľ"
msgid "Running urpmi in restricted mode..."
msgstr "Beh urpmi v reštriktívnom režime..."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "Nemôžem vytvoriť adresár [%s] pre ohlásenie chyby"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "Získavanie balíka `%s'..."
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "použitie špecifického prostredia na %s\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "nemôžem otvoriť rpmdb"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nesprávne meno rpm súboru [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "sťahovanie rpm súboru [%s] ..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...získavanie ukončené"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...získavanie zlyhalo: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "nie je možné pristúpiť k rpm súboru [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "nie je možné správne prečítať \"%s\" v súbore [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "nie je možné zaregistrovať rpm súbor"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "chyba pri registrácii lokálnych balíkov"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
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:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "nesprávna deklarácia proxy v príkazovom riadku\n"
-#: ../urpm/args.pm:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Chýbajúci podpis (%s)"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Kopírovanie zlyhalo"
@@ -588,123 +606,123 @@ msgstr ""
msgid "unable to write config file [%s]"
msgstr "nie je možné zapísať konfiguračný súbor [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr ""
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Zadajte vaše autorizačné údaje pre prístup k proxy\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Používateľské meno:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Heslo:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr ""
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr ""
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, fuzzy, c-format
msgid "copy failed"
msgstr "Kopírovanie zlyhalo"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, fuzzy, c-format
msgid "wget is missing\n"
msgstr "kvôli chýbajucemu %s"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, fuzzy, c-format
msgid "curl is missing\n"
msgstr "kvôli chýbajucemu %s"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr ""
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr ""
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr ""
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr ""
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr ""
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "kvôli chýbajucemu %s"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr ""
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, fuzzy, c-format
msgid "retrieving %s"
msgstr "odstraňovanie %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...získavanie zlyhalo: %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "neznámy protokol definovaný pre %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr ""
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, 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:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "neznámy protokol: %s"
@@ -724,12 +742,12 @@ msgstr "balík %s nebol nájdený."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "sťahovanie rpm súborov zo zdroja \"%s\"..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -737,47 +755,47 @@ msgstr ""
"vytvorenie transakcie pre inštaláciu %s (odstrániť=%d, inštalovať=%d, "
"aktualizácia=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "nie je možné vytvoriť transakciu"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "nie je možné rozbaliť rpm z balíka delta-rpm %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "nie je možné nainštalovať balík %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "inštalácia %s z %s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "...získavanie zlyhalo: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "odstraňovanie balíka %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "odstraňovanie balíka %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "inštalácia %s z %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Viac informácií o balíku %s"
@@ -822,90 +840,80 @@ msgstr "Varovanie"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Inštalácia zlyhala"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Inštalácia zlyhala"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Nasledujúce balíky obsahujú zle signatúry"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Nasledujúce balíky obsahujú zle signatúry"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Chcete pokračovať v inštalácii ?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "inštalácia %s z %s"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "distribuovanie %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "inštalácia %s z %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "inštalácia %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Skúsiť inštaláciu bez kontroly závislostí? (á/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Skúsiť \"tvrdšiu\" inštaláciu (--force)? (á/N) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Inštalácia je možná"
#: ../urpm/md5sum.pm:26
-#, fuzzy, c-format
-msgid "examining %s file"
-msgstr "overovanie MD5SUM súboru"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "varovanie: md5sum pre %s nie je prítomný v súbore MD5SUM"
@@ -982,230 +990,230 @@ msgstr "mala by byť vykonaná inštalácia namiesto aktualizácie balíka %s"
msgid "medium \"%s\" already exists"
msgstr "zdroj \"%s\" už existuje"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "načitávanie hlavičiek pre zdroj \"%s\""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "odstránenie zdroja \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr ""
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "nemôžem otvoriť rpmdb"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"nie je možné pristúpiť k prvému inštalačnému zdroju (nebol nájdený súbor "
"hdlists)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "získavanie hdlists súboru..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "pokus o výber neexistujúceho zdroja \"%s\""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "výber viacerých zdrojov: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "odstránenie zdroja \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "rekonfigurovanie urpmi pre zdroj \"%s\""
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...rekonfigurovanie zlyhalo"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "rekonfigoranie hotové"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "zdroj \"%s\" nebol zvolený"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "preverovanie synthesis súboru [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problém s čítaním synthesis súboru pre zdroj \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "zápis súboru so zoznamom pre zdroj \"%s\""
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...kopírovanie zlyhalo"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopírovanie súboru popisov pre \"%s\"..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...kopírovanie ukončené"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopírovanie [%s] zlyhalo (súbor je podozrivo malý)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "výpočet md5sum zo získaných súborov hdlist (alebo synthesis)"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "kopírovanie [%s] zlyhalo zlyhalo (nesprávny md5sum)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "preverovanie hdlist súboru [%s]"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "inštalácia %s z %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "nebol nájdený hdlist súbor pre zdroj \"%s\""
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "kopírovanie súboru popisov pre \"%s\"..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "nesprávne meno rpm súboru [%s]"
-#: ../urpm/media.pm:1461
-#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "získavanie zdrojového hdlist (alebo synthesis) pre \"%s\"..."
-
-#: ../urpm/media.pm:1478
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "nájdený overený hdlist (alebo synthesis) ako %s"
+msgid "no metadata found for medium \"%s\""
+msgstr "nebol nájdený hdlist súbor pre zdroj \"%s\""
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "nebol nájdený hdlist súbor pre zdroj \"%s\""
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "získavanie zdrojového hdlist (alebo synthesis) pre \"%s\"..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "prehliada sa súbor s verejnými kľúčmi \"%s\"..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...importuje sa kľúč %s zo súboru s verejnými kľúčmi \"%s\""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "nie je možné naimportovať súbor s verejnými kľúčmi \"%s\""
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "nebol nájdený hdlist súbor pre zdroj \"%s\""
+
+#: ../urpm/media.pm:1612
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "pridaný zdroj %s"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "čítanie rpm súborov z [%s]"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1276,7 +1284,7 @@ msgstr ""
msgid "TB"
msgstr ""
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1641,11 +1649,6 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "použitie špecifického prostredia na %s\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1661,118 +1664,136 @@ msgstr "vytváranie hdlist synthesis súboru pre zdroj \"%s\""
msgid "no xml-info available for medium \"%s\""
msgstr "zápis súboru so zoznamom pre zdroj \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Žiaden balík s menom %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Nasledujúce balíky obsahujú %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Všetko je už nainštalované"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Všetko je už nainštalované"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Všetko je už nainštalované"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "kvôli chýbajucemu %s"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "Všetko je už nainštalované"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "kvôli neuspokojenému %s"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "pokus o povýšenie %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "pre zachovanie poradia %s"
#: ../urpm/select.pm:607
+#, fuzzy, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Nasledovné balíky by mali byť odstránené aby bolo možné aktualizovať iné:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Nasledovné balíky by mali byť odstránené aby bolo možné aktualizovať iné:\n"
+"%s"
+
+#: ../urpm/select.pm:635
#, c-format
msgid "in order to install %s"
msgstr "pre inštaláciu balíka %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "kvôli konfliktom s %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Chybný podpis (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Chybný kľúč (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Chýbajúci podpis (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "nie je možné zapísať konfiguračný súbor [%s]"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "Kopírovanie zlyhalo"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "Kopírovanie zlyhalo"
@@ -1815,7 +1836,7 @@ msgstr ""
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - distribuované urpmi na rôzne stroje.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - zobraziť značku autor balíka: packager.\n"
@@ -1846,7 +1867,7 @@ msgstr ""
"vhodné\n"
" pri inštalácii v chroot prostredí s prepínačom --root.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - zobraziť podrobnosti.\n"
@@ -1917,7 +1938,7 @@ msgstr[0] "odstraňovanie balíka %s"
msgstr[1] "odstraňovanie balíka %s"
msgstr[2] "odstraňovanie balíka %s"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (á/N) "
@@ -2182,17 +2203,22 @@ msgstr " --url - zobraziť značku url: url.\n"
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - zobraziť značku popis: description.\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - zobraziť značku konflikty: conflicts.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - balíky ktorých inštalácia nebude vykonaná\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, fuzzy, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --skip - balíky ktorých inštalácia nebude vykonaná\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2202,71 +2228,71 @@ msgstr ""
"možností\n"
" namiesto implicitnej.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - nevymazať nepoužité rpm súbory z dočasnej pamäti.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - aktualizovať iba balíky s rovnakou architektúrou.\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - vybrať všetky zhody na príkazovom riadku.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - zobrazovať minimum informácií.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --verbose - zobraziť podrobnosti.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
" mená alebo rpm súbory uvedené na príkazovom riadku budú nainštalované.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "Čo môže byť vykonané s binárnymi rpm súbormy pri použití --install-src"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2275,17 +2301,12 @@ msgstr ""
"Adresár [%s] už existuje, použite prosím iný adresár pre hlásenie o chybe, "
"alebo ho vymažte"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Nemôžem vytvoriť adresár [%s] pre ohlásenie chyby"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2294,36 +2315,36 @@ msgstr ""
"Chyba: %s sa zdá byť pripojený iba pre čítanie.\n"
"Použite --allow-force pre vnútenie tejto operácie."
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (na aktualizáciu)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (na aktualizáciu)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (na inštaláciu)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (na inštaláciu)"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2331,12 +2352,12 @@ msgid ""
msgstr ""
"Z dôvodu zachovania závislostí, balíky %d by mali byť odinštalované (%d MB)"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Váš výber? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2348,7 +2369,7 @@ msgstr ""
"ktoré sú staršie ako tie ktoré sú nainštalované:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2360,19 +2381,19 @@ msgstr ""
"ktoré sú staršie ako tie ktoré sú nainštalované:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Pokračovať?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (Á/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2381,7 +2402,7 @@ msgstr ""
"Niektoré požadované balíky nie je možné nainštalovať:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2390,12 +2411,12 @@ msgstr ""
"Niektoré požadované balíky nie je možné nainštalovať:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "odstránenie balíka %s zrejme poškodí váš systém"
-#: ../urpmi:551
+#: ../urpmi:538
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2406,7 +2427,7 @@ msgstr ""
"odstránené aby mohli byť iné aktualizované:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2417,30 +2438,12 @@ msgstr ""
"odstránené aby mohli byť iné aktualizované:\n"
"%s\n"
-#: ../urpmi:560
-#, fuzzy, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Nasledovné balíky by mali byť odstránené aby bolo možné aktualizovať iné:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Nasledovné balíky by mali byť odstránené aby bolo možné aktualizovať iné:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2450,7 +2453,7 @@ msgstr ""
"Musíte byť root ak chcete nainštalovať tieto aktualizácie:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
@@ -2461,27 +2464,27 @@ msgstr[1] ""
msgstr[2] ""
"Z dôvodu zachovania závislostí, balíky %d by mali byť odinštalované (%d MB)"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2489,12 +2492,12 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Zrušiť"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Stlačte Enter ak je možné pokračovať..."
@@ -3239,6 +3242,14 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Nebol nájdený zoznam zmien\n"
+#, fuzzy
+#~ msgid "examining %s file"
+#~ msgstr "overovanie MD5SUM súboru"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "nájdený overený hdlist (alebo synthesis) ako %s"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - vytvoriť aktualizačný zdroj.\n"
diff --git a/po/sl.po b/po/sl.po
index a8e1b528..7f37426e 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2008-09-22 16:13+0200\n"
"Last-Translator: Jure Repinc <jlp@holodeck1.com>\n"
"Language-Team: Slovenian <lugos-slo@lugos.si>\n"
@@ -25,8 +25,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Lokalize 0.3\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 "
-": 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
+"n%100==4 ? 2 : 3);\n"
#: ../gurpmi:31 ../gurpmi2:74
#, c-format
@@ -38,7 +38,7 @@ msgstr "Namestitev RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Napaka: ni bilo mogoče najti datoteke %s, prekinitev"
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "V _redu"
@@ -104,7 +104,7 @@ msgstr "_Namesti"
msgid "_Save"
msgstr "_Shrani"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Prekliči"
@@ -136,9 +136,8 @@ msgstr ""
msgid "Options:"
msgstr "Možnosti:"
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - prikaži to sporočilo s pomočjo.\n"
@@ -154,13 +153,16 @@ msgstr ""
#: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
msgstr " --auto-select - samodejna izbira paketov za nadgraditev sistema.\n"
#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - prisili v dejanje celo, če nekateri paketi ne obstajajo.\n"
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - prisili v dejanje celo, če nekateri paketi ne obstajajo.\n"
#: ../gurpmi.pm:50 ../urpmi:133
#, c-format
@@ -171,17 +173,17 @@ msgstr ""
" --verify-rpm - preveri podpis paketa rpm pred namestitvijo\n"
" (--no-verify-rpm to onemogoči, privzeto je omogočeno).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - uporabi samo podane vire, ločene z vejico.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - dovoli iskanje v polju provides za najdbo paketa.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - ne išči v polju provides da za najdbo paketa.\n"
@@ -189,19 +191,23 @@ msgstr " -P - ne išči v polju provides da za najdbo paketa.\n"
#: ../gurpmi.pm:55 ../urpmi:110 ../urpmq:69
#, c-format
msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - uporabi drug korenski imenik za namestitev paketov rpm.\n"
+msgstr ""
+" --root - uporabi drug korenski imenik za namestitev paketov rpm.\n"
#: ../gurpmi.pm:56 ../urpmi:135
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
-msgstr " --test - samo preveri, če je namestitev lahko pravilno izvedena.\n"
+msgstr ""
+" --test - samo preveri, če je namestitev lahko pravilno izvedena.\n"
#: ../gurpmi.pm:57 ../urpmi:76
#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
-msgstr " --searchmedia - uporabi samo podane vire za iskanje zahtevanih paketov.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - uporabi samo podane vire za iskanje zahtevanih paketov.\n"
#: ../gurpmi.pm:100
#, c-format
@@ -218,7 +224,22 @@ msgstr "Prosim počakajte ..."
msgid "Must be root"
msgstr "Morate biti uporabnik root"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "porazdeljevanje %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Namestitev paketov ..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Namestitev paketov ..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -234,37 +255,37 @@ msgstr ""
msgid "Warning"
msgstr "Opozorilo"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "V redu"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (za nadgradnjo)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (za namestitev)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Izbira paketov"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Potreben je eden od sledečih paketov:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Prekini"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -275,17 +296,19 @@ msgstr ""
"%s\n"
"Naj se namestitev vseeno nadaljuje?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, 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 "Za zadovoljitev odvisnosti bo nameščen naslednji paket:"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Za zadovoljitev odvisnosti bodo nameščeni naslednji paketi:"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
@@ -294,42 +317,37 @@ msgstr[1] "(%d paketa, %d MiB)"
msgstr[2] "(%d paketi, %d MiB)"
msgstr[3] "(%d paketov, %d MiB)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Namestitev paketov ..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "ni mogoče dobiti paketov z izvorno kodo, predčasna prekinitev"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Priprava ..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Nameščanje paketa `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Prosim vstavite nosilec imenovan »%s«"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Pobiranje paketa `%s'..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Končano"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -340,28 +358,28 @@ msgstr ""
"%s\n"
"Mogoče bi morali obnoviti podatkovno bazo urpmi"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "Namestitev ni uspela:"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Paketi so že nameščeni"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Namestitev je končana"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "odstranjevanje %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "ponovno zaganjanje urpmi"
@@ -401,7 +419,7 @@ msgstr " privzeto je %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - izpiši polno ime rpm-ja (NVRA)\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Samo uporabniku root je dovoljeno nameščati pakete"
@@ -411,130 +429,144 @@ msgstr "Samo uporabniku root je dovoljeno nameščati pakete"
msgid "Running urpmi in restricted mode..."
msgstr "Poganjanje urpmi v omejenem načinu ..."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, c-format
msgid "fail to create directory %s"
msgstr "Ustvarjanje mape %s je spodletelo"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr "Neveljaven lastnik mape %s"
-#: ../urpm.pm:124, c-format
+#: ../urpm.pm:125
+#, c-format
msgid "Can not download packages into %s"
msgstr "V imenik %s ni mogoče prenašati paketov"
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr "Mapa %s ne obstaja"
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "uporabljam specifično okolje pri %s\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "ni mogoče odpreti rpmdb"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "napačno ime datoteke rpm [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "pridobivanje datoteke rpm [%s] ..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...pridobivanje je končano"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...pridobivanje je spodletelo: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "ni mogoče dostopati do datoteke rpm [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "ni mogoče razčleniti %s [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "ni mogoče registrirati datoteke rpm"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Zgradba paketa ni združljiva z rpm [%s]"
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "napaka pri registraciji krajevnih paketov"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Ta postopek ni dovoljen v omejenem načinu"
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "napačna deklaracija posrednika v ukazni vrstici\n"
-#: ../urpm/args.pm:298
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: ni mogoče brati datoteke rpm \"%s\"\n"
-#: ../urpm/args.pm:375, c-format
+#: ../urpm/args.pm:383
+#, c-format
msgid "unexpected expression %s"
msgstr "nepričakovan izraz %s"
-#: ../urpm/args.pm:376, c-format
+#: ../urpm/args.pm:384
+#, c-format
msgid "missing expression before %s"
msgstr "manjkajoč izraz pred %s"
-#: ../urpm/args.pm:382
+#: ../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:386, c-format
+#: ../urpm/args.pm:394
+#, c-format
msgid "no expression to close"
msgstr "ni izraza za zaprtje"
-#: ../urpm/args.pm:395
+#: ../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. Uporabiti bi morali »--literal«"
+msgstr ""
+"Privzeto urpmf pričakuje regularni izraz. Uporabiti bi morali »--literal«"
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "mapa za chroot ne obstaja"
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr "Ni moč uporabiti %s brez %s"
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr "Ni moč uporabiti %s z %s"
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr "Prveč argumentov\n"
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Kopiranje je spodletelo"
@@ -583,122 +615,122 @@ msgstr "vir »%s« je naveden dvakrat, prekinjam"
msgid "unable to write config file [%s]"
msgstr "ni mogoče napisati nastavitvene datoteke [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "%s ni na voljo, vrnitev na %s"
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr "ni moč prebrati nastavitev posrednika (ni dovolj pravic za branje %s)"
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Prosim vnesite podatke za dostop do posrednika (proxyja)\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Ime uporabnika:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Geslo:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr "neznan program za prenos »%s«!\n"
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr "%s je spodletelo: izhod s signalom %d"
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr "%s je spodletelo: izhod z %d"
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, c-format
msgid "copy failed"
msgstr "kopiranje je spodletelo"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, c-format
msgid "wget is missing\n"
msgstr "manjka wget\n"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, c-format
msgid "curl is missing\n"
msgstr "manjka curl\n"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr "curl je spodletelo: prenos preklican\n"
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr "manjka rsync\n"
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr "manjka ssh\n"
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr "manjka prozilla\n"
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr "ni bilo moč zagnati prozilla\n"
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, c-format
msgid "aria2 is missing\n"
msgstr "manjka aria2\n"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr " %s%% od %s preneseno, do konca = %s, hitrost = %s"
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr " %s%% preneseno, hitrost = %s"
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, c-format
msgid "retrieving %s"
msgstr "prenašanje %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, c-format
msgid "retrieved %s"
msgstr "prenesen %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "za %s je določen neznan protokol "
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "%s ni na voljo, vrnitev na %s"
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "ni programa za spletno pridobivanje, podprti so: %s\n"
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "ni mogoče obravnavati protokola: %s"
@@ -718,59 +750,60 @@ msgstr "paketa %s ni mogoče najti."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "pridobivanje datotek rpm iz vira \"%s\" ..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr "[ponovna gradnja paketa]"
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
"določeno je bilo opravilo za nameščanje na %s (odstrani=%d, namesti=%d, "
"nadgradi=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "opravila ni mogoče izvesti"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "ni mogoče izvleči paketa rpm iz paketa delta-rpm %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "ni mogoče namestiti paketa %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "odstranjevanje slabega rpm-ja (%s) iz %s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, c-format
msgid "removing %s failed: %s"
msgstr "odstranjevanje %s je spodletelo: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, c-format
msgid "Removing package %s"
msgstr "Odstranjevanje paketa %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "odstranjevanje paketa %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "odstranjevanje nameščenega rpm (%s) iz %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Več podatkov o paketu %s"
@@ -815,18 +848,18 @@ msgstr "prekinjam"
msgid "%s database is locked (another program is already using it)"
msgstr "Podatkovna zbirka %s je zaklenjena (uporablja jo že nek drug program)"
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Namestitev ni uspela"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr "Ali želite vseeno nadaljevati? (d/N)"
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -835,73 +868,63 @@ msgstr ""
"Namestitev ni uspela, slabi rpm-ji:\n"
"%s"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, c-format
msgid "The following package has bad signature"
msgstr "Sledeči paket ima slab podpis"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Sledeči paketi imajo slabe podpise"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Ali želite nadaljevati namestitev?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, c-format
msgid "removing installed rpms (%s)"
msgstr "odstranjevanje nameščenih rpm-jev (%s)"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "porazdeljevanje %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "nameščanje %s iz %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "nameščanje %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Poskusi z namestitvijo brez preverjanj odvisnosti? (d/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Poskusi s prisilno namestitvijo(--force)? (d/N) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr "Paketi so posodobljeni"
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Namestitev je mogoča"
#: ../urpm/md5sum.pm:26
#, c-format
-msgid "examining %s file"
-msgstr "preučevanje datoteke %s"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr "neveljavna datoteka MD5SUM"
-
-#: ../urpm/md5sum.pm:28
-#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "opozorilo: vsote MD5 za %s ni v datoteki MD5SUM"
@@ -913,7 +936,8 @@ msgstr "navidezni vir \"%s\" mora imeti jasen url, vir je bil zato prezrt"
#: ../urpm/media.pm:206
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "ni mogoče dostopati do seznama datotek od \"%s\", vir je bil zato prezrt"
+msgstr ""
+"ni mogoče dostopati do seznama datotek od \"%s\", vir je bil zato prezrt"
#: ../urpm/media.pm:213
#, c-format
@@ -976,227 +1000,229 @@ msgstr "bi namestilo namesto nadgradilo paket %s"
msgid "medium \"%s\" already exists"
msgstr "vir \"%s\" že obstaja"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr "(privzeto se spregleda)"
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "dodajanje vira »%s« pred oddaljen vir »%s«"
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, c-format
msgid "adding medium \"%s\""
msgstr "dodajanje vira »%s«"
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr "Mapa %s ne obstaja"
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "izgleda, da ta lokacija ne vsebuje nobene distribucije"
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, c-format
msgid "unable to parse media.cfg"
msgstr "ni mogoče razčleniti media.cfg"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
-msgstr "ni moč dostopati do vira distribucije (ni moč najti datoteke media.cfg)"
+msgstr ""
+"ni moč dostopati do vira distribucije (ni moč najti datoteke media.cfg)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr "spuščam nezdružljivi vir »%s« (za %s)"
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, c-format
msgid "retrieving media.cfg file..."
msgstr "pridobivanje datoteke cfg za vir"
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "poskušanje izbire neobstoječega vira \"%s\""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "izbiranje več virov: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "odstranjevanje vira \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "ponovno nastavljanje urpmi za vir \"%s\""
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...ponovno nastavljanje je spodletelo"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "ponovno nastavljanje je končano"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Napaka pri ustvarjanju imenske datoteke: odvisnosti %d ni moč najti"
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "vir »%s« je posodobljen"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "preverjanje synthesis datoteke [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "težava pri branju synthesis datoteke vira \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "kopiranje [%s] za vir »%s« ..."
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...kopiranje je spodletelo"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopiranje datoteke z opisi \"%s\"..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...kopiranje končano"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopiranje [%s] je spodletelo (datoteka je sumljivo majhna)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "računanje md5sum izvorne datoteke synthesis"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "pridobivanje [%s] je spodletelo (md5sum se ne ujema)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, c-format
msgid "genhdlist2 failed on %s"
msgstr "genhdlist2 na [%s] je spodletel"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, c-format
msgid "comparing %s and %s"
msgstr "primerjanje %s in %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "neveljavna datoteka hdlist %s za vir »%s«"
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "kopiranje datoteke MD5SUM od »%s« ..."
-#: ../urpm/media.pm:1430, c-format
+#: ../urpm/media.pm:1440
+#, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "neveljavna datoteka MD5SUM (prenešena z %s)"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
+#, fuzzy, c-format
+msgid "no metadata found for medium \"%s\""
+msgstr "ni bilo mogoče najti datoteke synthesis za vir »%s«"
+
+#: ../urpm/media.pm:1475
#, c-format
msgid "retrieving source synthesis of \"%s\"..."
msgstr "pridobivanje izvorne datoteke synthesis od »%s« ..."
-#: ../urpm/media.pm:1478
-#, c-format
-msgid "found probed synthesis as %s"
-msgstr "datoteka synthesis je bila najdena kot %s"
-
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
-#, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "ni bilo mogoče najti datoteke synthesis za vir »%s«"
-
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "preverjanje datoteke z javnimi ključi od \"%s\" ..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...uvožen je ključ %s iz datoteke javnih ključev od \"%s\""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "ni mogoče uvoziti javnega ključa od \"%s\""
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "ni bilo mogoče najti datoteke synthesis za vir »%s«"
+
+#: ../urpm/media.pm:1612
#, c-format
msgid "updated medium \"%s\""
msgstr "vir »%s« posodobljen"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr "pridobivanje [%s] je spodletelo"
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr "ponovno poskušanje z zrcalnim strežnikom %s"
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr "Ni bilo moč najti zrcalnega strežnika s seznama %s"
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr "najdena geolokacija %s %.2f %.2f iz časovnega pasu %s"
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, c-format
msgid "getting mirror list from %s"
msgstr "pridobivanje seznama zrcalnih strežnikov od %s"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1267,7 +1293,7 @@ msgstr "GiB"
msgid "TB"
msgstr "TiB"
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1275,10 +1301,14 @@ msgid ""
msgid_plural ""
"The following packages are now orphans, use \"urpme --auto-orphans\" to "
"remove them."
-msgstr[0] "Ta paket je osirotel, uporabite »urpme --auto-orphans« da ga odstranite."
-msgstr[1] "Ta paketa sta osirotela, uprabite »urpme --auto-orphans« da ju odstranite."
-msgstr[2] "Ti paketi so osiroteli, uporabite »urpme --auto-orphans« da jih odstranite."
-msgstr[3] "Ti paketi so osiroteli, uporabite »urpme --auto-orphans« da jih odstranite."
+msgstr[0] ""
+"Ta paket je osirotel, uporabite »urpme --auto-orphans« da ga odstranite."
+msgstr[1] ""
+"Ta paketa sta osirotela, uprabite »urpme --auto-orphans« da ju odstranite."
+msgstr[2] ""
+"Ti paketi so osiroteli, uporabite »urpme --auto-orphans« da jih odstranite."
+msgstr[3] ""
+"Ti paketi so osiroteli, uporabite »urpme --auto-orphans« da jih odstranite."
#: ../urpm/parallel.pm:14
#, c-format
@@ -1306,7 +1336,8 @@ msgstr "ni mogoče uporabiti vzporedne izbire \"%s\""
msgid "on node %s"
msgstr "na vozlišču %s"
-#: ../urpm/parallel.pm:293, c-format
+#: ../urpm/parallel.pm:293
+#, c-format
msgid "Installation failed on node %s"
msgstr "Na vozlišču %s namestitev ni bila uspešna"
@@ -1336,7 +1367,8 @@ msgid ""
"%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
"code: %d)"
msgstr ""
-"%s je spodletel pri gostitelju %s (mogoče nima prave različice urpmi?) (izhodna koda: %d)"
+"%s je spodletel pri gostitelju %s (mogoče nima prave različice urpmi?) "
+"(izhodna koda: %d)"
#: ../urpm/removable.pm:32
#, c-format
@@ -1378,7 +1410,8 @@ msgstr " --version - prikaži različico urpmf.\n"
#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
-msgstr " --env - uporabi specifično okolje (ponavadi poročilo o napaki).\n"
+msgstr ""
+" --env - uporabi specifično okolje (ponavadi poročilo o napaki).\n"
#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
#, c-format
@@ -1387,8 +1420,10 @@ msgstr " --excludemedia - ne uporabi podanih virov, ločenih z vejico.\n"
#: ../urpm/search.pm:39 ../urpmf:39
#, c-format
-msgid " --literal, -l - don't match patterns, use argument as a literal string.\n"
-msgstr " --literal, -l - vzemi argument kot dobeseden niz, ne regularni izraz.\n"
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+" --literal, -l - vzemi argument kot dobeseden niz, ne regularni izraz.\n"
#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
@@ -1401,7 +1436,8 @@ msgstr ""
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../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 - vire razvrsti glede na podnize, ločene z vejico.\n"
#: ../urpm/search.pm:43 ../urpmf:43
@@ -1432,12 +1468,14 @@ msgstr " --verbose - zgovorni način.\n"
#: ../urpm/search.pm:48 ../urpmf:48
#, c-format
msgid " -i - ignore case distinctions in patterns.\n"
-msgstr " -i - ignoriraj razlike malih/velikih črk v vsakem vzorcu.\n"
+msgstr ""
+" -i - ignoriraj razlike malih/velikih črk v vsakem vzorcu.\n"
#: ../urpm/search.pm:49 ../urpmf:49
#, c-format
msgid " -I - honor case distinctions in patterns (default).\n"
-msgstr " -i - upoštevaj razlike malih/velikih črk v vsakem vzorcu.\n"
+msgstr ""
+" -i - upoštevaj razlike malih/velikih črk v vsakem vzorcu.\n"
#: ../urpm/search.pm:50 ../urpmf:50
#, c-format
@@ -1452,7 +1490,8 @@ msgstr "Regularni izrazi:\n"
#: ../urpm/search.pm:52 ../urpmf:52
#, c-format
msgid " text - any text is parsed as a regexp, unless -l is used.\n"
-msgstr " besedilo - brez -l se vsako besedilo razčleni kot regularni izraz.\n"
+msgstr ""
+" besedilo - brez -l se vsako besedilo razčleni kot regularni izraz.\n"
#: ../urpm/search.pm:53 ../urpmf:53
#, c-format
@@ -1620,18 +1659,14 @@ msgstr " -m - vir, kjer je bil paket najden\n"
#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
#, c-format
msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - izpiši različico, izdajo in arhitekturo z vsakim imenom.\n"
+msgstr ""
+" -f - izpiši različico, izdajo in arhitekturo z vsakim imenom.\n"
#: ../urpm/search.pm:197 ../urpmf:198
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Nepravilen format: Uporabite lahko samo eno oznako z več vrednostmi"
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "uporabljam specifično okolje pri %s\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1647,119 +1682,141 @@ msgstr "ni bilo moč najti datoteke synthesis za vir »%s«"
msgid "no xml-info available for medium \"%s\""
msgstr "ni bilo moč najti datoteke xml-info za vir »%s«"
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr "urpmi se je ponovno zagnal in seznam prednostnih paketov se ni spremenil"
+msgstr ""
+"urpmi se je ponovno zagnal in seznam prednostnih paketov se ni spremenil"
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
"urpmi se je ponovno zagnal in seznam prednostnih paketov se je spremenil: %s "
"<-> %s"
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Ni paketa poimenovanega %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Sledeči paketi vsebujejo %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr "Da izberete vse, uporabite »-a«"
-#: ../urpm/select.pm:300, c-format
+#: ../urpm/select.pm:295
+#, c-format
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"
+msgstr ""
+"v zbirki podatkov za urpmi so bili najdeni paketi %s , a ni noben nameščen"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, c-format
msgid "Package %s is already installed"
msgstr "Paket %s je že nameščen"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, c-format
msgid "Packages %s are already installed"
msgstr "Paketi %s so že nameščeni"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "zaradi manjkajočega %s"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, c-format
msgid "due to already installed %s"
msgstr "zaradi že nameščenega %s"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "zaradi nezadovoljstva %s"
# promote vzet kot renice
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "poskus podpiranja %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "za ohranitev %s"
#: ../urpm/select.pm:607
#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Sledeči paket mora biti odstranjen, da bodo drugi lahko nadgrajeni:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Sledeči paketi morajo biti odstranjeni, da bodo drugi lahko nadgrajeni:\n"
+"%s"
+
+#: ../urpm/select.pm:635
+#, c-format
msgid "in order to install %s"
msgstr "za namestitev %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "zaradi konfliktov z/s %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Neveljaven podpis (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Neveljaven ID ključa (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Manjkajoč podpis (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr "sistem"
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr "Priporočamo, da ponovno zaženete %s zaradi %s"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't write file"
msgstr "Ni moč pisati v datoteko"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't open file"
msgstr "Ni moč odpreti datoteke"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, c-format
msgid "Can't move file %s to %s"
msgstr "Ni moč premakniti datoteke %s v %s"
@@ -1801,7 +1858,7 @@ msgstr " --test - preveri, če je možna pravilna odstranitev.\n"
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - porazdeljen urpmi po napravah z vzdevki.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Pred izbrisom ponovno zgradi pakete\n"
@@ -1809,7 +1866,8 @@ msgstr " --repackage - Pred izbrisom ponovno zgradi pakete\n"
#: ../urpme:53
#, c-format
msgid " --root - use another root for rpm removal.\n"
-msgstr " --root - uporabi drug korenski imenik za odstranitev paketov rpm.\n"
+msgstr ""
+" --root - uporabi drug korenski imenik za odstranitev paketov rpm.\n"
#: ../urpme:55 ../urpmi:101
#, c-format
@@ -1833,7 +1891,7 @@ msgstr ""
" za namestitev ali odstranitev chroot z možnostjo --"
"root . \n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - zgovoren način.\n"
@@ -1858,7 +1916,8 @@ msgstr "neznani paketi"
msgid "unknown package"
msgstr "neznan paket"
-#: ../urpme:121, c-format
+#: ../urpme:121
+#, c-format
msgid "Removing the following package will break your system:"
msgid_plural "Removing the following packages will break your system:"
msgstr[0] "Odstranitev tega paketa bo pokvarila vaš sistem:"
@@ -1871,20 +1930,23 @@ msgstr[3] "Odstranitev teh paketov bo pokvarila vaš sistem:"
msgid "Nothing to remove"
msgstr "Ničesar za odstraniti"
-#: ../urpme:143, c-format
+#: ../urpme:143
+#, c-format
msgid "No orphans to remove"
msgstr "Ni osirotelih paketov za odstraniti"
#: ../urpme:149
#, 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] "Za zadovoljitev odvisnosti bo odstranjen sledeči %d paket"
msgstr[1] "Za zadovoljitev odvisnosti bosta odstranjena sledeča %d paketa"
msgstr[2] "Za zadovoljitev odvisnosti bodo odstranjeni sledeči %d paketi"
msgstr[3] "Za zadovoljitev odvisnosti bo odstranjenih sledečih %d paketov"
-#: ../urpme:154, c-format
+#: ../urpme:154
+#, c-format
msgid "(orphan package)"
msgid_plural "(orphan packages)"
msgstr[0] "(osiroteli paket)"
@@ -1901,7 +1963,7 @@ msgstr[1] "Ali odstranim %d paketa?"
msgstr[2] "Ali odstranim %d pakete?"
msgstr[3] "Ali odstranim %d paketov?"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (d/N) "
@@ -1916,11 +1978,13 @@ msgstr "preverjanje možnosti odstranitve %s"
msgid "Removal failed"
msgstr "Odstranjevanje je spodletelo"
-#: ../urpme:183, c-format
+#: ../urpme:183
+#, c-format
msgid "Removal is possible"
msgstr "Odstranitev je mogoča"
-#: ../urpmf:153, c-format
+#: ../urpmf:153
+#, c-format
msgid "unterminated expression (%s)"
msgstr "nezaključen izraz (%s)"
@@ -2018,7 +2082,8 @@ msgstr " --noclean - ne odstrani paketov rpm iz predpomnilika.\n"
#: ../urpmi:102
#, c-format
-msgid " --replacepkgs - force installing packages which are already installed.\n"
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
msgstr " --replacepkgs - vsili namestitev paketov, ki so že nameščeni.\n"
#: ../urpmi:104
@@ -2041,7 +2106,8 @@ msgstr ""
" preverjanja odvisnosti in integritete.\n"
# obsolete? man pravi da ne
-#: ../urpmi:108, c-format
+#: ../urpmi:108
+#, c-format
msgid " --allow-suggests - auto select \"suggested\" packages.\n"
msgstr " --allow-suggests - samodejno izbere »predlagane« pakete.\n"
@@ -2152,24 +2218,30 @@ msgstr " --ignoresize - ne preverjaj količine praznega prostora.\n"
#: ../urpmi:139
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
-msgstr " --ignorearch - dovoli namestitev rpm paketov različnih arhitektur.\n"
+msgstr ""
+" --ignorearch - dovoli namestitev rpm paketov različnih arhitektur.\n"
#: ../urpmi:140
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - ne izvedi paketnih mini-skript.\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - izpiše konflikte.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - paketi, ki naj bodo pri namestitvi preskočeni\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --prefer - paketi, ki so bolj zaželjeni\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2178,42 +2250,42 @@ msgstr ""
" --more-choices - ko je najdenih več paketov, ponudi več izbir\n"
" kot je privzeto.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - ne zakleni podatkovne baze rpm.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - nadgradi samo pakete iste arhitekture.\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - izberi vsa ujemanja v ukazni vrstici.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - tihi način.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --debug - zelo zgovoren način.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " imena ali datoteke rpm podane v ukazni vrstici bodo nameščene.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr "Napaka: ni moč uporabiti --auto-select skupaj s seznamom paketov.\n"
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2222,27 +2294,29 @@ msgstr ""
"Napaka: Da bi ustvarili poročilo o hrošču uporabite običajne argumente "
"ukazne vrstice.\n"
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "Ob uporabi --install-src ne morete nameščati binarnih rpm paketov."
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr "Ni moč namestiti datotek spec"
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr "Uporabljanje privzetega --buildrequires"
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
-msgstr "uporabite --buildrequires ali --install-src, ki privzema --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgstr ""
+"uporabite --buildrequires ali --install-src, ki privzema --buildrequires"
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2251,17 +2325,12 @@ msgstr ""
"Imenik [%s] že obstaja, prosim da uporabite drugega za poročilo o napaki ali "
"pa ga izbrišite"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Ni mogoče ustvariti imenika [%s] za poročilo o napaki"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr "Mapa %s ne obstaja"
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2270,48 +2339,48 @@ msgstr ""
"Napaka: izgleda, da je %s priklopljen v (samo) bralnem načinu.\n"
"Uporabite --allow-force, da prisilite izvedbo operacije."
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr "Posodabljanje vira ....\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (za nadgradnjo)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (za nadgradnjo)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (za namestitev)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (za namestitev)"
-#: ../urpmi:462
+#: ../urpmi:450
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "Za zadovoljitev odvisnosti »%s« je potreben en izmed sledečih paketov:"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Kakšna je vaša izbira? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2322,7 +2391,7 @@ msgstr ""
"odvisni od paketov, ki so starejši od že nameščenih:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2333,7 +2402,7 @@ msgstr ""
"ki so starejši od nameščenih.\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2342,12 +2411,12 @@ msgstr ""
"\n"
"Vseeno nadaljujem z namestitvijo?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (D/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2356,7 +2425,7 @@ msgstr ""
"Zahtevanega paketa ni moč namestiti:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2365,12 +2434,12 @@ msgstr ""
"Nekateri zahtevani paketi ne morejo biti nameščeni:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "odstranitev paketa %s bo zrušilo vaš sistem"
-#: ../urpmi:551
+#: ../urpmi:538
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2381,7 +2450,7 @@ msgstr ""
"sledeče pakete, da bodo drugi lahko nadgrajeni:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2392,30 +2461,12 @@ msgstr ""
"sledeče pakete, da bodo drugi lahko nadgrajeni:\n"
"%s\n"
-#: ../urpmi:560
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Sledeči paket mora biti odstranjen, da bodo drugi lahko nadgrajeni:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Sledeči paketi morajo biti odstranjeni, da bodo drugi lahko nadgrajeni:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(samo test, brisanje se ne bo izvedlo)"
-#: ../urpmi:583
+#: ../urpmi:568
#, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2426,7 +2477,8 @@ msgstr ""
"buildrequires:\n"
"%s\n"
-#: ../urpmi:594, c-format
+#: ../urpmi:579
+#, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "Naslednji osiroteli paket bo odstranjen."
@@ -2434,27 +2486,27 @@ msgstr[1] "Naslednja osirotela paketa bosta odstranjena."
msgstr[2] "Naslednji osiroteli paketi bodo odstranjeni."
msgstr[3] "Naslednji osiroteli paketi bodo odstranjeni."
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(samo test, namestitev se ne bo izvedla)"
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr "Uporabljenega bo %s dodatnega prostora na disku."
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr "Sproščenega bo %s prostora na disku."
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr "Prenesenih bo %s paketov."
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2463,12 +2515,12 @@ msgstr[1] "Nadaljujem z namestitvijo %d paketov?"
msgstr[2] "Nadaljujem z namestitvijo %d paketov?"
msgstr[3] "Nadaljujem z namestitvijo %d paketov?"
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Prekliči"
-#: ../urpmi:648
+#: ../urpmi:633
#, c-format
msgid "Press Enter when mounted..."
msgstr "Pritisnite Enter, ko bo priklopljeno ..."
@@ -2531,7 +2583,8 @@ msgstr " --curl - uporabi curl za pridobivanje datotek.\n"
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --prozilla - uporabi prozilla za pridobivanje datotek.\n"
-#: ../urpmi.addmedia:58 ../urpmi.update:36, c-format
+#: ../urpmi.addmedia:58 ../urpmi.update:36
+#, c-format
msgid " --aria2 - use aria2 to retrieve distant files.\n"
msgstr " --aria2 - uprabi aria2 za pridobivanje oddaljenih datotek.\n"
@@ -2664,7 +2717,8 @@ msgstr "Ni mogoče ustvariti nastavitvene datoteke [%s]"
msgid "no need to give <relative path of synthesis> with --distrib"
msgstr "z --distrib ni potrebno podajati <relativna pot do synthesis>"
-#: ../urpmi.addmedia:144, c-format
+#: ../urpmi.addmedia:144
+#, c-format
msgid ""
"\n"
"Do you want to add media '%s'?"
@@ -2716,13 +2770,15 @@ msgstr " --noclean - ne počisti mape za ponovno izgradnjo paketov.\n"
#: ../urpmi.recover:37
#, c-format
-msgid " --list - list transactions since provided date/duration argument\n"
+msgid ""
+" --list - list transactions since provided date/duration argument\n"
msgstr " --list - prikaži čas in trajanje vseh izvedenih opravil\n"
#: ../urpmi.recover:38
#, c-format
msgid " --list-all - list all transactions in rpmdb (long)\n"
-msgstr " --list-all - prikaži vsa izvedena opravila v rpmdb (dolga oblika)\n"
+msgstr ""
+" --list-all - prikaži vsa izvedena opravila v rpmdb (dolga oblika)\n"
#: ../urpmi.recover:39
#, c-format
@@ -2782,7 +2838,8 @@ msgstr "Napačni argumenti ukazne vrstice[%s]\n"
#: ../urpmi.recover:84
#, c-format
msgid "You can't specify --checkpoint and --rollback at the same time\n"
-msgstr "Ne morete hkrati izbrati --ponovne izgradnje paketov in --obnove sistema\n"
+msgstr ""
+"Ne morete hkrati izbrati --ponovne izgradnje paketov in --obnove sistema\n"
#: ../urpmi.recover:86
#, c-format
@@ -2901,7 +2958,8 @@ msgstr " --no-ignore - ne obnovi, označi vir kot omogočen.\n"
#: ../urpmi.update:49
#, c-format
msgid " --probe-rpms - do not use synthesis, use rpm files directly\n"
-msgstr " --probe-rpms - ne uporabi synthesis, uporabi datoteke rpm neposredno\n"
+msgstr ""
+" --probe-rpms - ne uporabi synthesis, uporabi datoteke rpm neposredno\n"
#: ../urpmi.update:50
#, c-format
@@ -3003,7 +3061,8 @@ msgstr " --list-media - izpiši seznam virov, ki so na voljo.\n"
#: ../urpmq:60
#, c-format
msgid " --list-url - list available media and their url.\n"
-msgstr " --list-url - izpiši seznam virov, ki so na voljo, in njihove url-je.\n"
+msgstr ""
+" --list-url - izpiši seznam virov, ki so na voljo, in njihove url-je.\n"
#: ../urpmq:61
#, c-format
@@ -3015,22 +3074,26 @@ msgstr ""
#: ../urpmq:62
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
-msgstr " --list-aliases - izpiši seznam vzporednih vzdevkov, ki so na voljo.\n"
+msgstr ""
+" --list-aliases - izpiši seznam vzporednih vzdevkov, ki so na voljo.\n"
#: ../urpmq:63
#, 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 - izvrži nastavitve v formatu za urpmi.addmedia.\n"
#: ../urpmq:64
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
-msgstr " --src - naslednji paket je paket z izvorno kodo (isto kot -s).\n"
+msgstr ""
+" --src - naslednji paket je paket z izvorno kodo (isto kot -s).\n"
# kaj? man pravi: Print source URLs (or file names) of all selected packages.
#: ../urpmq:65
#, c-format
-msgid " --sources - give all source packages before downloading (root only).\n"
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
msgstr ""
" --sources - prikaži izvorni url (ali imena datotek) vseh izbranih "
"paketov.\n"
@@ -3062,7 +3125,8 @@ msgid " --conflicts - print conflicts.\n"
msgstr " --conflicts - izpiše konflikte.\n"
# obsolete? man pravi da ne
-#: ../urpmq:83, c-format
+#: ../urpmq:83
+#, c-format
msgid " --obsoletes - print obsoletes.\n"
msgstr " --obsoletes - prikaže seznam zastarelih paketov.\n"
@@ -3077,7 +3141,8 @@ msgid " --requires - print requires.\n"
msgstr " --requires - izpiše zahtevano.\n"
# obsolete? man pravi da ne
-#: ../urpmq:86, c-format
+#: ../urpmq:86
+#, c-format
msgid " --suggests - print suggests.\n"
msgstr " --suggests - prikaže priporočene pakete.\n"
@@ -3104,7 +3169,8 @@ msgstr ""
#: ../urpmq:92
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
-msgstr " --whatrequires - iskanje paketov, katerim je podan paket odvisnost.\n"
+msgstr ""
+" --whatrequires - iskanje paketov, katerim je podan paket odvisnost.\n"
#: ../urpmq:93
#, c-format
@@ -3173,7 +3239,8 @@ msgstr ""
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
-msgstr " -u - odstrani paket, če je že nameščena novejša verzija.\n"
+msgstr ""
+" -u - odstrani paket, če je že nameščena novejša verzija.\n"
#: ../urpmq:107
#, c-format
@@ -3219,14 +3286,16 @@ msgstr "za vir »%s« ni podatkov v obliki XML, samo delni rezultat za pakete %s
#: ../urpmq:408
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
"za vir »%s« ni podatkov v obliki XML, ni moč vrniti nobenega rezultata za "
"paket %s"
#: ../urpmq:409
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
"za vir »%s« ni podatkov v obliki XML, ni moč vrniti nobenega rezultata za "
"pakete %s"
@@ -3236,6 +3305,15 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Dnevnik sprememb ni bil najden\n"
+#~ msgid "examining %s file"
+#~ msgstr "preučevanje datoteke %s"
+
+#~ msgid "invalid MD5SUM file"
+#~ msgstr "neveljavna datoteka MD5SUM"
+
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "datoteka synthesis je bila najdena kot %s"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - ustvari vir za posodabljanje.\n"
@@ -3262,4 +3340,3 @@ msgstr "Dnevnik sprememb ni bil najden\n"
#~ msgid "Checking to remove the following packages"
#~ msgstr "Preverjanje za odstranitev sledečih paketov"
-
diff --git a/po/sq.po b/po/sq.po
index dc742ef5..0f9a6662 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+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"
@@ -26,7 +26,7 @@ msgstr "Instalimi i sistemit"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -76,7 +76,7 @@ msgstr "_Instalo"
msgid "_Save"
msgstr "_Ruaj"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Anulo"
@@ -107,9 +107,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - shtype këtë lajmë ndihmues.\n"
@@ -144,19 +143,19 @@ msgstr ""
" --verify-rpm - verifikoje nënshkrimin e rpm para instalimit\n"
" (--no-verify-rpm dezaktivizoje verifikim e tyre).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - përdori vetëm burimet e dhëna, të ndara me presje.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - lejon hulumtimet në pajisjetë për ta gjetur pakon.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - mos hulumto në këto pajisje për ta gjetur pakon.\n"
@@ -197,7 +196,22 @@ msgstr "Një moment ju lutemi."
msgid "Must be root"
msgstr "Porta e Minit"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "shpërndarje e %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Instalimi i pakos..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Instalimi i pakos..."
+
+#: ../gurpmi2:111
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -212,37 +226,37 @@ msgstr ""
msgid "Warning"
msgstr "Kujdes"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "Azhurno"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, fuzzy, c-format
msgid " (to install)"
msgstr "Fundi i instalimit"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Një nga pakot e radhitura nevojitet:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, fuzzy, c-format
msgid "_Abort"
msgstr "Ndërpreje"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -252,13 +266,13 @@ msgstr ""
"Pakot a radhitura duhet të zhduken që të tjerat të azhurnohen:\n"
"%s"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Për ta plotësuar mvarësin, pakotë me radhë do të zhduken (%d MB)"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -267,49 +281,44 @@ msgstr ""
"instalohen:\n"
"\n"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Instalimi i pakos..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "e pa mundur marrja e burimit të pakos, ndërpritje"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Përgatitje..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Instalimi i pakove `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Ju lutemi futni burimin e emruar \"%s\" në mjetin [%s]"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Shkarkimi i pakos `%s'..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, fuzzy, c-format
msgid "_Done"
msgstr "Përfundoi"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -320,28 +329,28 @@ msgstr ""
"%s\n"
"A dëshironi t'azhurnoni bazën e të dhënave urpmi"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Instalimi dështio"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Gjdo gjë është veçse e instaluar"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Instalimi përfundoi"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "zhdukja e %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr ""
@@ -382,7 +391,7 @@ msgstr ""
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -g - çfaqi grupet njashtu dhe emrat.\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Vetëm administratori i sistemin ka mundësi të instalojë pakot"
@@ -392,134 +401,143 @@ msgstr "Vetëm administratori i sistemin ka mundësi të instalojë pakot"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "I pa mundur krijimi i repertorit [%s] për raport të bug(it)"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "Shkarkimi i pakos `%s'..."
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "përdorim specifik i mjedisit në %s\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "e pa mundur hapja e rpmdb"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "emri i skedares rpm është invalid [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "rikuperimi i skedareve rpm [%s]..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...rikuperim i bërë"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...rikuperimi dështoi: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "e pa mundur hyrja në skedaren rpm [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "analizimi i pa mundur i \"%s\" në skedaren [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "i pa mundur regjistrimi i skedares rpm"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "gabim gjatë regjistrimit të pakove lokale"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, 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:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Mungon nënshkrimi (%s)"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Kopjimi dështoi"
@@ -566,122 +584,122 @@ msgstr ""
msgid "unable to write config file [%s]"
msgstr "i pa mundur shkrimi i skedares konfiguruese [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr ""
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr ""
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Emri i përdoruesit:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Shifra:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr ""
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr ""
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, fuzzy, c-format
msgid "copy failed"
msgstr "Kopjimi dështoi"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, fuzzy, c-format
msgid "wget is missing\n"
msgstr "ka arritur nga mungesa %s"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, fuzzy, c-format
msgid "curl is missing\n"
msgstr "ka arritur nga mungesa %s"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr ""
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr ""
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr ""
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr ""
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr ""
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "ka arritur nga mungesa %s"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr ""
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, fuzzy, c-format
msgid "retrieving %s"
msgstr "zhdukja e %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...rikuperimi dështoi: %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "protokol i pa njoftur për përcaktimit e %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr ""
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr ""
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "i pa mundur përdorimi i protokolit: %s"
@@ -701,12 +719,12 @@ msgstr "pakoja %s nuk është prezente"
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "rikuperimi i skedareve rpm nga burimi\"%s\"..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -714,47 +732,47 @@ msgstr ""
"krijimi i një akcioni transmetues për një instalim në %s (remove=%d, install="
"%d, upgrade=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "i pa mundur krijimi i një akcioni transmetues"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "e pa mundur zhdukja e pakos %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "i pa mundur instalimi i pakos %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "instalimi i %s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "...rikuperimi dështoi: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "zhdukja e pakos %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "zhdukja e pakos %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "instalimi i %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, fuzzy, c-format
msgid "More information on package %s"
msgstr "Më shumë informacione mbi pakon..."
@@ -799,90 +817,80 @@ msgstr "Kujdes"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Instalimi dështio"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Instalimi dështio"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, 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:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Pakot a radhitura kanë nënshkrime të pa pranueshëm"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "A dëshironi të vazhdoni me instalimin e tyre ?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "instalimi i %s"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "shpërndarje e %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "instalimi i %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "instalimi i %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Tento një instalim pa verifikimin e mvarësive? (p/J) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Tento një instalim më të forcuar (--force)? (p/J) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Instalimi është i mundur"
#: ../urpm/md5sum.pm:26
-#, fuzzy, c-format
-msgid "examining %s file"
-msgstr "kontrollim i skedares MD5SUM"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr ""
@@ -957,230 +965,230 @@ msgstr "dëshiron ta instaloj në vend që t'azhurnoj pakon %s"
msgid "medium \"%s\" already exists"
msgstr "burimi \"%s\" ekziston me heret"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "leximi i majës nga burimi \"%s\""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "zhdukja e burimit \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr ""
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "e pa mundur hapja e rpmdb"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"hyrja e pa mundur në burimin e parë instalues (asnjë skedare e gjetur në "
"hdlists)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "rikuperimi i skedares hdlist..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "tento zgjedhjen e një burimi jo ekzistues \"%s\""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "zgjedhje të shumta burimesh: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "zhdukja e burimit \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "rikuperimi i skedareve rpm nga burimi\"%s\"..."
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "Menyja e konfigurimit është regjistruar"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "Konfigurimi i Serverit"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "burimi \"%s\" nuk është i zgjedhur"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "kontrollimi i skedares sintezë [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problem gjatë leximit të skedares sitezë të burimit \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "shkruarja e skedares për listën e burimit \"%s\""
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...kopjimi dështoi"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopjimi i skedares përshkruese të \"%s\"..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...kopjimi i bërë"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopjimi i [%s] dështoi"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "llogaritja md5sum e rikuperimit të burimit hdlist (ose sintezës)"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "kopjimi i [%s] dështoi"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "kontrollimi i skedares hdlist [%s]"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "instalimi i %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "asnjë skedare e gjetur hdlist për burimin \"%s\""
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "kopjimi i skedares përshkruese të \"%s\"..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "emri i skedares rpm është invalid [%s]"
-#: ../urpm/media.pm:1461
-#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "rikuperim i burimit hdlist (ose sintezës) të \"%s\"..."
-
-#: ../urpm/media.pm:1478
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "hdlista tesntuese është gjetur (ose sintezuar) sikur %s"
+msgid "no metadata found for medium \"%s\""
+msgstr "asnjë skedare e gjetur hdlist për burimin \"%s\""
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "asnjë skedare e gjetur hdlist për burimin \"%s\""
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "rikuperim i burimit hdlist (ose sintezës) të \"%s\"..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "verifimi i skedares pubkey të \"%s\"..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...importimi i çelësit %s nga skedarja pubkey e \"%s\""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "është e pa mundur importimi i skedares pubkey të \"%s\""
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "asnjë skedare e gjetur hdlist për burimin \"%s\""
+
+#: ../urpm/media.pm:1612
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "shtuarja e burimit %s"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "lexim i skedareve rpm nga [%s]"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1251,7 +1259,7 @@ msgstr ""
msgid "TB"
msgstr ""
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1617,11 +1625,6 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "përdorim specifik i mjedisit në %s\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1637,118 +1640,136 @@ msgstr "krijimi i skedares sintezë për burimin \"%s\""
msgid "no xml-info available for medium \"%s\""
msgstr "shkruarja e skedares për listën e burimit \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Asnjë pako e emruar %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Pakot e radhitura përmbajnë %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Gjdo gjë është veçse e instaluar"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Gjdo gjë është veçse e instaluar"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Gjdo gjë është veçse e instaluar"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "ka arritur nga mungesa %s"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "Gjdo gjë është veçse e instaluar"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "ka arritur gjatë mosmarrëveshjes %s"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "tentim në gradimin e %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "në urdhër për ta mbajturë %s"
#: ../urpm/select.pm:607
+#, fuzzy, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Pakot a radhitura duhet të zhduken që të tjerat të azhurnohen:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Pakot a radhitura duhet të zhduken që të tjerat të azhurnohen:\n"
+"%s"
+
+#: ../urpm/select.pm:635
#, c-format
msgid "in order to install %s"
msgstr "në urdhër për instalim %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "ka arritur gjatë konflikteve me %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Nënshkrim i pa pranueshëm (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Çelës invalid ID (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Mungon nënshkrimi (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "i pa mundur shkrimi i skedares konfiguruese [%s]"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "Kopjimi dështoi"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "Kopjimi dështoi"
@@ -1792,7 +1813,7 @@ msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
" --parallel - urmpi është i shpërndarë në pseudo makina të shumëta.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - çfaqe etiketën packager: paketues.\n"
@@ -1820,7 +1841,7 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - model oratori.\n"
@@ -1884,7 +1905,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "zhdukja e pakos %s"
msgstr[1] "zhdukja e pakos %s"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (p/J)"
@@ -2146,156 +2167,156 @@ msgstr " --url - çfaqe etiketën serial: url.\n"
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - çfaqe etiketën description: përshkrimi.\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - çfaqe etiketën conflicts: gjitha konfliktet.\n"
+
+#: ../urpmi:143
#, fuzzy, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
" --test - verifikoje nëse instalimi përfundon në mënyrë korrekte.\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, fuzzy, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr ""
" --test - verifikoje nëse instalimi përfundon në mënyrë korrekte.\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:146
+#: ../urpmi:147
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - mbane rpm dhe mos e përdor në fshehje.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
" -a - zgjedhni të gjitha korrespondencat në linjën komanduese.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - model i qetë.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --verbose - model oratori.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " emrat apo skedaret rpm në linjën komanduese do të instalohen.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
"Çfarë mund të bëhet me skedaret rpm binare nëse e përdorni --install-src"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, fuzzy, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr "Grupi veçse ekziston, ju lutemi zgjedheni një Emër tjetër të Grupit"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "I pa mundur krijimi i repertorit [%s] për raport të bug(it)"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "Azhurno"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "Azhurno"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "Fundi i instalimit"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "Fundi i instalimit"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "Për ta plotësuar mvarësin, pakotë me radhë do të zhduken (%d MB)"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Cila është zgedhja e juaj? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2303,7 +2324,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2311,19 +2332,19 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Vazhdo pa marrë parasyshë?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (P/j) "
-#: ../urpmi:524
+#: ../urpmi:512
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2332,7 +2353,7 @@ msgstr ""
"Disa nga pakot e kërkuara nuk mund të instalohen:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2341,12 +2362,12 @@ msgstr ""
"Disa nga pakot e kërkuara nuk mund të instalohen:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "zhdukja a pakove %s do të dëmtoj sistemin tuaj"
-#: ../urpmi:551
+#: ../urpmi:538
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2357,7 +2378,7 @@ msgstr ""
"të zhduken që të tjerat të azhurnohen:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2368,30 +2389,12 @@ msgstr ""
"të zhduken që të tjerat të azhurnohen:\n"
"%s\n"
-#: ../urpmi:560
-#, fuzzy, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Pakot a radhitura duhet të zhduken që të tjerat të azhurnohen:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Pakot a radhitura duhet të zhduken që të tjerat të azhurnohen:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2401,46 +2404,46 @@ msgstr ""
"Ju duhet të jeni administrator për t'instaluar mvarësit e radhitura:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "Për ta plotësuar mvarësin, pakotë me radhë do të zhduken (%d MB)"
msgstr[1] "Për ta plotësuar mvarësin, pakotë me radhë do të zhduken (%d MB)"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Anulo"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Shtypni mbi Enter kur jeni i gatshëm..."
@@ -3181,6 +3184,14 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Asnjë imazh i gjetur"
+#, fuzzy
+#~ msgid "examining %s file"
+#~ msgstr "kontrollim i skedares MD5SUM"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "hdlista tesntuese është gjetur (ose sintezuar) sikur %s"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - krijo një burim azhurnimi.\n"
diff --git a/po/sr.po b/po/sr.po
index c9bf9b96..6857e10d 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+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"
@@ -35,7 +35,7 @@ msgstr "Инсталација система"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_У реду"
@@ -85,7 +85,7 @@ msgstr "Инсталирај"
msgid "_Save"
msgstr "_Сачувај"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Поништи"
@@ -116,9 +116,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - приказује овај екран о помоћи.\n"
@@ -154,18 +153,18 @@ msgstr ""
" (--no-verify-rpm не веригикује, стандардна је "
"верификација).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - користи само дати медиј, одвојен зарезом.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - дозвољава претраживање по пружању ради налажења пакета.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - не претражује доступне ради налажења пакета.\n"
@@ -204,7 +203,22 @@ msgstr "Молим сачекајте..."
msgid "Must be root"
msgstr "Порт за миша"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "дистрибуирам %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Инсталација пакета..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Инсталација пакета..."
+
+#: ../gurpmi2:111
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -219,37 +233,37 @@ msgstr ""
msgid "Warning"
msgstr "Упозорење"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "У реду"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "Ажурирање"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, fuzzy, c-format
msgid " (to install)"
msgstr "Излаз из инсталације"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Потребан(и) су следећи пакет(и):"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Одустати"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -259,19 +273,19 @@ msgstr ""
"Следећи пакети се морају уклонити да би други могли да буду ажурирани:\n"
"%s"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Ради задовољења зависности, следећи пакети ће бити уклоњени (%d MB)"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Ради задовољења зависности, следећи пакети ће бити уклоњени (%d MB)"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
@@ -279,42 +293,37 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Инсталација пакета..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "извор пакета није доступан, излазим..."
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Припремам..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Инсталирам пакет `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Убаците медиј са именом %s у уређај [%s]"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Скидам пакет `%s'..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, fuzzy, c-format
msgid "_Done"
msgstr "Урађено"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -325,28 +334,28 @@ msgstr ""
"%s\n"
"Можда желите да ажурирате вашу urpmi базу података."
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Инсталација није успела"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "све је већ инсталирано"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Инсталација готова"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "уклањам %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "рестартујем urpmi"
@@ -384,7 +393,7 @@ msgstr " -l - приказује фајлове у пакету.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -g - приказује групе укључујући и име.\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Само администратор може да инсталира пакете"
@@ -394,134 +403,143 @@ msgstr "Само администратор може да инсталира п
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "не могу да направим директоријум [%s] за извештај о грешци"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "Скидам пакет `%s'..."
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "користим дато окружење на %s\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "не могу да отворим rpmdb"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "погрешно име rpm датотеке [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "добављам rpm фајл [%s] ..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "... добављање завршено"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...повраћај неуспео: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "не могу да приступим rpm датотеци [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "Не могу да парсирам \"%s\" у фајл [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "не могу да региструјем rpm фајл"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "грешка при регистровању локалних пакета"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "лоша proxy-декларација у командној линији\n"
-#: ../urpm/args.pm:298
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: не могу да прочитам rpm датотеку \"%s\"\n"
-#: ../urpm/args.pm:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Недостаје потпис (%s)"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Копирање није успело"
@@ -568,122 +586,122 @@ msgstr ""
msgid "unable to write config file [%s]"
msgstr "не могу да извршим упис у конфигурациону датотеку [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr ""
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Молимо унесите Ваша овлашћења за приступ проксију\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Корисничко име:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Лозинка:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr ""
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr ""
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, fuzzy, c-format
msgid "copy failed"
msgstr "Копирање није успело"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, fuzzy, c-format
msgid "wget is missing\n"
msgstr "због не постојања %s"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, fuzzy, c-format
msgid "curl is missing\n"
msgstr "због не постојања %s"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr ""
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr ""
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr ""
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr ""
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr ""
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "због не постојања %s"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr ""
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, fuzzy, c-format
msgid "retrieving %s"
msgstr "уклањам %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...повраћај неуспео: %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "непознати протокол дефинисан за %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr ""
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "webfetch није пронађен, подржани webfetch-ови су: %s\n"
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "не могу да подржим протокол: %s"
@@ -703,12 +721,12 @@ msgstr "пакет %s није пронађен."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "добављам rpm фајлове ѕа медиј \"%s\"..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -716,47 +734,47 @@ msgstr ""
"креирана трансакција за инсталирање на %s (уклони=%d, инсталирај=%d, "
"ажурирај=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "не могу да креирам трансакцију"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "не могу да уклоним пакет %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "не могу да инсталирам пакет %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "Инсталирам %s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "...повраћај неуспео: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "уклањам пакет %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "уклањам пакет %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "Инсталирам %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, fuzzy, c-format
msgid "More information on package %s"
msgstr "Додатне информације о пакету..."
@@ -801,90 +819,80 @@ msgstr "Упозорење"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Инсталација није успела"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Инсталација није успела"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Следећи пакети имају неисправне потписе"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Следећи пакети имају неисправне потписе"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Да ли желите да наставите конфигурацију ?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "Инсталирам %s"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "дистрибуирам %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "Инсталирам %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "Инсталирам %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Инсталиација без провере зависности (да/Не)? "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Присилна инсталација (--force)? (да/Не) ?"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Инсталација је могућа"
#: ../urpm/md5sum.pm:26
-#, fuzzy, c-format
-msgid "examining %s file"
-msgstr "испитујем MD5SUM фајл"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr ""
@@ -958,229 +966,229 @@ msgstr "ће инсталирати уместо ажурирати пакет %
msgid "medium \"%s\" already exists"
msgstr "медиј \"%s\" већ постоји"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "читам хедере са медија \"%s\""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "уклањам медиј \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr ""
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "не могу да отворим rpmdb"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"не могу да приступим првом инсталационом медију (није пронађен hdlists фајл)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "добављам hdlists фајл..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "покушавам да селектујем непостојећи медиј \"%s\""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "покушавам да селектујем вишеструки медиј: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "уклањам медиј \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "добављам rpm фајлове ѕа медиј \"%s\"..."
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "Конфигурација менија сачувана"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "Подешавање сервера"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "медиј \"%s\" није изабран"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "испитујем synthesis фајл [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "проблем са читањем synthesis фајла за медиј \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "уписујем листу фајлова за медиј \"%s\""
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...копирање није успело"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "копирам описни фајл за \"%s\"..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...копирање завршено"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "копирање [%s] неуспело"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "прорачунавам md5sum копиране source hdlist (или synthesis)"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "копирање [%s] неуспело"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "испитујем hdlist фајл [%s]"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "Инсталирам %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "није пронађена hdlist датотека за медиј \"%s\""
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "копирам описни фајл за \"%s\"..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "погрешно име rpm датотеке [%s]"
-#: ../urpm/media.pm:1461
-#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "добављам изорни hdlist (или synthesis) за \"%s\"..."
-
-#: ../urpm/media.pm:1478
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "пронађена тестирана hdlist (или synthesis) као %s"
+msgid "no metadata found for medium \"%s\""
+msgstr "није пронађена hdlist датотека за медиј \"%s\""
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "није пронађена hdlist датотека за медиј \"%s\""
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "добављам изорни hdlist (или synthesis) за \"%s\"..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "испитукем фајл са јавним кључем за \"%s\"..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "..импортовани кључ %s од јавног кључа за \"%s\""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "не могу да импортујем јавни кључ за \"%s\""
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "није пронађена hdlist датотека за медиј \"%s\""
+
+#: ../urpm/media.pm:1612
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "додани медиј %s"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "читам rpm фајлове са [%s]"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "НнNn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1251,7 +1259,7 @@ msgstr ""
msgid "TB"
msgstr ""
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1613,11 +1621,6 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "користим дато окружење на %s\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1633,118 +1636,136 @@ msgstr "креирам hdlist симтезну датотеку за медиј
msgid "no xml-info available for medium \"%s\""
msgstr "уписујем листу фајлова за медиј \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Нема пакета са именом %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Следећи пакети садрже %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "све је већ инсталирано"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "све је већ инсталирано"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "све је већ инсталирано"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "због не постојања %s"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "све је већ инсталирано"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "због не задовољеног %s"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "покушавам да прикажем %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "да бих задржао %s"
#: ../urpm/select.pm:607
+#, fuzzy, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Следећи пакети се морају уклонити да би други могли да буду ажурирани:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Следећи пакети се морају уклонити да би други могли да буду ажурирани:\n"
+"%s"
+
+#: ../urpm/select.pm:635
#, c-format
msgid "in order to install %s"
msgstr "да би инсталирао %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "због конфликта са %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Неисправан потпис (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Погрешан ID кључа(%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Недостаје потпис (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "не могу да извршим упис у конфигурациону датотеку [%s]"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "Копирање није успело"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "Копирање није успело"
@@ -1786,7 +1807,7 @@ msgstr ""
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - дистрибуирани urpmi преко машина са надимком.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - приказује таг packager: packager.\n"
@@ -1815,7 +1836,7 @@ msgstr ""
" --use-distrib - подешава urpmi у лету са distrib стабла.\n"
" Ова опција дозвољава испитивање дистрибуције.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " -verbose - verbose режим.\n"
@@ -1883,7 +1904,7 @@ msgstr[0] "уклањам пакет %s"
msgstr[1] "уклањам пакет %s"
msgstr[2] "уклањам пакет %s"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (д/Н) "
@@ -2145,91 +2166,96 @@ msgstr " --url - приказује таг url: url.\n"
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - приказује таг описа: опис.\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - приказује таг конфликата: сви конфликти.\n"
+
+#: ../urpmi:143
#, fuzzy, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
" --test - проверава да ли се може извести исправна инсталација.\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, fuzzy, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr ""
" --test - проверава да ли се може извести исправна инсталација.\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:146
+#: ../urpmi:147
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - чува rpm који нису коришћени у кешу.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - бира сва поклапања у командној линији.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - тихи режим (мало порука).\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " -verbose - verbose режим.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " имена или rpm фајлови дати у командној линији ће бити инсталирани.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
"Шта се може учинити са бинарним rpm пакетима када се користи опција --"
"install-src"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2238,65 +2264,60 @@ msgstr ""
"Директоријум [%s] већ постоји, изаберите други директоријум за пријављивање "
"багова или га избришите"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "не могу да направим директоријум [%s] за извештај о грешци"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "Ажурирање"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "Ажурирање"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "Излаз из инсталације"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "Излаз из инсталације"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "Ради задовољења зависности, следећи пакети ће бити уклоњени (%d MB)"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Шта желите? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2304,7 +2325,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2312,19 +2333,19 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Свеједно наставити ?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (Д/н) "
-#: ../urpmi:524
+#: ../urpmi:512
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2333,7 +2354,7 @@ msgstr ""
"Неки изабрани пакети се не могу инсталирати:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2342,12 +2363,12 @@ msgstr ""
"Неки изабрани пакети се не могу инсталирати:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "уклањање пакета %s ће нарушити Ваш систем"
-#: ../urpmi:551
+#: ../urpmi:538
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2358,7 +2379,7 @@ msgstr ""
"морају бити уклоњени да би остали могли да се ажурирају:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2369,30 +2390,12 @@ msgstr ""
"морају бити уклоњени да би остали могли да се ажурирају:\n"
"%s\n"
-#: ../urpmi:560
-#, fuzzy, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Следећи пакети се морају уклонити да би други могли да буду ажурирани:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Следећи пакети се морају уклонити да би други могли да буду ажурирани:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2402,7 +2405,7 @@ msgstr ""
"Морате да имате root овлашћења да би инсталирали следеће пакете:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
@@ -2410,27 +2413,27 @@ msgstr[0] "Ради задовољења зависности, следећи п
msgstr[1] "Ради задовољења зависности, следећи пакети ће бити уклоњени (%d MB)"
msgstr[2] "Ради задовољења зависности, следећи пакети ће бити уклоњени (%d MB)"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2438,12 +2441,12 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Одустани"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Притисните enter када будете спремни..."
@@ -3175,6 +3178,14 @@ msgstr ""
msgid "No changelog found\n"
msgstr "НИје пронађен image"
+#, fuzzy
+#~ msgid "examining %s file"
+#~ msgstr "испитујем MD5SUM фајл"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "пронађена тестирана hdlist (или synthesis) као %s"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - креира update медиј.\n"
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index d0270884..ee22ee99 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+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"
@@ -35,7 +35,7 @@ msgstr "Instalacija sistema"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_U redu"
@@ -85,7 +85,7 @@ msgstr "Instaliraj"
msgid "_Save"
msgstr "_Sačuvaj"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Poništi"
@@ -116,9 +116,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - prikazuje ovaj ekran o pomoći.\n"
@@ -154,19 +153,19 @@ msgstr ""
" (--no-verify-rpm ne verigikuje, standardna je "
"verifikacija).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - koristi samo dati medij, odvojen zarezom.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - dozvoljava pretraživanje po pružanju radi nalaženja "
"paketa.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - ne pretražuje dostupne radi nalaženja paketa.\n"
@@ -205,7 +204,22 @@ msgstr "Molim sačekajte..."
msgid "Must be root"
msgstr "Port za miša"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "distribuiram %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Instalacija paketa..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Instalacija paketa..."
+
+#: ../gurpmi2:111
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -220,37 +234,37 @@ msgstr ""
msgid "Warning"
msgstr "Upozorenje"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "U redu"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "Ažuriranje"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, fuzzy, c-format
msgid " (to install)"
msgstr "Izlaz iz instalacije"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Potreban(i) su sledeći paket(i):"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Odustati"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -260,19 +274,19 @@ msgstr ""
"Sledeći paketi se moraju ukloniti da bi drugi mogli da budu ažurirani:\n"
"%s"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Radi zadovoljenja zavisnosti, sledeći paketi će biti uklonjeni (%d MB)"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Radi zadovoljenja zavisnosti, sledeći paketi će biti uklonjeni (%d MB)"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
@@ -280,42 +294,37 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Instalacija paketa..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "izvor paketa nije dostupan, izlazim..."
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Pripremam..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Instaliram paket `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Ubacite medij sa imenom %s u uređaj [%s]"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Skidam paket `%s'..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, fuzzy, c-format
msgid "_Done"
msgstr "Urađeno"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -326,28 +335,28 @@ msgstr ""
"%s\n"
"Možda želite da ažurirate vašu urpmi bazu podataka."
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Instalacija nije uspela"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "sve je već instalirano"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Instalacija gotova"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "uklanjam %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "restartujem urpmi"
@@ -385,7 +394,7 @@ msgstr " -l - prikazuje fajlove u paketu.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -g - prikazuje grupe uključujući i ime.\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Samo administrator može da instalira pakete"
@@ -395,134 +404,143 @@ msgstr "Samo administrator može da instalira pakete"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "ne mogu da napravim direktorijum [%s] za izveštaj o grešci"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "Skidam paket `%s'..."
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "koristim dato okruženje na %s\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "ne mogu da otvorim rpmdb"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "pogrešno ime rpm datoteke [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "dobavljam rpm fajl [%s] ..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "... dobavljanje završeno"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...povraćaj neuspeo: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "ne mogu da pristupim rpm datoteci [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "Ne mogu da parsiram \"%s\" u fajl [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "ne mogu da registrujem rpm fajl"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "greška pri registrovanju lokalnih paketa"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "loša proxy-deklaracija u komandnoj liniji\n"
-#: ../urpm/args.pm:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Nedostaje potpis (%s)"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Kopiranje nije uspelo"
@@ -569,122 +587,122 @@ msgstr ""
msgid "unable to write config file [%s]"
msgstr "ne mogu da izvršim upis u konfiguracionu datoteku [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr ""
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Molimo unesite Vaša ovlašćenja za pristup proksiju\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Korisničko ime:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Lozinka:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr ""
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr ""
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, fuzzy, c-format
msgid "copy failed"
msgstr "Kopiranje nije uspelo"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, fuzzy, c-format
msgid "wget is missing\n"
msgstr "zbog ne postojanja %s"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, fuzzy, c-format
msgid "curl is missing\n"
msgstr "zbog ne postojanja %s"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr ""
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr ""
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr ""
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr ""
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr ""
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "zbog ne postojanja %s"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr ""
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, fuzzy, c-format
msgid "retrieving %s"
msgstr "uklanjam %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...povraćaj neuspeo: %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "nepoznati protokol definisan za %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr ""
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, 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:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "ne mogu da podržim protokol: %s"
@@ -704,12 +722,12 @@ msgstr "paket %s nije pronađen."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "dobavljam rpm fajlove dza medij \"%s\"..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -717,47 +735,47 @@ msgstr ""
"kreirana transakcija za instaliranje na %s (ukloni=%d, instaliraj=%d, "
"ažuriraj=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "ne mogu da kreiram transakciju"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "ne mogu da uklonim paket %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "ne mogu da instaliram paket %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "Instaliram %s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "...povraćaj neuspeo: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "uklanjam paket %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "uklanjam paket %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "Instaliram %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, fuzzy, c-format
msgid "More information on package %s"
msgstr "Dodatne informacije o paketu..."
@@ -802,90 +820,80 @@ msgstr "Upozorenje"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Instalacija nije uspela"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Instalacija nije uspela"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Sledeći paketi imaju neispravne potpise"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Sledeći paketi imaju neispravne potpise"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Da li želite da nastavite konfiguraciju ?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "Instaliram %s"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "distribuiram %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "Instaliram %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "Instaliram %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Instaliacija bez provere zavisnosti (da/Ne)? "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Prisilna instalacija (--force)? (da/Ne) ?"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Instalacija je moguća"
#: ../urpm/md5sum.pm:26
-#, fuzzy, c-format
-msgid "examining %s file"
-msgstr "ispitujem MD5SUM fajl"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr ""
@@ -959,229 +967,229 @@ msgstr "će instalirati umesto ažurirati paket %s"
msgid "medium \"%s\" already exists"
msgstr "medij \"%s\" već postoji"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "čitam hedere sa medija \"%s\""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "uklanjam medij \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr ""
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "ne mogu da otvorim rpmdb"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"ne mogu da pristupim prvom instalacionom mediju (nije pronađen hdlists fajl)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "dobavljam hdlists fajl..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "pokušavam da selektujem nepostojeći medij \"%s\""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "pokušavam da selektujem višestruki medij: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "uklanjam medij \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "dobavljam rpm fajlove dza medij \"%s\"..."
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "Konfiguracija menija sačuvana"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "Podešavanje servera"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "medij \"%s\" nije izabran"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "ispitujem synthesis fajl [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problem sa čitanjem synthesis fajla za medij \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "upisujem listu fajlova za medij \"%s\""
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...kopiranje nije uspelo"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopiram opisni fajl za \"%s\"..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...kopiranje završeno"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopiranje [%s] neuspelo"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "proračunavam md5sum kopirane source hdlist (ili synthesis)"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "kopiranje [%s] neuspelo"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "ispitujem hdlist fajl [%s]"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "Instaliram %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "kopiram opisni fajl za \"%s\"..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "pogrešno ime rpm datoteke [%s]"
-#: ../urpm/media.pm:1461
-#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "dobavljam izorni hdlist (ili synthesis) za \"%s\"..."
-
-#: ../urpm/media.pm:1478
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "pronađena testirana hdlist (ili synthesis) kao %s"
+msgid "no metadata found for medium \"%s\""
+msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "nije pronađena hdlist datoteka za medij \"%s\""
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "dobavljam izorni hdlist (ili synthesis) za \"%s\"..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "ispitukem fajl sa javnim ključem za \"%s\"..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "..importovani ključ %s od javnog ključa za \"%s\""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "ne mogu da importujem javni ključ za \"%s\""
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "nije pronađena hdlist datoteka za medij \"%s\""
+
+#: ../urpm/media.pm:1612
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "dodani medij %s"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "čitam rpm fajlove sa [%s]"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "NnNn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1252,7 +1260,7 @@ msgstr ""
msgid "TB"
msgstr ""
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1615,11 +1623,6 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "koristim dato okruženje na %s\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1635,118 +1638,136 @@ msgstr "kreiram hdlist simteznu datoteku za medij \"%s\""
msgid "no xml-info available for medium \"%s\""
msgstr "upisujem listu fajlova za medij \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Nema paketa sa imenom %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Sledeći paketi sadrže %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "sve je već instalirano"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "sve je već instalirano"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "sve je već instalirano"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "zbog ne postojanja %s"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "sve je već instalirano"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "zbog ne zadovoljenog %s"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "pokušavam da prikažem %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "da bih zadržao %s"
#: ../urpm/select.pm:607
+#, fuzzy, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Sledeći paketi se moraju ukloniti da bi drugi mogli da budu ažurirani:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Sledeći paketi se moraju ukloniti da bi drugi mogli da budu ažurirani:\n"
+"%s"
+
+#: ../urpm/select.pm:635
#, c-format
msgid "in order to install %s"
msgstr "da bi instalirao %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "zbog konflikta sa %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Neispravan potpis (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Pogrešan ID ključa(%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Nedostaje potpis (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "ne mogu da izvršim upis u konfiguracionu datoteku [%s]"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "Kopiranje nije uspelo"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "Kopiranje nije uspelo"
@@ -1788,7 +1809,7 @@ msgstr ""
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - distribuirani urpmi preko mašina sa nadimkom.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - prikazuje tag packager: packager.\n"
@@ -1817,7 +1838,7 @@ msgstr ""
" --use-distrib - podešava urpmi u letu sa distrib stabla.\n"
" Ova opcija dozvoljava ispitivanje distribucije.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " -verbose - verbose režim.\n"
@@ -1888,7 +1909,7 @@ msgstr[0] "uklanjam paket %s"
msgstr[1] "uklanjam paket %s"
msgstr[2] "uklanjam paket %s"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (d/N) "
@@ -2150,91 +2171,96 @@ msgstr " --url - prikazuje tag url: url.\n"
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - prikazuje tag opisa: opis.\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - prikazuje tag konflikata: svi konflikti.\n"
+
+#: ../urpmi:143
#, fuzzy, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
" --test - proverava da li se može izvesti ispravna instalacija.\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, fuzzy, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr ""
" --test - proverava da li se može izvesti ispravna instalacija.\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:146
+#: ../urpmi:147
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - čuva rpm koji nisu korišćeni u kešu.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - bira sva poklapanja u komandnoj liniji.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - tihi režim (malo poruka).\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " -verbose - verbose režim.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " imena ili rpm fajlovi dati u komandnoj liniji će biti instalirani.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
"Šta se može učiniti sa binarnim rpm paketima kada se koristi opcija --"
"install-src"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2243,65 +2269,60 @@ msgstr ""
"Direktorijum [%s] već postoji, izaberite drugi direktorijum za "
"prijavljivanje bagova ili ga izbrišite"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "ne mogu da napravim direktorijum [%s] za izveštaj o grešci"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "Ažuriranje"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "Ažuriranje"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "Izlaz iz instalacije"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "Izlaz iz instalacije"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "Radi zadovoljenja zavisnosti, sledeći paketi će biti uklonjeni (%d MB)"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Šta želite? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2309,7 +2330,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2317,19 +2338,19 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Svejedno nastaviti ?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (D/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2338,7 +2359,7 @@ msgstr ""
"Neki izabrani paketi se ne mogu instalirati:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2347,12 +2368,12 @@ msgstr ""
"Neki izabrani paketi se ne mogu instalirati:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "uklanjanje paketa %s će narušiti Vaš sistem"
-#: ../urpmi:551
+#: ../urpmi:538
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2363,7 +2384,7 @@ msgstr ""
"moraju biti uklonjeni da bi ostali mogli da se ažuriraju:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2374,30 +2395,12 @@ msgstr ""
"moraju biti uklonjeni da bi ostali mogli da se ažuriraju:\n"
"%s\n"
-#: ../urpmi:560
-#, fuzzy, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Sledeći paketi se moraju ukloniti da bi drugi mogli da budu ažurirani:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Sledeći paketi se moraju ukloniti da bi drugi mogli da budu ažurirani:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2407,7 +2410,7 @@ msgstr ""
"Morate da imate root ovlašćenja da bi instalirali sledeće pakete:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
@@ -2418,27 +2421,27 @@ msgstr[1] ""
msgstr[2] ""
"Radi zadovoljenja zavisnosti, sledeći paketi će biti uklonjeni (%d MB)"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2446,12 +2449,12 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Odustani"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Pritisnite enter kada budete spremni..."
@@ -3186,6 +3189,14 @@ msgstr ""
msgid "No changelog found\n"
msgstr "NIje pronađen image"
+#, fuzzy
+#~ msgid "examining %s file"
+#~ msgstr "ispitujem MD5SUM fajl"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "pronađena testirana hdlist (ili synthesis) kao %s"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - kreira update medij.\n"
diff --git a/po/sv.po b/po/sv.po
index 1ddc677e..2fda1e08 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-sv\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2008-09-21 19:25+0300\n"
"Last-Translator: Thomas Backlund <tmb@mandriva.org>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -39,7 +39,7 @@ msgstr "RPM installation"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Fel: kan inte hitta filen %s, avbryter operationen"
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_OK"
@@ -105,7 +105,7 @@ msgstr "_Installera"
msgid "_Save"
msgstr "_Spara"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "Av_bryt"
@@ -136,9 +136,8 @@ msgstr ""
msgid "Options:"
msgstr "Alternativ:"
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - visar det här hjälpmeddelandet.\n"
@@ -148,16 +147,20 @@ msgstr " --help - visar det här hjälpmeddelandet.\n"
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
-msgstr " --auto - ej interaktivt läge. väljer standardsvar på alla frågor.\n"
+msgstr ""
+" --auto - ej interaktivt läge. väljer standardsvar på alla frågor.\n"
#: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - välj automatiskt paket för att uppdatera systemet.\n"
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - välj automatiskt paket för att uppdatera systemet.\n"
#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
msgstr " --force - tvinga användning även om vissa paket inte finns.\n"
#: ../gurpmi.pm:50 ../urpmi:133
@@ -169,17 +172,18 @@ msgstr ""
" --verify-rpm - verifiera rpm-signatur före installation (standard)\n"
" (--no-verify-rpm inaktiverar det).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - använd endast givet media, separerat med komma.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
-msgstr " -p - tillåt sökning i \"provides\" för att hitta paket.\n"
+msgstr ""
+" -p - tillåt sökning i \"provides\" för att hitta paket.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - sök inte i \"provides\" för att hitta paket.\n"
@@ -194,11 +198,13 @@ msgstr " --root - använd en annan root för rpm installation.\n"
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
-msgstr " --test - verifiera endast om installationen kan utföras korrekt.\n"
+msgstr ""
+" --test - verifiera endast om installationen kan utföras korrekt.\n"
#: ../gurpmi.pm:57 ../urpmi:76
#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
" --searchmedia - använd endast givet media för att söka efter valda "
"paket.\n"
@@ -218,7 +224,22 @@ msgstr "Var god vänta..."
msgid "Must be root"
msgstr "Måste vara root"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "distribuerar %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Paketinstallation..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Paketinstallation..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -234,37 +255,37 @@ msgstr ""
msgid "Warning"
msgstr "Varning"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "OK"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (för att uppdatera)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (för att installera)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Val av paket"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Ett av följande paket är nödvändigt:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Avbryt"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -275,59 +296,58 @@ msgstr ""
"%s\n"
"Vill du fortsätta ändå?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
-msgstr "För att tillfredsställa beroenden, kommer följande paket att installeras:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
+msgstr ""
+"För att tillfredsställa beroenden, kommer följande paket att installeras:"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
-msgstr "För att tillfredsställa beroenden kommer följande paket att installeras:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr ""
+"För att tillfredsställa beroenden kommer följande paket att installeras:"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d paket, %d MB)"
msgstr[1] "(%d paket, %d MB)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Paketinstallation..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "kunde inte läsa källan, avbryter"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Förbereder..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Installerar paket \"%s\" (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Lägg i media med namnet \"%s\""
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Laddar ner paket \"%s\"..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Klar"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -338,28 +358,28 @@ msgstr ""
"%s\n"
"Du bör försöka uppdatera urpmi-databasen."
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "Installationen misslyckades:"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Allt är redan installerat"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Installation slutförd"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "tar bort %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "startar om urpmi"
@@ -398,7 +418,7 @@ msgstr " standard är %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - visa hela rpm namnet (NVRA).\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Endast systemadministratörer får installera paket"
@@ -408,136 +428,145 @@ msgstr "Endast systemadministratörer får installera paket"
msgid "Running urpmi in restricted mode..."
msgstr "Kör urpmi i begränsat läge"
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, c-format
msgid "fail to create directory %s"
msgstr "kan inte skapa katalog %s"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr "felaktig ägare för katalog %s"
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, c-format
msgid "Can not download packages into %s"
msgstr "Kan inte ladda ner paket till [%s]"
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr "Omgivning sökväg %s existerar inte"
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "använder specifik miljö på %s\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "kunde inte öppna RPM-db"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "ogiltigt RPM-filnamn [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "hämtar RPM-fil [%s]..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...hämtning klar"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...hämtning misslyckades: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "kan inte läsa rpm-fil [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "kan inte tyda spec-fil %s [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "kan inte registrera RPM-fil"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Inkompatibel arkitektur för rpm [%s]"
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "fel vid registrering av lokala paket"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
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:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "felaktig proxydeklaration på kommandorad\n"
-#: ../urpm/args.pm:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "oväntat uttryck %s"
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "uttryck saknas före %s"
-#: ../urpm/args.pm:382
+#: ../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:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "inget uttryck att stänga"
-#: ../urpm/args.pm:395
+#: ../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:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot katalog existerar inte"
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr "Kan inte använda %s utan %s"
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr "Kan inte använda %s med %s"
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr "För många argument\n"
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Kopiering misslyckades"
@@ -547,7 +576,9 @@ msgstr "Kopiering misslyckades"
msgid ""
"You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done "
"automatically)"
-msgstr "Du måste montera CD-ROM själv (eller installera perl-Hal-Cdroms för att få det automatiserat)"
+msgstr ""
+"Du måste montera CD-ROM själv (eller installera perl-Hal-Cdroms för att få "
+"det automatiserat)"
#: ../urpm/cdrom.pm:68
#, c-format
@@ -584,122 +615,124 @@ msgstr "medium '%s' är definierat två gånger, avbryter"
msgid "unable to write config file [%s]"
msgstr "kan inte skriva inställningsfil [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "%s är inte tillgänglig, faller tillbaka till %s"
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
-msgstr "kan inte läsa proxy-inställningar (inte tillräckliga behörigheter för att läsa %s)"
+msgstr ""
+"kan inte läsa proxy-inställningar (inte tillräckliga behörigheter för att "
+"läsa %s)"
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Var vänlig ange dina uppgifter för att använda proxy\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Användarnamn:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Lösenord:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr "Okänd webfetch '%s' !!!\n"
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr "%s misslyckades: avlutades med signal %d"
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr "%s misslyckades: avlutades med %d"
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, c-format
msgid "copy failed"
msgstr "kopiering misslyckades"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, c-format
msgid "wget is missing\n"
msgstr "wget saknas\n"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, c-format
msgid "curl is missing\n"
msgstr "curl saknas\n"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr "curl misslyckades: nerladdningen avbröts\n"
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr "rsync saknas\n"
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr "ssh saknas\n"
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr "prozilla saknas\n"
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr "Kunde inte starta prozilla\n"
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, c-format
msgid "aria2 is missing\n"
msgstr "aria2 saknas\n"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr " %s%% av %s klar, ETA = %s, hastighet = %s"
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr " %s%% klar, hastighet = %s"
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, c-format
msgid "retrieving %s"
msgstr "hämtar %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, c-format
msgid "retrieved %s"
msgstr "hämtade %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "okänt protokoll definierat för %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "%s är inte tillgänglig, faller tillbaka till %s"
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "ingen 'webfetch' hittad, supportad webfetch är: %s\n"
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "kan inte hantera protokoll: %s"
@@ -719,59 +752,60 @@ msgstr "paketet %s hittas inte."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "hämtar RPM-filer från media \"%s\"..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr "[ompaketering]"
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
"skapade transaktion för installation på %s (ta bort=%d, installera=%d, "
"uppdatera=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "kunde inte skapa transaktion"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "kan inte extrahera rpm från delta-rpm paket %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "kan inte installera paket %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "tar bort felaktig rpm (%s) från %s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, c-format
msgid "removing %s failed: %s"
msgstr "borttagning av %s misslyckades: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, c-format
msgid "Removing package %s"
msgstr "Tar bort paket %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "tar bort paket %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "tar bort installerade rpms (%s) från %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Mer information om paket %s"
@@ -816,18 +850,18 @@ msgstr "avbryter"
msgid "%s database is locked (another program is already using it)"
msgstr "%s databas är låst (ett annat program använder den redan)"
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Installationen misslyckades"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr "Försök fortsätta ändå? (j/N)"
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -836,73 +870,63 @@ msgstr ""
"Installationen misslyckades, felaktiga rpm:\n"
"%s"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, c-format
msgid "The following package has bad signature"
msgstr "Följande paket har felaktig signatur"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Följande paket har felaktiga signaturer"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Vill du fortsätta installationen?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, c-format
msgid "removing installed rpms (%s)"
msgstr "tar bort installerade rpms (%s)"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "distribuerar %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "installerar %s från %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "installerar %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Prova att installera utan att kontrollera behov av andra filer? (j/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Försök ännu hårdare att installera (--force)? (j/N) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr "Paket är uppdaterade"
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Installation är möjlig"
#: ../urpm/md5sum.pm:26
#, c-format
-msgid "examining %s file"
-msgstr "undersöker %s fil"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr "Felaktig MD5SUM fil"
-
-#: ../urpm/md5sum.pm:28
-#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "varning: md5sum för %s finns ej i MD5SUM filen"
@@ -975,228 +999,228 @@ msgstr "skulle installera istället för att uppdatera paket %s"
msgid "medium \"%s\" already exists"
msgstr "media \"%s\" finns redan"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr "(ignorerat som standard)"
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "lägger till media \"%s\" före fjärrmedia \"%s\""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, c-format
msgid "adding medium \"%s\""
msgstr "lägger till media \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr "sökväg %s existerar inte"
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "denna sökväg verkar inte innehålla någon distribution"
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, c-format
msgid "unable to parse media.cfg"
msgstr "kan inte tyda media.cfg"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "kan inte läsa distributionsmediat (hittade ingen media.cfg fil)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr "ignorerar icke-kompatibelt media '%s' (för %s)"
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, c-format
msgid "retrieving media.cfg file..."
msgstr "hämtar media.cfg fil..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "försöker välja media som inte finns \"%s\""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "väljer flera media: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "tar bort media \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "omkonfigurerar urpmi för media \"%s\""
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...omkonfigurering misslyckades"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "omkonfigurering utförd"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Fel vid generering av names fil: behövlig %d hittades inte"
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "mediat \"%s\" är uppdaterat"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "undersöker synthesis-fil [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problem med att läsa synthesis-fil för media \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "kopierar [%s] för media \"%s\"..."
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...kopiering misslyckades"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopierar beskrivningsfil för \"%s\"..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...kopiering klar"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopiering av [%s] misslyckades (filen är misstänkligt liten)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "beräknar MD5-summa för hämtade syntheses källor"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "hämtning av [%s] misslyckades (md5sum stämmer inte)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, c-format
msgid "genhdlist2 failed on %s"
msgstr "genhdlist2 misslyckades på %s"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, c-format
msgid "comparing %s and %s"
msgstr "jämför %s och %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "felaktig hdlist-fil %s för media \"%s\""
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "kopierar MD5SUM-fil för \"%s\"..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "ogiltig MD5SUM fil (hämtad från %s)"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
+#, fuzzy, c-format
+msgid "no metadata found for medium \"%s\""
+msgstr "ingen synthesis-fil hittad för media \"%s\""
+
+#: ../urpm/media.pm:1475
#, c-format
msgid "retrieving source synthesis of \"%s\"..."
msgstr "hämtar käll-synthesis för \"%s\"..."
-#: ../urpm/media.pm:1478
-#, c-format
-msgid "found probed synthesis as %s"
-msgstr "hittat undersökt synthesis som %s"
-
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
-#, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "ingen synthesis-fil hittad för media \"%s\""
-
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "undersöker \"pubkey\"-fil för \"%s\"..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...importerarde nyckel %s från \"pubkey\"-fil av \"%s\""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "kunde inte importera \"pubkey\"-fil för \"%s\""
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "ingen synthesis-fil hittad för media \"%s\""
+
+#: ../urpm/media.pm:1612
#, c-format
msgid "updated medium \"%s\""
msgstr "uppdaterade media %s"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr "hämtning av [%s] misslyckades"
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr "försöker igen med spegelserver %s"
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr "Kunde inte hitta någon spegelserver från spegel-lista %s"
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr "hittade geolokalisering %s %.2f %.2f från tidszon %s"
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, c-format
msgid "getting mirror list from %s"
msgstr "hämtar spegel-lista från %s"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1267,7 +1291,7 @@ msgstr "GB"
msgid "TB"
msgstr "TB"
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1275,8 +1299,12 @@ msgid ""
msgid_plural ""
"The following packages are now orphans, use \"urpme --auto-orphans\" to "
"remove them."
-msgstr[0] "Följande paket behövs ej mera, använd \"urpme --auto-orphans\" för att ta bort det."
-msgstr[1] "Följande paket behövs ej mera, använd \"urpme --auto-orphans\" för att ta bort dem."
+msgstr[0] ""
+"Följande paket behövs ej mera, använd \"urpme --auto-orphans\" för att ta "
+"bort det."
+msgstr[1] ""
+"Följande paket behövs ej mera, använd \"urpme --auto-orphans\" för att ta "
+"bort dem."
#: ../urpm/parallel.pm:14
#, c-format
@@ -1333,7 +1361,9 @@ msgstr "cp misslyckades på maskin %s (%d)"
msgid ""
"%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
"code: %d)"
-msgstr "%s misslyckades på maskin %s (kanske den inte har en korrekt version av urpmi?) (felkod %d)"
+msgstr ""
+"%s misslyckades på maskin %s (kanske den inte har en korrekt version av "
+"urpmi?) (felkod %d)"
#: ../urpm/removable.pm:32
#, c-format
@@ -1383,7 +1413,8 @@ msgstr " --excludemedia - använd inte givet media, separerat med komma.\n"
#: ../urpm/search.pm:39 ../urpmf:39
#, c-format
-msgid " --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr " --literal, -l - sök inte mönster, använd argument som söksträng.\n"
#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
@@ -1395,8 +1426,10 @@ msgstr " --urpmi-root - använd en annan rot för db & rpm installation.\n"
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
#, c-format
-msgid " --sortmedia - sort media according to substrings separated by comma.\n"
-msgstr " --sortmedia - sorterar media enligt kommaseparerade delsträngar.\n"
+msgid ""
+" --sortmedia - sort media according to substrings separated by comma.\n"
+msgstr ""
+" --sortmedia - sorterar media enligt kommaseparerade delsträngar.\n"
#: ../urpm/search.pm:43 ../urpmf:43
#, c-format
@@ -1426,12 +1459,14 @@ msgstr " --verbose - utförligt läge.\n"
#: ../urpm/search.pm:48 ../urpmf:48
#, c-format
msgid " -i - ignore case distinctions in patterns.\n"
-msgstr " -i - versaler och gemener jämförs lika i varje mönster.\n"
+msgstr ""
+" -i - versaler och gemener jämförs lika i varje mönster.\n"
#: ../urpm/search.pm:49 ../urpmf:49
#, c-format
msgid " -I - honor case distinctions in patterns (default).\n"
-msgstr " -I - versaler och gemener jämförs olika i varje mönster.\n"
+msgstr ""
+" -I - versaler och gemener jämförs olika i varje mönster.\n"
#: ../urpm/search.pm:50 ../urpmf:50
#, c-format
@@ -1622,11 +1657,6 @@ msgstr " -f - visa version, utgåva och arkitektur med namn.\n"
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Felaktigt format: du kan endast använda en flervals-tagg"
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "använder specifik miljö på %s\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1642,117 +1672,137 @@ msgstr "ingen synthesis-fil tillgänglig för media \"%s\""
msgid "no xml-info available for medium \"%s\""
msgstr "ingen xml-info tillgänglig för media \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr "urpmi startades om, och listan av prioriterade paket ändrades inte"
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "urpmi startades om, och listan av prioriterade paket ändrades: %s mot %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"urpmi startades om, och listan av prioriterade paket ändrades: %s mot %s"
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Inget paket med namn %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Följande paket innehåller %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr "Du borde använda \"-a\" för att använda alla av dem"
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, c-format
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:543
+#: ../urpm/select.pm:538
#, c-format
msgid "Package %s is already installed"
msgstr "Paket %s är redan installerat"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, c-format
msgid "Packages %s are already installed"
msgstr "Paketen %s är redan installerade"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "för att %s saknas"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, c-format
msgid "due to already installed %s"
msgstr "på grund av redan installerad %s"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "på grund av otillräckliga %s"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "försöker befordra %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "för att behålla %s"
#: ../urpm/select.pm:607
#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Följande paket måste tas bort för att andra ska bli uppdaterade:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Följande paket måste tas bort för att andra ska bli uppdaterade:\n"
+"%s"
+
+#: ../urpm/select.pm:635
+#, c-format
msgid "in order to install %s"
msgstr "för att installera %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "på grund av konflikter med %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Ogiltig signatur (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Ogiltigt nyckel-id (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Signatur saknas (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr "system"
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr "Du borde starta om %s för %s"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't write file"
msgstr "Kan inte skriva fil"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't open file"
msgstr "Kan inte öppna fil"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, c-format
msgid "Can't move file %s to %s"
msgstr "Kan inte flytta fil %s till %s"
@@ -1793,7 +1843,7 @@ msgstr " --test - verifiera om borttagningen kan utföras korrekt.\n"
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - distribuerad urpmi över alla maskiner med alias.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - ompaketera filerna före avinstallation\n"
@@ -1823,7 +1873,7 @@ msgstr ""
"distributionsträd, användbart\n"
" vid (av)installation av chroot med --root option.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - utförligt läge.\n"
@@ -1868,9 +1918,12 @@ msgstr "Inga obehövliga paket att ta bort"
#: ../urpme:149
#, 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] "För att tillfredsställa beroenden kommer följande paket att tas bort"
-msgstr[1] "För att tillfredsställa beroenden kommer följande %d paket att tas bort"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"För att tillfredsställa beroenden kommer följande paket att tas bort"
+msgstr[1] ""
+"För att tillfredsställa beroenden kommer följande %d paket att tas bort"
#: ../urpme:154
#, c-format
@@ -1886,7 +1939,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "Ta bort %d paket?"
msgstr[1] "Ta bort %d paket?"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (j/N) "
@@ -2003,8 +2056,10 @@ msgstr " --noclean - rensa inte rpms från cache.\n"
#: ../urpmi:102
#, c-format
-msgid " --replacepkgs - force installing packages which are already installed.\n"
-msgstr " --replacepkgs - tvinga installation av paket som redan är installerade.\n"
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+" --replacepkgs - tvinga installation av paket som redan är installerade.\n"
#: ../urpmi:104
#, c-format
@@ -2139,24 +2194,30 @@ msgstr " --ignoresize - kontrollera inte diskutrymme före installation.\n"
#: ../urpmi:139
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
-msgstr " --ignorearch - tillåt installation av rpm som inte matchar arkitektur.\n"
+msgstr ""
+" --ignorearch - tillåt installation av rpm som inte matchar arkitektur.\n"
#: ../urpmi:140
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - kör inte paketens skript\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - visa konflikter\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - paket som ej ska installeras.\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --prefer - paket som skall föredras\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2165,42 +2226,42 @@ msgstr ""
" --more-choices - om flera paket hittas, föreslå fler alternativ\n"
" än standard.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - lås inte rpm db.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - uppdatera endast paket med samma arkitektur.\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - välj alla träffar på kommandoraden.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - tyst läge.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --debug - väldigt utförligt läge.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " namn eller rpm-filer som anges på kommandoraden installeras.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr "Fel: kan inte använda --auto-select samtidigt som en fil-lista.\n"
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2209,29 +2270,30 @@ msgstr ""
"Fel: För att skapa felrapport, använd samma argument som tidigare\n"
"och lägg till --bug.\n"
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "Du kan inte installerabinära RPM-filer när -install-src används"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr "Du kan inte installera spec-filer"
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr "använder --buildrequires"
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
"vänligen använd --buildrequires eller --install-src, använder --"
"buildrequires som standard"
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2240,17 +2302,12 @@ msgstr ""
"Katalogen [%s] finns redan, välj en annan katalog för felrapport eller "
"radera den"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Kunde inte skapa katalog [%s] för felrapport"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr "Omgivning sökväg %s existerar inte"
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2259,48 +2316,48 @@ msgstr ""
"Fel: %s verkar vara monterad som read-only.\n"
"Använd --allow-force för att tvinga operationen."
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr "Uppdaterar media...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (för att uppdatera)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (för att uppdatera)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (för att installera)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (för att installera)"
-#: ../urpmi:462
+#: ../urpmi:450
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "För att tillfredsställa beroendet '%s', ett av följande paket behövs:"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Vad är ditt val? ( 1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2311,7 +2368,7 @@ msgstr ""
"är äldre än de installerade paketen:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2322,7 +2379,7 @@ msgstr ""
"är äldre än de installerade paketen:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2331,12 +2388,12 @@ msgstr ""
"\n"
"Fortsätt installation ändå?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (J/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2345,7 +2402,7 @@ msgstr ""
"Ett begärt paket kan inte installeras:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2354,12 +2411,12 @@ msgstr ""
"Vissa begärda paket kan inte installeras:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "att ta bort paketet %s skulle förstöra systemet"
-#: ../urpmi:551
+#: ../urpmi:538
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2370,7 +2427,7 @@ msgstr ""
"tas bort så att andra kan uppdateras:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2381,30 +2438,12 @@ msgstr ""
"tas bort så att andra kan uppdateras:\n"
"%s\n"
-#: ../urpmi:560
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Följande paket måste tas bort för att andra ska bli uppdaterade:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Följande paket måste tas bort för att andra ska bli uppdaterade:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(endast test, ingenting kommer att bli borttaget)"
-#: ../urpmi:583
+#: ../urpmi:568
#, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2415,46 +2454,46 @@ msgstr ""
"beroenden:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "Följande obehövliga paket kommer att tas bort."
msgstr[1] "Följande obehövliga paket kommer att tas bort."
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(endast test, installation kommer inte att utföras)"
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr "%s mera disk-utrymme kommer att bli använt."
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr "%s disk-utrymme kommer att frigöras."
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr "%s paket kommer att hämtas."
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
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:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Avbryt"
-#: ../urpmi:648
+#: ../urpmi:633
#, c-format
msgid "Press Enter when mounted..."
msgstr "Tryck Enter när klart..."
@@ -2530,7 +2569,8 @@ msgid ""
" or discard non-update media (when used with --distrib)\n"
msgstr ""
" --update - skapa ett uppdateringsmedium, \n"
-" eller ignorera media som inte har uppdateringar (med flaggan --distrib)\n"
+" eller ignorera media som inte har uppdateringar (med "
+"flaggan --distrib)\n"
#: ../urpmi.addmedia:67
#, c-format
@@ -2605,7 +2645,8 @@ msgstr " --nopubkey - importera inte pubkey för adderat media\n"
#: ../urpmi.addmedia:82
#, c-format
msgid " --raw - add the media in config, but don't update it.\n"
-msgstr " --raw - lägg till mediat i config, men uppdatera inte det.\n"
+msgstr ""
+" --raw - lägg till mediat i config, men uppdatera inte det.\n"
#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
#, c-format
@@ -2700,12 +2741,15 @@ msgstr " --checkpoint - sätt ompaketeringsstart nu\n"
#: ../urpmi.recover:35
#, c-format
msgid " --noclean - don't clean repackage directory on checkpoint\n"
-msgstr " --noclean - rensa inte ompaketeringskatalog vid kontrollpunkt.\n"
+msgstr ""
+" --noclean - rensa inte ompaketeringskatalog vid kontrollpunkt.\n"
#: ../urpmi.recover:37
#, c-format
-msgid " --list - list transactions since provided date/duration argument\n"
-msgstr " --list - lista transaktioner efter angivet datum/period argument\n"
+msgid ""
+" --list - list transactions since provided date/duration argument\n"
+msgstr ""
+" --list - lista transaktioner efter angivet datum/period argument\n"
#: ../urpmi.recover:38
#, c-format
@@ -2987,7 +3031,8 @@ msgstr " --list-url - lista tillgänglig media och dess sökväg.\n"
#: ../urpmq:61
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
-msgstr " --list-nodes - visa tillgängliga noder vid användning av --parallel.\n"
+msgstr ""
+" --list-nodes - visa tillgängliga noder vid användning av --parallel.\n"
#: ../urpmq:62
#, c-format
@@ -2996,8 +3041,10 @@ msgstr " --list-aliases - lista tillgängliga parallellalias.\n"
#: ../urpmq:63
#, c-format
-msgid " --dump-config - dump the config in form of urpmi.addmedia argument.\n"
-msgstr " --dump-config - dumpa konfigurationen i form av urpmi.addmedia argument.\n"
+msgid ""
+" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+" --dump-config - dumpa konfigurationen i form av urpmi.addmedia argument.\n"
#: ../urpmq:64
#, c-format
@@ -3006,7 +3053,8 @@ msgstr " --src - nästa paket är ett källpaket (samma som -s).\n"
#: ../urpmq:65
#, c-format
-msgid " --sources - give all source packages before downloading (root only).\n"
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
msgstr " --sources - ge alla källpaket före nedladdning (endast root).\n"
#: ../urpmq:67
@@ -3101,7 +3149,8 @@ msgstr ""
#: ../urpmq:98
#, c-format
msgid " -c - complete output with package to be removed.\n"
-msgstr " -c - fullständig utmatning med paketet som ska tas bort.\n"
+msgstr ""
+" -c - fullständig utmatning med paketet som ska tas bort.\n"
#: ../urpmq:100
#, c-format
@@ -3140,7 +3189,8 @@ msgstr " -s - nästa paket är ett källpaket (samma som --src).\n"
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
-msgstr " -u - ta bort paket om en nyare version redan är installerad.\n"
+msgstr ""
+" -u - ta bort paket om en nyare version redan är installerad.\n"
#: ../urpmq:107
#, c-format
@@ -3177,28 +3227,43 @@ msgstr "använd -l för att lista filer"
#: ../urpmq:404
#, 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"
+msgstr ""
+"ingen xml-info för media \"%s\", endast ofullständigt resultat för paketet %s"
#: ../urpmq:405
#, 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"
+msgstr ""
+"ingen xml-info för media \"%s\", endast ofullständigt resultat för paketen %s"
#: ../urpmq:408
#, 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"
+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:409
#, 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"
+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:473
#, c-format
msgid "No changelog found\n"
msgstr "Ingen ändringslogg hittades\n"
+#~ msgid "examining %s file"
+#~ msgstr "undersöker %s fil"
+
+#~ msgid "invalid MD5SUM file"
+#~ msgstr "Felaktig MD5SUM fil"
+
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "hittat undersökt synthesis som %s"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - skapa ett uppdateringsmedia.\n"
@@ -3267,4 +3332,3 @@ msgstr "Ingen ändringslogg hittades\n"
#~ msgid " -c - clean headers cache directory.\n"
#~ msgstr " -c - rensa huvudcachekatalogen.\n"
-
diff --git a/po/tg.po b/po/tg.po
index 352a8e74..6548c28c 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+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"
@@ -35,7 +35,7 @@ msgstr "Коргузориши RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Ок"
@@ -104,7 +104,7 @@ msgstr "_Коргузорӣ"
msgid "_Save"
msgstr "_Нигоҳ доштан"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Бекор кардан"
@@ -136,9 +136,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - чопи ин пайғоми ёрӣ.\n"
@@ -176,20 +175,20 @@ msgstr ""
" (--no-verify-rpm онро хомӯш намоед, дохил шудааст аз "
"рӯипешфарз).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - истифодаи танҳо муҳити додашуда, бо вергул ҷудошуда.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - ба ҷустуҷӯӣ дар provides иҷозат диҳед барои дастрас "
"намуданибарномаҳои коромода.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
@@ -230,7 +229,22 @@ msgstr "Интизор бошед..."
msgid "Must be root"
msgstr "Даргоҳи муш"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "тақсимкунии %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "барномаи коромода насб мегардад..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "барномаи коромода насб мегардад..."
+
+#: ../gurpmi2:111
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -245,37 +259,37 @@ msgstr ""
msgid "Warning"
msgstr "Огоҳӣ"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "Афзоиш"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, fuzzy, c-format
msgid " (to install)"
msgstr "Коргузорӣ ба итмом расид"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Яке аз қуттиҳои зерин даркор аст:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Қатъ кардан"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -286,63 +300,58 @@ msgstr ""
"%s\n"
"Шумо розӣ ҳастед?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
"Барои қаноатмандии тобеиятҳо бастаҳои зерин кор гузошта мешаванд (%d Мб)"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
"Барои қаноатмандии тобеиятҳо бастаҳои %d зерин кор гузошта мешаванд (%d МБ)"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "барномаи коромода насб мегардад..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "қуттиҳои сарчашмавӣ гирифтан номумкин, кандашавӣ"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Тайёрӣ..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Барномаи коромодаи `%s' (%s/%s) коргузорӣ мешавад..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Лутфан муҳити бо номи \"%s\" ба дастгоҳи [%s] дароред"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Фаровири қуттии `%s'..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Шуд"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -353,28 +362,28 @@ msgstr ""
"%s\n"
"Мумкин шумо додаҳои urpmi-ро нав мекунед"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Коргузорӣ нагузашт"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Ҳамааш аллакай кор гузошта шудааст"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Коргузориш шуд"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "хориҷи қуттии %s "
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "urpmi бозоғоз шуда истодааст"
@@ -413,7 +422,7 @@ msgstr " бо нобаёнӣ %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -g - чопи гурӯҳҳо ҳамчун бо ном.\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Танҳо фавқулкорванд барои коргузоштани қуттиҳо рухсат дорад"
@@ -423,134 +432,143 @@ msgstr "Танҳо фавқулкорванд барои коргузоштан
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "Офридани феҳристи [%s] барои маърӯзаи ғалат номумкин"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "Фаровири қуттии `%s'..."
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "барои %s давраи махсус истифода мегардад\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "кушодани rpmdb номумкин"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "номи файли rpm-и нодурусти [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "барқароркунии файли rpm [%s] ..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...барқароркунӣ шуд"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...барқароркунӣ нагузашт: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "дохилшавии файли rpm-и [%s] номумкин"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "таҷзияи \"%s\" дар файли [%s] номумкин"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "бақайдгирии файли rpm номумкин"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "хатогии ба қайдгирии қуттиҳои маҳаллӣ"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "дар сатри фармонӣ proxy нодуруст нишон дода шудааст\n"
-#: ../urpm/args.pm:298
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: хондани файли rpm \"%s\" намешавад\n"
-#: ../urpm/args.pm:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Имзо мавҷуд нест (%s)"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Нусхабардорӣ нагузашт"
@@ -597,122 +615,122 @@ msgstr ""
msgid "unable to write config file [%s]"
msgstr "навиштани файли танзимдарории [%s] номумкин"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr ""
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr ""
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Номи корванд:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Гузарвожа:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr ""
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr ""
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, fuzzy, c-format
msgid "copy failed"
msgstr "Нусхабардорӣ нагузашт"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, fuzzy, c-format
msgid "wget is missing\n"
msgstr "аз сабаби мавҷуд набудан %s"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, fuzzy, c-format
msgid "curl is missing\n"
msgstr "аз сабаби мавҷуд набудан %s"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr ""
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr ""
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr ""
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr ""
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr ""
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "аз сабаби мавҷуд набудан %s"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr ""
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, fuzzy, c-format
msgid "retrieving %s"
msgstr "хориҷи қуттии %s "
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...барқароркунӣ нагузашт: %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "барои %s протоколи номуаяйн муқаррар шудааст"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr ""
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "webfetch пайдо нагардид, webfetch пуштибонӣ мегардад: %s\n"
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "даста кардани қарордод номумкин: %s"
@@ -732,58 +750,58 @@ msgstr "қуттии %s ёфт нашуд."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "барқароркунии файли rpm аз миёна \"%s\"..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr "тарокуниш барои коргузорӣ дар %s (remove=%d, install=%d, upgrade=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "офаридани муҳит номумкин аст"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "хориҷи қуттии %s номумкин"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "кор гузоштани қуттии %s номумкин"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "коргузории %s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "...барқароркунӣ нагузашт: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "хориҷкунии қуттии %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "хориҷкунии қуттии %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "коргузории %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Ахбороти изофагӣ дар бастаи %s"
@@ -828,90 +846,80 @@ msgstr "Огоҳӣ"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Коргузорӣ нагузашт"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Коргузорӣ нагузашт"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Қуттиҳои зерин имзоҳои бад доранд"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Қуттиҳои зерин имзоҳои бад доранд"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Шумо хоҳиши давом додани коргузориро доред ?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "коргузории %s"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "тақсимкунии %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "коргузории %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "коргузории %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Коргузориро бе тафтиши тобеиятҳо кӯшиш кунем? (Ҳ/Н) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Коргузориро боз устувортар (--force) кӯшиш кунем? (Ҳ/Н) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Коргузорӣ мумкин аст"
#: ../urpm/md5sum.pm:26
-#, fuzzy, c-format
-msgid "examining %s file"
-msgstr "санҷидани файли MD5SUM"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr ""
@@ -986,230 +994,230 @@ msgstr "ба ҷои аз нав намудани қуттӣ коргузорӣ
msgid "medium \"%s\" already exists"
msgstr "муҳити \"%s\" аллакай вуҷуд дорад"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "хониши сарлавҳаҳо аз миёнаи \"%s\""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "хориҷкунии миёнаи \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr ""
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "кушодани rpmdb номумкин"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"дохилшавӣ ба миёнаи коргузориши аввала номумкин (файли hdlists ёфт нашуд)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "барқароркунии файли hdlists..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "кӯшиши интихоби муҳити вуҷуд надоштаи \"%s\""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "интихобкунии миёнаи бисёр: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "хориҷкунии миёнаи \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "бозтанзимкунии urpmi барои миёнаи \"%s\""
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...бозтанзимкунӣ бо нокомӣ анҷомид"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "бозтанзимгузорӣ хотима ёфт"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "муҳити \"%s\" интихоб нашудааст"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "санҷидани файли synthesis [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "муаммои хондани файли synthesis-и муҳити \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "навиштани файли рӯйхат барои миёнаи \"%s\""
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...нусхабардорӣ нагузашт"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "нусхабардории файли тавсифоти \"%s\"..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...нусхабардорӣ шуд"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "нусхабардории [%s] бо нокомӣ анҷомид (файл шубҳаомез кӯтоҳ аст)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr ""
"аз hdlist-и аввалаи гирифташуда md5sum ҳисоб карда мешавад(ё ин ки synthesis)"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "нусхабардории [%s] бо нокомӣ анҷомид (ба md5sum мутобиқат намекунад)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "санҷидани файли hdlist [%s]"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "коргузории %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "файли hdlist барои муҳити \"%s\" ёфт нашуд"
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "нусхабардории файли тавсифоти \"%s\"..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "номи файли rpm-и нодурусти [%s]"
-#: ../urpm/media.pm:1461
-#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "барқароркунии сарчашмаи hdlist (ё synthesis) \"%s\"..."
-
-#: ../urpm/media.pm:1478
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "hdlist (ё synthesis)-и таҳқиқшуда ёфт шуд ҳамчун %s"
+msgid "no metadata found for medium \"%s\""
+msgstr "файли hdlist барои муҳити \"%s\" ёфт нашуд"
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "файли hdlist барои муҳити \"%s\" ёфт нашуд"
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "барқароркунии сарчашмаи hdlist (ё synthesis) \"%s\"..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "барои \"%s\"файли калиди кушод тафтиш карда мешавад..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...калиди гирифта шуда %s аз файли калиди кушода \"%s\""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "навиштани файли рӯйхатии \"%s\" номумкин"
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "файли hdlist барои муҳити \"%s\" ёфт нашуд"
+
+#: ../urpm/media.pm:1612
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "миёнаи иловашуда %s"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "хониши файлҳои rpm аз [%s]"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "НнNn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1280,7 +1288,7 @@ msgstr ""
msgid "TB"
msgstr ""
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1650,11 +1658,6 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "барои %s давраи махсус истифода мегардад\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1670,118 +1673,138 @@ msgstr "файли сунъии офаридаи hdlist барои муҳити
msgid "no xml-info available for medium \"%s\""
msgstr "навиштани файли рӯйхат барои миёнаи \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Қуттии бо номи %s нест"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Қуттиҳои зерин соҳиби %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Ҳамааш аллакай кор гузошта шудааст"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Ҳамааш аллакай кор гузошта шудааст"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Ҳамааш аллакай кор гузошта шудааст"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "аз сабаби мавҷуд набудан %s"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "Ҳамааш аллакай кор гузошта шудааст"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "аз сабаби қонеъ набудан %s"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "кӯшиши фаъол намудан %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "барои нигоҳдории %s"
#: ../urpm/select.pm:607
+#, fuzzy, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Қуттиҳои зерин бояд хориҷ карда шаванд, то ки дигаронаш нав кардашаванд:\n"
+"%s\n"
+"Шумо розӣ ҳастед?"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Қуттиҳои зерин бояд хориҷ карда шаванд, то ки дигаронаш нав кардашаванд:\n"
+"%s\n"
+"Шумо розӣ ҳастед?"
+
+#: ../urpm/select.pm:635
#, c-format
msgid "in order to install %s"
msgstr "барои коргузоштани %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "аз ҳисоби ба вуҷуд омадани муаммо бо %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Имзои нодуруст (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Калиди нодуруст ID (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Имзо мавҷуд нест (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "файли танзимдарории [%s] нависед"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "Нусхабардорӣ нагузашт"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "Нусхабардорӣ нагузашт"
@@ -1827,7 +1850,7 @@ msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
" --parallel - urpmi, ки аз рӯи ангалҳои мошинаҳо тақсим шудааст.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - тэг packager-ро чоп намоед: қуттӣ тартибдиҳанда.\n"
@@ -1857,7 +1880,7 @@ msgstr ""
" барои коргузорӣ (на)кардани chroot бо хосият --root "
"фоиданок аст.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - ҳолати муфассал.\n"
@@ -1925,7 +1948,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "хориҷкунии қуттии %s"
msgstr[1] "хориҷкунии қуттии %s"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (ҳ/Н) "
@@ -2203,19 +2226,24 @@ msgstr " --url - чоп намоед тэг url: url.\n"
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - чопи тасвироти тэг: тасвирот.\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - тэг conflicts-ро чоп намоед: ҳамаи мухолифатро.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
" --skip - бастаҳое, ки коргузории онҳо бояд рад карда шаванд\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, fuzzy, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr ""
" --skip - бастаҳое, ки коргузории онҳо бояд рад карда шаванд\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2225,73 +2253,73 @@ msgstr ""
"бештар пешкаш мегарданд\n"
" назар ба нобаёнӣ.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr ""
" --noclean - rpm-и истифода бурда нашударо дар пинҳонӣ нигоҳ доред.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
" -a - ҳамаи мувофиқатҳоро аз сатри фармонӣ интихоб намоед.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - усули ором.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --verbose - ҳолати муфассал.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
" номҳо ё файлҳое ки дар сатри фармони ишора шуда коргузорӣ хоҳанд шуд.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "Ҳангоми истифодаи --install-src чӣ бояд кард бо файлҳои дуии rpm"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2300,53 +2328,48 @@ msgstr ""
"Феҳристи [%s] аллакай мавҷуд аст, марҳамат карда дигар феҳристро барои "
"маърӯзаи оиди хато, истифода баред ё онро нобуд созед"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Офридани феҳристи [%s] барои маърӯзаи ғалат номумкин"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "Афзоиш"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "Афзоиш"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "Коргузорӣ ба итмом расид"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "Коргузорӣ ба итмом расид"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2354,12 +2377,12 @@ msgid ""
msgstr ""
"Барои қаноатмандии тобеиятҳо, қуттиҳои зерин хориҷ карда мешаванд (%d МБ)"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Интихоби шумо чист? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2367,7 +2390,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2375,19 +2398,19 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Ба ҳар ҳол давом диҳем?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (Ҳ/н) "
-#: ../urpmi:524
+#: ../urpmi:512
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2396,7 +2419,7 @@ msgstr ""
"Якчанд барномаҳои коромода коргузорӣ нахоҳанд шуд:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2405,13 +2428,13 @@ msgstr ""
"Якчанд барномаҳои коромода коргузорӣ нахоҳанд шуд:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr ""
"хориҷ намудани барномаи коромода %s боиси қатъи кори системи шумомегардад"
-#: ../urpmi:551
+#: ../urpmi:538
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2422,7 +2445,7 @@ msgstr ""
"кард, онгоҳ коргузориро давом додан мумкин нест\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2433,32 +2456,12 @@ msgstr ""
"кард, онгоҳ коргузориро давом додан мумкин нест\n"
"%s\n"
-#: ../urpmi:560
-#, fuzzy, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Қуттиҳои зерин бояд хориҷ карда шаванд, то ки дигаронаш нав кардашаванд:\n"
-"%s\n"
-"Шумо розӣ ҳастед?"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Қуттиҳои зерин бояд хориҷ карда шаванд, то ки дигаронаш нав кардашаванд:\n"
-"%s\n"
-"Шумо розӣ ҳастед?"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2468,7 +2471,7 @@ msgstr ""
"Шумо бояд ҳуқуқи root-ро дошта бошед барои насб намудани вобастагиҳоизерин:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
@@ -2477,39 +2480,39 @@ msgstr[0] ""
msgstr[1] ""
"Барои қаноатмандии тобеиятҳо, қуттиҳои зерин хориҷ карда мешаванд (%d МБ)"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Бекор кардан"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Вақте, ки тайёр Enter-ро пахш кунед..."
@@ -3273,6 +3276,14 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Ягон номнависи тағиротҳо пайдо нагардид\n"
+#, fuzzy
+#~ msgid "examining %s file"
+#~ msgstr "санҷидани файли MD5SUM"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "hdlist (ё synthesis)-и таҳқиқшуда ёфт шуд ҳамчун %s"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - create an update medium.\n"
diff --git a/po/th.po b/po/th.po
index f20702bd..281ec090 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+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"
@@ -29,7 +29,7 @@ msgstr "กำลังเตรียมการติดตั้ง"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -79,7 +79,7 @@ msgstr "_ติดตั้ง"
msgid "_Save"
msgstr "_บันทึก"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_ยกเลิก"
@@ -110,9 +110,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - พิมพ์ข้อความช่วย\n"
@@ -145,17 +144,17 @@ msgstr ""
" --verify-rpm - ตรวจสอบความถูกต้องของ rpm signature ก่อนการติดตั้ง\n"
" (--no-verify-rpm disable it, default is enabled)\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, fuzzy, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --update - ใช้เพื่ออัพเดตมีเดีย\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - ย้อมให้มีการค้นหาแพ็คเกจจากที่ป้อนให้\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - ไม่จำเป็นต้องค้นในส่วนแพ็คเกจที่ไว้สำหรับค้นเท่านั้น\n"
@@ -193,7 +192,22 @@ msgstr "กรุณารอ"
msgid "Must be root"
msgstr "พอร์ตของเม้าส์"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "กำลังติดตั้ง %s\n"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "การ install package"
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "การ install package"
+
+#: ../gurpmi2:111
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -206,37 +220,37 @@ msgstr "ไม่สามารถ install บางเพกเกจได้
msgid "Warning"
msgstr "คำเตือน"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "ตกลง"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr ""
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, fuzzy, c-format
msgid " (to install)"
msgstr "ออกจากการติดตั้ง"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "หนึ่งใน Packages ต่อไปนี้ต้องได้รับการติดตั้ง "
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, fuzzy, c-format
msgid "_Abort"
msgstr "เลิก"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -244,62 +258,57 @@ msgid ""
"Continue installation anyway?"
msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกลบ"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "เพื่อความถูกต้องของการเป็นอิสระระหว่างโปรแกรมแพ็คเกจบางตัวจะถูกลบทิ้ง(%d MB)"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "เพื่อความถูกต้องของการเป็นอิสระระหว่างโปรแกรมแพ็คเกจบางตัวจะถูกลบทิ้ง(%d MB)"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(แพ็คเก็จ %d ชุด, %d MB)"
-#: ../gurpmi2:250
-#, fuzzy, c-format
-msgid "Package installation..."
-msgstr "การ install package"
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "ไม่สามารถเรียก source package,กำลังยกเลิก"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "กำลังเตรียม..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, fuzzy, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr ""
"กำลังติดตั้งแพ็คเก็จ %s\n"
"%d%%"
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "กรุณาใส่อุปกรณ์ที่มีชื่อ \"%s\" ใน [%s]"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, fuzzy, c-format
msgid "Downloading package `%s'..."
msgstr "กำลังติดตั้งแพ็คเก็จ %s"
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, fuzzy, c-format
msgid "_Done"
msgstr "ทำเรียบร้อยแล้ว"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -309,28 +318,28 @@ msgstr ""
"การติดตั้งล้มเหลวมีบางไฟล์ที่ขาดหายไป\n"
"ขอแนะนำให้ทำการอัพเดตฐานข้อมูล urpmi"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "การติดตั้งไม่สำเร็จ"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "install เสร็จเรียบร้อย"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, fuzzy, c-format
msgid "removing %s"
msgstr "กำลังติดตั้ง %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, fuzzy, c-format
msgid "restarting urpmi"
msgstr "กำลังติดตั้ง $rpm\n"
@@ -367,7 +376,7 @@ msgstr " -a - เลือกมีเดียทั้งหม
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -g - พิมพ์กลุ่มพร้อมชื่อ\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "superuser เท่านั้นที่มีสิทธิติดตั้ง packages"
@@ -377,134 +386,143 @@ msgstr "superuser เท่านั้นที่มีสิทธิติ
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "ไม่สามารถสร้างไดเร็คตอรี่ [%s] สำหรับรายงานบัก"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "กำลังติดตั้งแพ็คเก็จ %s"
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr ""
+
+#: ../urpm.pm:305
#, fuzzy, c-format
msgid "unable to open rpmdb"
msgstr "ไม่สามารถเปิดแฟ้ม %s\n"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "ชื่อ rpm fileไม่ถูกต้อง [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, fuzzy, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "กำลังอ่านข้อมูลจากไฟล์ hdlists"
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "การอ่านข้อมูลเรียบร้อย"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "การอ่านข้อมูลล้มเหลว: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "ไม่สามารถใช้งาน rpm file [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "ไม่สามารถใช้งาน \"%s\" ใน file [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, fuzzy, c-format
msgid "unable to register rpm file"
msgstr "ไม่สามารถใช้งาน rpm file [%s]"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "ลงทะเบียน local package มีข้อผิดพลาด"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "การแจ้งพร็อกซี่ที่ไม่ดี\n"
-#: ../urpm/args.pm:298
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq:ไม่สามารถอ่าน rpm file \"%s\"\n"
-#: ../urpm/args.pm:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "ข้อมูลบางตัวยังไม่ได้ใส่ลงไป"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, fuzzy, c-format
msgid "Copying failed"
msgstr "ล็อกอินล้มเหลว"
@@ -551,122 +569,122 @@ msgstr ""
msgid "unable to write config file [%s]"
msgstr "ไม่สามารถเขียน config file [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr ""
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr ""
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr ""
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "รหัสผ่าน:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr ""
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr ""
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, fuzzy, c-format
msgid "copy failed"
msgstr "ล็อกอินล้มเหลว"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, fuzzy, c-format
msgid "wget is missing\n"
msgstr "ไม่มี kdesu "
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, fuzzy, c-format
msgid "curl is missing\n"
msgstr "ไม่มี kdesu "
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr ""
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr ""
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr ""
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr ""
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr ""
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "ไม่มี kdesu "
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr ""
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, fuzzy, c-format
msgid "retrieving %s"
msgstr "กำลังติดตั้ง %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "การอ่านข้อมูลล้มเหลว: %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "ไม่รู้จักโปรโตคอลที่ระบุไว้%s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr ""
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr ""
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "ไม่สามารถใช้งานโปรโตคอล: %s"
@@ -686,58 +704,58 @@ msgstr "หา %s package ไม่พบ"
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "ไม่สามารถอ่าน rpm file [%s] จาก \"%s\""
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, fuzzy, c-format
msgid "unable to create transaction"
msgstr "ไม่สามารถสร้างข้อมูลเฉพาะตัวของผู้ใช้สำหรับ ssh"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "ไม่สามารถที่จะลบแพ็คเกจ %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "ไม่สามารถติดตั้งแพ็คเกจ %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "กำลังติดตั้ง %s\n"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "การอ่านข้อมูลล้มเหลว: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "กำลังติดตั้งแพ็คเก็จ %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, fuzzy, c-format
msgid "removing package %s"
msgstr "กำลังติดตั้งแพ็คเก็จ %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "กำลังติดตั้ง %s\n"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, fuzzy, c-format
msgid "More information on package %s"
msgstr "ข้อมูลเพื่มเติมบนแพกเกจ..."
@@ -782,90 +800,80 @@ msgstr "คำเตือน"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "การติดตั้งไม่สำเร็จ"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "การติดตั้งไม่สำเร็จ"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "แพ็คเกจต่อไปนี้มี signatures ที่ไม่ถูกต้อง"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "แพ็คเกจต่อไปนี้มี signatures ที่ไม่ถูกต้อง"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "คุณยังต้องการจะติดตั้งอีกต่อไปหรือไม่ ?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "กำลังติดตั้ง %s\n"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, fuzzy, c-format
msgid "distributing %s"
msgstr "กำลังติดตั้ง %s\n"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "กำลังติดตั้ง %s\n"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, fuzzy, c-format
msgid "installing %s"
msgstr "กำลังติดตั้ง %s\n"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "ต้องการทดลองติดตั้งโดยที่ไม่ต้องตรอจสอบความเข้ากันได้? (y/N)"
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "ต้องการทดลองบังคับติดตั้ง (--force)? (y/N)"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "การติดตั้งสามารถทำได้"
#: ../urpm/md5sum.pm:26
-#, fuzzy, c-format
-msgid "examining %s file"
-msgstr "กำลังตรวจสอบไฟล์ MD5SUM"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr ""
@@ -937,228 +945,228 @@ msgstr "ปัญหาการติดตั้งแพ็คเก็จ %s
msgid "medium \"%s\" already exists"
msgstr "อุปกรณ์\"%s\"มีอยู่แล้ว"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "กำลังทำการอ่าน headers จากอุปกรณ์\"%s\""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "กำลังทำการย้ายออกอุปกรณ์\"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr ""
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "ไม่สามารถเปิดแฟ้ม %s\n"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "ไม่สามารถที่จะเข้าถึงอุปกรณ์เพื่อการติดตั้งตัวแรก (ไม่พบไฟล์ hdlists)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "กำลังอ่านข้อมูลจากไฟล์ hdlists"
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, fuzzy, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "กำลังเลี่ยงการทำงานของอุปกรณ์ \"%s\""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "พยายามที่จะเลือกใช้มีเดียหลายๆตัว: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "กำลังทำการย้ายออกอุปกรณ์\"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "กำลังเขียน list file สำหรับอุปกรณ์\"%s\""
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "บัันทึกการตั้งค่าเมนูแล้ว"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "คอนฟิกเซอเวอร์"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "อุปกรณ์ \"%s\" ไม่ได้ถูกเลือก"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "กำลังตรวจสอบไฟล์ synthesis [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "มีปัญหาในการอ่านไฟล์ synthesis สำหรับอุปกรณ์\"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "กำลังเขียน list file สำหรับอุปกรณ์\"%s\""
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, fuzzy, c-format
msgid "...copying failed"
msgstr "การคัดลอกสมบูรณ์"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "กำลังคัดลอกคำอธิบายไฟล์ของ \"%s\"..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "การคัดลอกสมบูรณ์"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "การทำสำเนา [%s] ไม่สำเร็จ"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "การดึงโค้ดจาก hdlist (หรือ synthesis)ล้มเหลว"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "การทำสำเนา [%s] ไม่สำเร็จ"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "กำลังตรวจสอบไฟล์ hdlist [%s]"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "กำลังติดตั้ง %s\n"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ไม่พบ hdlist file สำหรับอุปกรณ์\"%s\""
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "กำลังคัดลอกคำอธิบายไฟล์ของ \"%s\"..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "ชื่อ rpm fileไม่ถูกต้อง [%s]"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "กำลังดึงโค้ด hdlist (หรือ synthesis) ของ \"%s\"..."
-
-#: ../urpm/media.pm:1478
-#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "กำลังคัดลอกโค้ด hdlist (หรือ synthesis) ของ \"%s\"..."
+msgid "no metadata found for medium \"%s\""
+msgstr "ไม่พบ hdlist file สำหรับอุปกรณ์\"%s\""
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "ไม่พบ hdlist file สำหรับอุปกรณ์\"%s\""
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "กำลังดึงโค้ด hdlist (หรือ synthesis) ของ \"%s\"..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, fuzzy, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "กำลังคัดลอกคำอธิบายไฟล์ของ \"%s\"..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, fuzzy, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "ไม่สามารถเขียน list file ของ\"%s\""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, fuzzy, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "ไม่สามารถเขียน list file ของ\"%s\""
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "ไม่พบ hdlist file สำหรับอุปกรณ์\"%s\""
+
+#: ../urpm/media.pm:1612
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "อุปกรณ์ที่ถูกเพิ่มเข้ามา %s"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "กำลังอ่านไฟล์ rpm จาก [%s]"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nnม"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1229,7 +1237,7 @@ msgstr ""
msgid "TB"
msgstr ""
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1581,11 +1589,6 @@ msgstr " -f - เวอร์ชั่นที่พิมพ์,
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr ""
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1601,118 +1604,132 @@ msgstr "สร้าง hdlist synthesis file สำหรับ อุปกร
msgid "no xml-info available for medium \"%s\""
msgstr "กำลังเขียน list file สำหรับอุปกรณ์\"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "ไม่มี package ที่ชื่อ %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "packages ต่อไปนี้มี %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "ไม่มี kdesu "
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, fuzzy, c-format
msgid "due to unsatisfied %s"
msgstr "ไม่มี kdesu "
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, fuzzy, c-format
msgid "trying to promote %s"
msgstr "ไม่มีอะไรที่ต้องลบทิ้ง\n"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, fuzzy, c-format
msgid "in order to keep %s"
msgstr "Window border theme"
#: ../urpm/select.pm:607
#, fuzzy, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกลบ"
+
+#: ../urpm/select.pm:608
+#, fuzzy, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกลบ"
+
+#: ../urpm/select.pm:635
+#, fuzzy, c-format
msgid "in order to install %s"
msgstr "ไม่สามารถติดตั้งแพ็คเกจ %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "%s ขัดแย้งกับ %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, fuzzy, c-format
msgid "Invalid signature (%s)"
msgstr "ข้อมูลบางตัวยังไม่ได้ใส่ลงไป"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr ""
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, fuzzy, c-format
msgid "Missing signature (%s)"
msgstr "ข้อมูลบางตัวยังไม่ได้ใส่ลงไป"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "ไม่สามารถเขียน config file [%s]"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "ล็อกอินล้มเหลว"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "ล็อกอินล้มเหลว"
@@ -1753,7 +1770,7 @@ msgstr " --test - ตรวจสอบว่าการติดต
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - distributed urpmi across machines of alias.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --list - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
@@ -1780,7 +1797,7 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " -v - โหมดคำ\n"
@@ -1840,7 +1857,7 @@ msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "กำลังติดตั้งแพ็คเก็จ %s"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (y/N) "
@@ -2086,152 +2103,152 @@ msgstr " --help - พิมพ์ข้อความช่วย\n"
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - พิมพ์ tag รายละเอียด : รายละเอียด"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts -พิมพ์ tag ที่เข้ากันไม่ได้:เข้ากันไม่ได้ทั้งหมด(หลายบรรทัด)."
+
+#: ../urpmi:143
#, fuzzy, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --test - ตรวจสอบว่าการติดตั้งสามารถทำได้ถูกต้องหรือไม่.\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, fuzzy, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --test - ตรวจสอบว่าการติดตั้งสามารถทำได้ถูกต้องหรือไม่.\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:146
+#: ../urpmi:147
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - เก็บ rpm ซึ่งไม่ถูกใช้ใน cache.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - เลือกทั้งหมดที่ตรงกับคำสั่งที่พิมพ์\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - โหมดเงียบ\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " -v - โหมดคำ\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, fuzzy, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr "ชื่อของไฟล์หรือของ rpm ที่ให้จากคำสั่งที่พิมพ์กำลังถูกค้นหา\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, fuzzy, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr "ชื่อกลุ่มนี้มีอยู่แล้ว กรุณาเลือกชื่ออื่น"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "ไม่สามารถสร้างไดเร็คตอรี่ [%s] สำหรับรายงานบัก"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr ""
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "ออกจากการติดตั้ง"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "ออกจากการติดตั้ง"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "เพื่อความถูกต้องของการเป็นอิสระระหว่างโปรแกรมแพ็คเกจบางตัวจะถูกลบทิ้ง(%d MB)"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "ต้องการเลือกอะไรครับ (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2239,7 +2256,7 @@ msgid ""
"%s"
msgstr "ไม่สามารถ install บางเพกเกจได้"
-#: ../urpmi:509
+#: ../urpmi:497
#, fuzzy, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2247,38 +2264,38 @@ msgid ""
"%s"
msgstr "ไม่สามารถ install บางเพกเกจได้"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "คุณยังต้องการจะติดตั้งอีกต่อไปหรือไม่ ?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (Y/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
"%s"
msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
-#: ../urpmi:525
+#: ../urpmi:513
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s"
msgstr "ไม่สามารถ install บางเพกเกจได้"
-#: ../urpmi:542
+#: ../urpmi:530
#, fuzzy, c-format
msgid "removing package %s will break your system"
msgstr "แพ็คเกจ %s ที่กำลังลบอยู่จะทำให้ระบบเสียหายได้\n"
-#: ../urpmi:551
+#: ../urpmi:538
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2289,7 +2306,7 @@ msgstr ""
"%s\n"
"คุณยอมให้ทำการลบทิ้งหรือไม่?"
-#: ../urpmi:553
+#: ../urpmi:540
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2300,26 +2317,12 @@ msgstr ""
"%s\n"
"คุณยอมให้ทำการลบทิ้งหรือไม่?"
-#: ../urpmi:560
-#, fuzzy, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกลบ"
-
-#: ../urpmi:561
-#, fuzzy, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกลบ"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2329,44 +2332,44 @@ msgstr ""
"คุณจะต้องเป็นรูทในการติดตั้ง ความเป็นอิสระ :\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "เพื่อความถูกต้องของการเป็นอิสระระหว่างโปรแกรมแพ็คเกจบางตัวจะถูกลบทิ้ง(%d MB)"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "ยกเลิก"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "กรุณากด enter เมื่อพร้อม"
@@ -3066,6 +3069,14 @@ msgstr ""
msgid "No changelog found\n"
msgstr "ไม่พบรุปภาพ"
+#, fuzzy
+#~ msgid "examining %s file"
+#~ msgstr "กำลังตรวจสอบไฟล์ MD5SUM"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "กำลังคัดลอกโค้ด hdlist (หรือ synthesis) ของ \"%s\"..."
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - สร้างอุปกรณ์เพื่อการอัพเดต\n"
diff --git a/po/tl.po b/po/tl.po
index 5a9684b9..4f96c532 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+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"
@@ -27,7 +27,7 @@ msgstr "Pag-install ng RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -96,7 +96,7 @@ msgstr "I-install"
msgid "_Save"
msgstr "Save"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Cancel"
@@ -128,9 +128,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - i-print itong tulong na mensahe.\n"
@@ -168,20 +167,20 @@ msgstr ""
" (--no-verify-rpm ay idi-disable ito, default ay "
"gumagana).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - gamitin lang ang binigay na media, hiniwilay ng comma/"
"kuwit.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - payagang maghanap sa provides para hanapin ang package.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
@@ -223,7 +222,22 @@ msgstr "Pakihintay."
msgid "Must be root"
msgstr "Kailangan na kayo ay root"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "dini-distribute ang %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Pag-i-install ng package..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Pag-i-install ng package..."
+
+#: ../gurpmi2:111
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -238,37 +252,37 @@ msgstr ""
msgid "Warning"
msgstr "Babala"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Ayos"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr " (i-upgrade)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, fuzzy, c-format
msgid " (to install)"
msgstr " (i-install)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Isa sa mga sumusunod na package ay kailangan:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, fuzzy, c-format
msgid "_Abort"
msgstr "_Abort"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -279,7 +293,7 @@ msgstr ""
"%s\n"
"Magpatuloy?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
@@ -287,7 +301,7 @@ msgstr ""
"Para ma-satisfy ang dependency/pagkaka-asa-asa, ang mga sumusunod na %d "
"package ay ii-install (%d MB)"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -295,49 +309,44 @@ msgstr ""
"Para ma-satisfy ang dependency/pagkaka-asa-asa, ang mga sumusunod na %d "
"package ay ii-install (%d MB)"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Pag-i-install ng package..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "hindi makuha ang mga source package, hindi tumutuloy"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Naghahanda..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Ini-install ang package na `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Pakisuksok ang medium na may pangalang \"%s\" sa device na [%s]"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Dina-download ang package na `%s'..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, fuzzy, c-format
msgid "_Done"
msgstr "Tapos"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -348,28 +357,28 @@ msgstr ""
"%s\n"
"Baka gusto mong i-update ang iyong urpmi database"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Pag-i-install ay nabigo"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Lahat ay naka-install na"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Natapos na ang pag-install"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "inaalis ang %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "sinisimulan muli ang urpmi"
@@ -410,7 +419,7 @@ msgstr " defaults ay %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -g - i-print ang mga grupo na may pangalan din.\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Superuser lamang ang pinapayagang mag-install ng mga package"
@@ -420,134 +429,143 @@ msgstr "Superuser lamang ang pinapayagang mag-install ng mga package"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "Hindi magawa ang directory na [%s] para sa ulat ng bug"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "Dina-download ang package na `%s'..."
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "ginagamit ang specific environment sa %s\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "hindi mabuksan ang rpmdb"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "inbalidong pangalan ng rpm file [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "kinukuha muli ang rpm file [%s] ..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...pagkukuha muli natapos"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...pagkukuha muli nabigo: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "hindi ma-access ang rpm file [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "hindi ma-parse ang \"%s\" sa file [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "hindi mairehistro ang rpm file"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "error sa pagrerehistro ng mga local package"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "masamang pagdeklara ng proxy sa command line\n"
-#: ../urpm/args.pm:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Nawawalang signature (%s)"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Pagkokopya nabigo"
@@ -594,122 +612,122 @@ msgstr ""
msgid "unable to write config file [%s]"
msgstr "hindi maisulat ang config file [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr ""
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr ""
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr ""
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Password:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr ""
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr ""
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, fuzzy, c-format
msgid "copy failed"
msgstr "Pagkokopya nabigo"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, fuzzy, c-format
msgid "wget is missing\n"
msgstr "dahil sa nawawalang %s"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, fuzzy, c-format
msgid "curl is missing\n"
msgstr "dahil sa nawawalang %s"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr ""
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr ""
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr ""
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr ""
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr ""
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "dahil sa nawawalang %s"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr ""
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, fuzzy, c-format
msgid "retrieving %s"
msgstr "inaalis ang %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...pagkukuha muli nabigo: %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "hindi kilalang protocol naka-define para sa %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr ""
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, 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:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "hindi ma-handle ang protocol: %s"
@@ -729,12 +747,12 @@ msgstr "package na %s ay hindi nahanap."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "kinukuha muli ang mga rpm file mula sa medium na \"%s\"..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -742,47 +760,47 @@ msgstr ""
"gumawa ng transaksyon para sa pag-i-install sa %s (alisin=%d, i-install=%d, "
"i-upgrade=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "hindi magawa ang transaksyon"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "hindi maalis ang package na %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "hindi ma-install ang package na %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "ini-install ang %s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "...pagkukuha muli nabigo: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "inaalis ang package na %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "inaalis ang package na %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "ini-install ang %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, fuzzy, c-format
msgid "More information on package %s"
msgstr "Mas maraming inpormasyon sa package..."
@@ -827,91 +845,81 @@ msgstr "Babala"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Pag-i-install ay nabigo"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Pag-i-install ay nabigo"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Ang mga sumusunod na package ay may masamang signature"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Ang mga sumusunod na package ay may masamang signature"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Gusto mong ituloy ang pag-i-install ?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "ini-install ang %s"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "dini-distribute ang %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "ini-install ang %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "ini-install ang %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Subukan ang pag-i-install na hindi sinusuri ang mga dependency? (o/H) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Subukan ang pag-i-install nang mas malakas (--force)? (o/H) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Pag-i-install ay maaari"
#: ../urpm/md5sum.pm:26
#, fuzzy, c-format
-msgid "examining %s file"
-msgstr "sinusuri ang MD5SUM file"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
-#, fuzzy, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "babala: md5sum para sa %s ay wala sa talaksang MD5SUM"
@@ -985,228 +993,228 @@ msgstr "i-install imbis na i-upgrade ang package na %s"
msgid "medium \"%s\" already exists"
msgstr "medium na \"%s\" ay mayroon na"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "binabasa ang mga header mula sa medium na \"%s\""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "inaalis ang medium na \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr ""
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "hindi mabuksan ang rpmdb"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "hindi ma-access ang unang installation medium (walang hdlists na file)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "kinukuha muli ang hdlists file..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "sinusubukang piliin ang di-mayroong medium na \"%s\""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "pumipili ng maramihang media: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "inaalis ang medium na \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "kinukuha muli ang mga rpm file mula sa medium na \"%s\"..."
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "Configuration file"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "Pagsasaayos ng Server"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "medium na \"%s\" ay hindi nakapili"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "sinusuri ang synthesis file [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problema sa pagbabasa ng synthesis file ng medium na \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "isinusulat ang list file para sa medium na \"%s\""
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...pagkokopya nabigo"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kinokopya ang paglalarawan na file ng \"%s\"..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...pagkokopya natapos"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "pagkopya ng [%s] nabigo (file ay kahina-hinalang maliit)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "kino-compute ang md5sum ng nakuhang source hdlist (o synthesis)"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "pagkopya ng [%s] nabigo (md5sum di-tugma)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "sinusuri ang hdlist file [%s]"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "ini-install ang %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "walang nahanap na hdlist file para sa medium na \"%s\""
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "kinokopya ang paglalarawan na file ng \"%s\"..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "inbalidong pangalan ng rpm file [%s]"
-#: ../urpm/media.pm:1461
-#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "kinukuha muli ang source hdlist (o synthesis) ng \"%s\"..."
-
-#: ../urpm/media.pm:1478
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "nahanap ang sinuring hdlist (o synthesis) bilang %s"
+msgid "no metadata found for medium \"%s\""
+msgstr "walang nahanap na hdlist file para sa medium na \"%s\""
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "walang nahanap na hdlist file para sa medium na \"%s\""
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "kinukuha muli ang source hdlist (o synthesis) ng \"%s\"..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "sinusuri ang pubkey file ng \"%s\"..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...in-import ang key na %s mula sa pubkey file ng \"%s\""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "hindi ma-import ang pubkey file ng \"%s\""
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "walang nahanap na hdlist file para sa medium na \"%s\""
+
+#: ../urpm/media.pm:1612
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "idinagdag ang medium na %s"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "binabasa ang mga rpm file mula sa [%s]"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "HhNn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1277,7 +1285,7 @@ msgstr ""
msgid "TB"
msgstr ""
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1654,11 +1662,6 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "ginagamit ang specific environment sa %s\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1674,118 +1677,136 @@ msgstr "nakabuo ng hdlist synthesis file para sa medium na \"%s\""
msgid "no xml-info available for medium \"%s\""
msgstr "isinusulat ang list file para sa medium na \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Walang package na may pangalang %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Ang mga sumusunod na package ay naglalaman ng %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Lahat ay naka-install na"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Lahat ay naka-install na"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Lahat ay naka-install na"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "dahil sa nawawalang %s"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "Lahat ay naka-install na"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "dahil sa hindi na-satisfy na %s"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "sinusubukang i-promote ang %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "para maitago ang %s"
#: ../urpm/select.pm:607
+#, fuzzy, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Ang mga sumusunod na package ay dapat alisin para ma-upgrade ang iba:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Ang mga sumusunod na package ay dapat alisin para ma-upgrade ang iba:\n"
+"%s"
+
+#: ../urpm/select.pm:635
#, c-format
msgid "in order to install %s"
msgstr "para ma-install ang %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "dahil sa pagkakasalungat sa %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Inbalidong signature (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Inbalidong Key ID (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Nawawalang signature (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "hindi maisulat ang config file [%s]"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "Pagkokopya nabigo"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "Pagkokopya nabigo"
@@ -1830,7 +1851,7 @@ msgstr ""
" --parallel - distributed/nakapamahagi na urpmi sa mga makina ng "
"alias.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - i-print ang tag packager: taga-package.\n"
@@ -1862,7 +1883,7 @@ msgstr ""
" tree, magagamit para sa mag-(un)install ng chroot na may\n"
" option na --root.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - masalita na paraan.\n"
@@ -1929,7 +1950,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "inaalis ang package na %s"
msgstr[1] "inaalis ang package na %s"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (o/H) "
@@ -2198,17 +2219,23 @@ msgstr " --url - i-print ang tag url: url.\n"
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - i-print ang tag description: paglalarawan.\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr ""
+" --conflicts - i-print ang tag conflicts: lahat ng pagkakasalungat.\n"
+
+#: ../urpmi:143
#, fuzzy, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --test - subukan kung makakamit ng tama ang pag-i-install.\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, fuzzy, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --test - subukan kung makakamit ng tama ang pag-i-install.\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, fuzzy, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2218,73 +2245,73 @@ msgstr ""
"maraming\n"
" papagpilian kaysa sa default.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - ingatan ang rpm na hindi ginagamit sa cache.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, fuzzy, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
" --strict-arch - iapgreyd lamang ang mga paketeng pareho ang arkitektura.\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - piliin lahat ng katugma sa command line.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - tahimik na paraan.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --verbose - masalita na paraan.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
" ang mga pangalan o rpm file na binigay sa command line ay ii-install.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
"Ano ang magagawa sa mga binary rpm file kung ginagamit ang --install-src"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2293,17 +2320,12 @@ msgstr ""
"Directory na [%s] ay meron na, gumamit ng ibang directory para sa ulat ng "
"bug o alisin ito"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Hindi magawa ang directory na [%s] para sa ulat ng bug"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, fuzzy, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2312,36 +2334,36 @@ msgstr ""
"Error: mukhang ang %s ay nakalapat na read-only.\n"
"Gamitin ang --allow-force upang pilitin ang operasyon."
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (i-upgrade)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (i-upgrade)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (i-install)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (i-install)"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2349,12 +2371,12 @@ msgid ""
msgstr ""
"Para ma-satisfy ang dependency, ang sumusunod na package ay aalisin (%d MB)"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Ano ang pili mo? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2365,7 +2387,7 @@ msgstr ""
"pakete na mas-luma sa nakaluklok:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, fuzzy, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2376,19 +2398,19 @@ msgstr ""
"pakete na mas-luma sa nakaluklok:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Magpatuloy kahit paano?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (O/h) "
-#: ../urpmi:524
+#: ../urpmi:512
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2397,7 +2419,7 @@ msgstr ""
"Ilang package na hiniling ay hindi ma-install:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2406,12 +2428,12 @@ msgstr ""
"Ilang package na hiniling ay hindi ma-install:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "ang pag-aalis ng package na %s ay sisira ng sistema mo"
-#: ../urpmi:551
+#: ../urpmi:538
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2422,7 +2444,7 @@ msgstr ""
"package ay dapat alisin para ma-upgrade ang iba:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2433,30 +2455,12 @@ msgstr ""
"package ay dapat alisin para ma-upgrade ang iba:\n"
"%s\n"
-#: ../urpmi:560
-#, fuzzy, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Ang mga sumusunod na package ay dapat alisin para ma-upgrade ang iba:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Ang mga sumusunod na package ay dapat alisin para ma-upgrade ang iba:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2466,7 +2470,7 @@ msgstr ""
"Kailangan mong maging root para i-install ang mga sumusunod na dependency:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
@@ -2475,39 +2479,39 @@ msgstr[0] ""
msgstr[1] ""
"Para ma-satisfy ang dependency, ang sumusunod na package ay aalisin (%d MB)"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "I-cancel"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Pindutin ang Enter kung handa na..."
@@ -3277,6 +3281,14 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Walang nahanap na changelog\n"
+#, fuzzy
+#~ msgid "examining %s file"
+#~ msgstr "sinusuri ang MD5SUM file"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "nahanap ang sinuring hdlist (o synthesis) bilang %s"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - gumawa ng update medium.\n"
diff --git a/po/tr.po b/po/tr.po
index 78976c1e..e4924220 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -14,7 +14,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
-"POT-Creation-Date: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2008-10-07 13:40+0200\n"
"Last-Translator: Atilla ÖNTAŞ <atilla_ontas@mandriva.org>\n"
"Language-Team: Turkish <cooker-i18n@mandrivalinux.org>\n"
@@ -34,7 +34,7 @@ msgstr "RPM Paketi Kurulumu"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Hata: %s bulunamadı, işlem iptal edilecek"
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Tamam"
@@ -100,7 +100,7 @@ msgstr "_Kur"
msgid "_Save"
msgstr "_Kaydet"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "İp_tal"
@@ -132,9 +132,8 @@ msgstr ""
msgid "Options:"
msgstr "Seçenekler:"
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - bu yardım mesajını görüntüler.\n"
@@ -150,12 +149,14 @@ msgstr ""
#: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
msgstr " --auto-select - Sistemi güncellemek için paketleri otomatik seç.\n"
#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
msgstr ""
" --force - bazı paketlerin bulunamama durumda bile işlemin\n"
" devamına zorla.\n"
@@ -169,17 +170,18 @@ msgstr ""
" --verify-rpm - kurulumdan önce rpm imzasını doğrula\n"
" (--no-verify-rpm bunu iptal eder, öntanımlı etkindir).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
-msgstr " --media - sadece belirtilen ortamları kullan (virgülle ayırın).\n"
+msgstr ""
+" --media - sadece belirtilen ortamları kullan (virgülle ayırın).\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - paketi bulmak için aramaya izin ver.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
@@ -200,8 +202,11 @@ msgstr " --test - kurulumun başarılı olup olmayacağını doğrula.\
#: ../gurpmi.pm:57 ../urpmi:76
#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
-msgstr " --searchmedia - istenen paketleri sadece verilen kurulum kaynaklarında ara.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - istenen paketleri sadece verilen kurulum kaynaklarında "
+"ara.\n"
#: ../gurpmi.pm:100
#, c-format
@@ -218,7 +223,22 @@ msgstr "Lütfen bekleyiniz..."
msgid "Must be root"
msgstr "Yetkili kullanıcı olunmalı"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "%s dağıtılıyor"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Paket kurulumu..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Paket kurulumu..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -234,37 +254,37 @@ msgstr ""
msgid "Warning"
msgstr "Uyarı"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Tamam"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (güncellenecek)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (yüklenecek)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Paket seçimi"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Aşağıdaki paketlerden birine ihtiyaç var:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "D_urdur"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -276,59 +296,58 @@ msgstr ""
"%s\n"
"Yine de devam edilsin mi?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
-msgstr "Bağımlılık sorununu aşabilmek için, aşağıdaki paketin kurulması gerekiyor:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
+msgstr ""
+"Bağımlılık sorununu aşabilmek için, aşağıdaki paketin kurulması gerekiyor:"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
-msgstr "Bağımlılık sorununu aşabilmek için, aşağıdaki paketlerin kurulması gerekiyor:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr ""
+"Bağımlılık sorununu aşabilmek için, aşağıdaki paketlerin kurulması gerekiyor:"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d paket, %d MB)"
msgstr[1] "(%d paket, %d MB)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Paket kurulumu..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "kaynak paketleri alınamadı, çıkılıyor"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Hazırlanıyor..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "'%s' paketi kuruluyor ( %s/%s )..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Lütfen \"%s\" isimli ortamı yerleştirin"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "'%s' paketi indiriliyor..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Bitti"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -339,28 +358,28 @@ msgstr ""
"%s\n"
"Urpmi veritabanınızı güncellemek isteyebilirsiniz"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "Kurulum başarısız oldu"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Herşey zaten kurulu"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Kurulum tamamlandı"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "%s kaldırılıyor"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "urpmi yeniden başlatılıyor."
@@ -399,7 +418,7 @@ msgstr " %s için varsayılan.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - rpm'in tam adı çıktısı (NVRA)\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Paketleri kurmak için sadece sistem yöneticisi yetkilidir"
@@ -409,136 +428,145 @@ msgstr "Paketleri kurmak için sadece sistem yöneticisi yetkilidir"
msgid "Running urpmi in restricted mode..."
msgstr "Urpmi kısıtlı kipte çalışıyor..."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, c-format
msgid "fail to create directory %s"
msgstr "%s oluşturulamıyor."
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr "%s dizininin sahipliği geçersiz."
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, c-format
msgid "Can not download packages into %s"
msgstr "Paketler %s içine indirilemiyor"
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr "Ortam değişkenleri dizini %s mevcut değil."
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "%s' de belirtilen ortam kullanılıyor\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "rpm veritabanı açılamıyor"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "rpm dosya ismi [%s] geçersiz"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "Rpm dosyası [%s] getiriliyor..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...alma tamamlandı"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...getirme başarısız: [%s]"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "rpm dosyasına [%s] erişilemiyor"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "%s [%s] spec dosyası ayrıştırılamıyor"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "rpm dosyası kayıt edilemiyor"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "[%s] rpm paketi için uyumsuz mimari"
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "yerel paketlerin sicil kaydı yapılırken hata"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
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:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "komut satırından kötü vekil sunucu bildirimi\n"
-#: ../urpm/args.pm:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "beklenmeyen ifade %s"
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "%s 'den önce kayıp ifade"
-#: ../urpm/args.pm:382
+#: ../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:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "kapatmak için ifade yok"
-#: ../urpm/args.pm:395
+#: ../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:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot dizini geçerli değil"
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr "%s, %s olmadan kullanılamaz"
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr "%s, %s ile kullanılamaz"
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr "Çok fazla parametre\n"
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Kopyalama başarısız"
@@ -587,122 +615,122 @@ msgstr "`%s' ortamı ikinci defa tanımlandı, iptal ediliyor"
msgid "unable to write config file [%s]"
msgstr "yapılandırma dosyasına [%s] yazılamıyor"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "%s mevcut değil, %s e dönülüyor"
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr "Vekil sunucu ayarları okunamıyor (%s okumak için yeterli yetki yok)"
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Lütfen proxy erişimi için gerekli bilgileri giriniz\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Kullanıcı adı:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Parola:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr "Bilinmeyen webfetch `%s' !!!\n"
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr "%s hatası: %d sinayli ile çıkıldı."
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr "%s hatası: %d ile çıkıldı."
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, c-format
msgid "copy failed"
msgstr "Kopyalama başarısız"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, c-format
msgid "wget is missing\n"
msgstr "wget bulunamıyor.\n"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, c-format
msgid "curl is missing\n"
msgstr "curl bulunamıyor.\n"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr "curl hatası: indirme iptal edildi\n"
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr "rsync bulunamıyor\n"
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr "ssh bulunamıyor\n"
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr "prozilla bulunamıyor\n"
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr "Prozilla çalıştırılamadı\n"
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, c-format
msgid "aria2 is missing\n"
msgstr "aria2 bulunamıyor\n"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr " %s%% / %s tamamlandı, ETA = %s, hız = %s"
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr " %s%% tamamlandı, hız = %s"
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, c-format
msgid "retrieving %s"
msgstr "%s getiriliyor"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, c-format
msgid "retrieved %s"
msgstr "getirildi: [%s]"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "%s için bilinmeyen protokol tanımlanmış"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "%s mevcut değil, %s e dönülüyor"
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "geçerli webfetch bulunamadı, desteklenen webfetch: %s\n"
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "%s protokolü ile ilgilenemiyor"
@@ -722,57 +750,59 @@ msgstr "%s paketi bulunamadı."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "rpm dosyaları \"%s\" ortamından alınıyor..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr "[tekrar paketleniyor]"
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "%s üzerine yükleme için işlem yaratıldı (sil=%d, yükle=%d, güncelle=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"%s üzerine yükleme için işlem yaratıldı (sil=%d, yükle=%d, güncelle=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "işlem oluşturulamıyor"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "rpm, %s delta-rpm paketinden çıkartılamıyor"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "%s paketi kurulamıyor"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "hatalı rpm (%s), %s kaynağından kaldırılıyor"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, c-format
msgid "removing %s failed: %s"
msgstr "%s 'in kaldırılması başarısız oldu: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, c-format
msgid "Removing package %s"
msgstr "%s paketi kaldırılıyor"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "%s paketi kaldırılıyor"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "kurulu rpm'ler (%s), %s kaynağından kaldırılıyor"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "%s paketi hakkında daha fazla bilgi..."
@@ -817,18 +847,18 @@ msgstr "iptal ediliyor"
msgid "%s database is locked (another program is already using it)"
msgstr "%s veritabanı kilitli.(bir başka yazılım onu kullanıyor)"
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Kurulum başarısız oldu."
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr "Yine de devam edilsin mi? (e/H)"
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -837,73 +867,63 @@ msgstr ""
"Kurulum başarısız oldu. Hatalı rpm'ler:\n"
"%s"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, c-format
msgid "The following package has bad signature"
msgstr "Sonraki paketler hatalı imza içeriyor"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Sonraki paketler hatalı imza içeriyor"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Kuruluma devam etmek istiyor musunuz ?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, c-format
msgid "removing installed rpms (%s)"
msgstr "kurulu rpm'ler (%s) kaldırılıyor."
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "%s dağıtılıyor"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "%s, %s konumundan kuruluyor"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "%s kuruluyor"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Paket bağımlılıklarını denetlemeksizin kurulum denensin mi (e/H) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Belki daha zorlayıcı bir seçenek gerekebilir (--force)? (e/H) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr "Paketler güncel"
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Kurulum mümkün"
#: ../urpm/md5sum.pm:26
#, c-format
-msgid "examining %s file"
-msgstr "%s dosyası sınanıyor"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr "geçersiz MD5SUM dosyası"
-
-#: ../urpm/md5sum.pm:28
-#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "uyarı: %s için md5sum, MD5SUM dosyasında mevcut değil."
@@ -930,7 +950,8 @@ msgstr "varolan \"%s\" ortamı atlanmaya çalışılırken engelleniyor"
#: ../urpm/media.pm:456
#, c-format
msgid "failed to migrate removable device, ignoring media"
-msgstr "çıkartılabilir disk aktarımı başarısız oldu, kurulum kaynağı yok sayılıyor"
+msgstr ""
+"çıkartılabilir disk aktarımı başarısız oldu, kurulum kaynağı yok sayılıyor"
#: ../urpm/media.pm:499 ../urpm/media.pm:505
#, c-format
@@ -976,228 +997,228 @@ msgstr "%s paketinin yükseltilmesi yerine kurulması"
msgid "medium \"%s\" already exists"
msgstr "\"%s\" ortamı zaten var"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr "(varsayılan olarak yok sayıldı)"
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "\"%s\" ortamı, \"%s\" uzak kaynağından önce ekleniyor"
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, c-format
msgid "adding medium \"%s\""
msgstr "\"%s\" ortamı ekleniyor."
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr "%s dizini mevcut değil"
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "bu konum herhangi bir dağıtım içermiyor"
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, c-format
msgid "unable to parse media.cfg"
msgstr "media.cfg dosyasının sözdizimsel analizi yapılamıyor."
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "dağıtım ortamına ulaşılamıyor. (media.cfg dosyası bulunamadı.)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr "desteklenmeyen ortam atlanıyor `%s' (for %s)"
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, c-format
msgid "retrieving media.cfg file..."
msgstr "media.cfg dosyası alınıyor..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "var olmayan \"%s\" ortamı seçilmeye çalışılıyor"
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "çoklu kurulum kaynağı seçiliyor: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "\"%s\" ortamı kaldırılıyor."
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "\"%s\" ortamı için urpmi yeniden ayarlanıyor."
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "yeniden ayarlama başarısız oldu."
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "yeniden ayarlama tamamlandı."
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Adlar dosyasının üretiminde hata: %d bağımlılığı bulunamadı."
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "\"%s\" ortamı güncel."
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "sentez dosyası [%s] inceleniyor"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "\"%s\" ortamının sentezleme dosyasının okunmasında hata"
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "\"%s\" ortamı için [%s] kopyalanıyor..."
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...kopyalama başarısız"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "\"%s\"in açıklama dosyası kopyalanıyor..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...kopyalama tamamlandı."
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "[%s] kopyalaması başarısız. (dosya şüphe çekecek kadar ufak)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "Alınan kaynak sentezi'nin md5sum özeti hesaplanıyor."
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "[%s] alımı başarısız oldu. (md5sum eşleşmedi.)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, c-format
msgid "genhdlist2 failed on %s"
msgstr "%s üzerinde genhdlist2 başarısız oldu."
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, c-format
msgid "comparing %s and %s"
msgstr "%s ve %s karşılaştırılıyor."
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "\"%s\" ortamı için geçersiz %s hdlist dosyası."
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "\"%s\"in MD5SUM dosyası kopyalanıyor..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "geçersiz MD5SUM dosyası (%s adresinden indirilmiş)"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
+#, fuzzy, c-format
+msgid "no metadata found for medium \"%s\""
+msgstr "\"%s\" ortamı için sentez dosyası bulunamadı."
+
+#: ../urpm/media.pm:1475
#, c-format
msgid "retrieving source synthesis of \"%s\"..."
msgstr "\"%s\" in kaynak sentezi getiriliyor..."
-#: ../urpm/media.pm:1478
-#, c-format
-msgid "found probed synthesis as %s"
-msgstr "incelenmiş sentez %s olarak bulundu."
-
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
-#, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "\"%s\" ortamı için sentez dosyası bulunamadı."
-
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "\"%s\" pubanahtarı sınanıyor..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...%s anahtarı \"%s\" pubanahtarından içe aktarıldı."
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "\"%s\" pubanahtarı içe aktarılamıyor."
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "\"%s\" ortamı için sentez dosyası bulunamadı."
+
+#: ../urpm/media.pm:1612
#, c-format
msgid "updated medium \"%s\""
msgstr "\"%s\" ortamı güncellendi."
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr "[%s] alımı başarısız oldu"
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr "%s yansısı ile tekrar deneniyor"
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr "%s yansı listesinden bir yansı bulunamadı."
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr "%s %.2f %.2f coğrafi konumu, %s zaman bölgesinden bulundu."
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, c-format
msgid "getting mirror list from %s"
msgstr "yansı listesini %s adresinden al"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "HhNn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1268,7 +1289,7 @@ msgstr "GB"
msgid "TB"
msgstr "TB"
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1277,11 +1298,11 @@ msgid_plural ""
"The following packages are now orphans, use \"urpme --auto-orphans\" to "
"remove them."
msgstr[0] ""
-"Aşağıdaki paketler artık gereksiz, \"urpme --auto-orphans\" kullanarak sistemden "
-"
kaldırabilirsiniz."
+"Aşağıdaki paketler artık gereksiz, \"urpme --auto-orphans\" kullanarak "
+"sistemden 
kaldırabilirsiniz."
msgstr[1] ""
-"Aşağıdaki paketler artık gereksiz, \"urpme --auto-orphans\" kullanarak sistemden "
-"
kaldırabilirsiniz."
+"Aşağıdaki paketler artık gereksiz, \"urpme --auto-orphans\" kullanarak "
+"sistemden 
kaldırabilirsiniz."
#: ../urpm/parallel.pm:14
#, c-format
@@ -1339,8 +1360,8 @@ msgid ""
"%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
"code: %d)"
msgstr ""
-"%s, %s makinesinde başarısız oldu. (belki urpmi' nin iyi bir sürümü değildir?) (çıkış "
-"
kodu: %d)"
+"%s, %s makinesinde başarısız oldu. (belki urpmi' nin iyi bir sürümü "
+"değildir?) (çıkış 
kodu: %d)"
#: ../urpm/removable.pm:32
#, c-format
@@ -1381,16 +1402,20 @@ msgstr " --version - bu aracın sürüm numarasını yazdır.\n"
#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
-msgstr " --env - belirli bir çevre kullan (genellikle bir hata raporu).\n"
+msgstr ""
+" --env - belirli bir çevre kullan (genellikle bir hata raporu).\n"
#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
-msgstr " --excludemedia - virgülle ayrılmış olan verilen kurulum kaynağını kullanma.\n"
+msgstr ""
+" --excludemedia - virgülle ayrılmış olan verilen kurulum kaynağını "
+"kullanma.\n"
#: ../urpm/search.pm:39 ../urpmf:39
#, c-format
-msgid " --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
" --literal, -l - örnekleri eşleştirme, argümanı bri tam satır olarak "
"kullan.\n"
@@ -1406,18 +1431,23 @@ msgstr ""
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
#, c-format
-msgid " --sortmedia - sort media according to substrings separated by comma.\n"
-msgstr " --sortmedia - virgülle ayrılan alt satırlara göre kurulum kaynağı sırala.\n"
+msgid ""
+" --sortmedia - sort media according to substrings separated by comma.\n"
+msgstr ""
+" --sortmedia - virgülle ayrılan alt satırlara göre kurulum kaynağı "
+"sırala.\n"
#: ../urpm/search.pm:43 ../urpmf:43
#, c-format
msgid " --use-distrib - use the given path to access media\n"
-msgstr " --use-distrib - kurulum kaynağına erişim için verilen yolu kullan.\n"
+msgstr ""
+" --use-distrib - kurulum kaynağına erişim için verilen yolu kullan.\n"
#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
-msgstr " --synthesis - urpmi veri tabanı yerine belirtilen sentezi kullan.\n"
+msgstr ""
+" --synthesis - urpmi veri tabanı yerine belirtilen sentezi kullan.\n"
#: ../urpm/search.pm:45 ../urpmf:45
#, c-format
@@ -1437,17 +1467,20 @@ msgstr " --verbose - kalabalık kipi.\n"
#: ../urpm/search.pm:48 ../urpmf:48
#, c-format
msgid " -i - ignore case distinctions in patterns.\n"
-msgstr " -i - her örnekte büyük-küçük harf farklılığını göz ardı et.\n"
+msgstr ""
+" -i - her örnekte büyük-küçük harf farklılığını göz ardı et.\n"
#: ../urpm/search.pm:49 ../urpmf:49
#, c-format
msgid " -I - honor case distinctions in patterns (default).\n"
-msgstr " -I - örneklerde büyük/küçük harf ayrımını gözet.(varsayılan)\n"
+msgstr ""
+" -I - örneklerde büyük/küçük harf ayrımını gözet.(varsayılan)\n"
#: ../urpm/search.pm:50 ../urpmf:50
#, c-format
msgid " -F<str> - change field separator (defaults to ':').\n"
-msgstr " -F<str> - alan ayracını değiştir. (':' işaretinde varsayılan).\n"
+msgstr ""
+" -F<str> - alan ayracını değiştir. (':' işaretinde varsayılan).\n"
#: ../urpm/search.pm:51 ../urpmf:51
#, c-format
@@ -1631,11 +1664,6 @@ msgstr " -f - sürüm, yayımı ve mimarisini yazdırır.\n"
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Geçeresiz biçim: sadece multi-valued etiket kullanılabilir"
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "%s' de belirtilen ortam kullanılıyor\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1651,117 +1679,139 @@ msgstr "\"%s\" ortamı için sentez mevcut değil."
msgid "no xml-info available for medium \"%s\""
msgstr "\"%s\" ortamı için xml-info mevcut değil."
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr "urpmi yeniden başlatıldı, önemli paketlerin listesi değişmedi"
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "urpmi yeniden başlatıldı ve önemli paketlerin listesi değişti: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"urpmi yeniden başlatıldı ve önemli paketlerin listesi değişti: %s vs %s"
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "%s adında bir paket yok"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Bu paketler %s içeriyor: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr "Tümünü kullanabilmek için \"-a\" kullanmalısınız"
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, c-format
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:543
+#: ../urpm/select.pm:538
#, c-format
msgid "Package %s is already installed"
msgstr "%s paketi kurulu"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, c-format
msgid "Packages %s are already installed"
msgstr "%s paketleri kurulu"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "%s paketinin kayıplığından"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, c-format
msgid "due to already installed %s"
msgstr "%s 'in zaten kurulu olmasından dolayı."
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "%s paketinden dolayı yetersiz"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "%s yükseltilmeye çalışılıyor."
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "%s 'in tutlması sırasında"
#: ../urpm/select.pm:607
#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Diğer paketlerin güncellenmesi için aşağıdaki paketlerin kaldırılması "
+"gerekiyor:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Diğer paketlerin güncellenmesi için aşağıdaki paketlerin kaldırılması "
+"gerekiyor:\n"
+"%s"
+
+#: ../urpm/select.pm:635
+#, c-format
msgid "in order to install %s"
msgstr "%s 'in kurulumu sırasında"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "%s paketi ile çelişkisinden"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Geçersiz imza (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Geçersiz Anahtar ID'si (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Kayıp imza (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr "sistem"
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr "%s'i %s için yeniden başlatmalısınız"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't write file"
msgstr "Dosya yazılamıyor."
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't open file"
msgstr "Dosya açılamıyor."
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, c-format
msgid "Can't move file %s to %s"
msgstr "%s dosyası%s 'e taşınamıyor."
@@ -1802,7 +1852,7 @@ msgstr " --test - kurulumun başarılı olup olmayacağını doğrula.\
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - benzer makineler arasında dağıtılmış urpmi.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Paketleri silmeden önce yeniden paketle.\n"
@@ -1815,7 +1865,8 @@ msgstr " --root - rpm kaldırma için bir başka kök kullanıcı kulla
#: ../urpme:55 ../urpmi:101
#, c-format
msgid " --justdb - update only the rpm db, not the filesystem.\n"
-msgstr " --justdb - sadece rpm veritabanını güncelle, dosya sistemini değil.\n"
+msgstr ""
+" --justdb - sadece rpm veritabanını güncelle, dosya sistemini değil.\n"
#: ../urpme:56
#, c-format
@@ -1831,7 +1882,7 @@ msgstr ""
" --use-distrib - urpme'yi bir dağıtım ağacından ayarla. Bir \"chroot\"u,\n"
" --root seçeneğiyle (kur/kaldır)mak için yararlıdır.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - kalabalık kipi.\n"
@@ -1876,7 +1927,8 @@ msgstr "Kaldırılacak bir şey yok"
#: ../urpme:149
#, 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] ""
"Bağımlılık sorununu aşabilmek için, aşağıdaki paketin kaldırılması gerekiyor."
"(%d)"
@@ -1898,7 +1950,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "%d adet paket kaldırılsın mı?"
msgstr[1] "%d adet paket kaldırılsın mı?"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " ( y, e / H , N ) "
@@ -1926,7 +1978,9 @@ msgstr "sonlandırılmamış ifade (%s)"
#: ../urpmi:81
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
-msgstr " --auto-update - önce kurulum kaynağını güncelle, sonra da sistemi yükselt.\n"
+msgstr ""
+" --auto-update - önce kurulum kaynağını güncelle, sonra da sistemi "
+"yükselt.\n"
#: ../urpmi:82
#, c-format
@@ -1966,8 +2020,8 @@ msgid ""
" --keep - keep existing packages if possible, reject requested\n"
" packages that lead to removals.\n"
msgstr ""
-" --keep - varolan paketleri koru, mümkünse kaldırılackaları\n
 "
-"etkileyen paketleri reddet.\n"
+" --keep - varolan paketleri koru, mümkünse kaldırılackaları\n"
+"
 etkileyen paketleri reddet.\n"
#: ../urpmi:90
#, c-format
@@ -1976,8 +2030,8 @@ msgid ""
" are going to be installed or upgraded,\n"
" default is %d.\n"
msgstr ""
-" --split-level - kurulacak veya güncellencek paketlerden daha\n
 "
-"fazla ise ufak işlemler böl.\n"
+" --split-level - kurulacak veya güncellencek paketlerden daha\n"
+"
 fazla ise ufak işlemler böl.\n"
" varsayılan %d dir.\n"
#: ../urpmi:94
@@ -1998,7 +2052,8 @@ msgstr " --buildrequires - paketlerin derleme gerekliliklerini kurar.\n"
#: ../urpmi:98
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
-msgstr " --install-src - sadece kaynak kodu paketlerini kur (ikilileri değil).\n"
+msgstr ""
+" --install-src - sadece kaynak kodu paketlerini kur (ikilileri değil).\n"
#: ../urpmi:99
#, c-format
@@ -2012,7 +2067,8 @@ msgstr " --noclean - rpm'yi ön bellekte kullanılmadan sakla\n"
#: ../urpmi:102
#, c-format
-msgid " --replacepkgs - force installing packages which are already installed.\n"
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
msgstr " --replacepkgs - sistemde yüklü paketleri yüklemeye zorla.\n"
#: ../urpmi:104
@@ -2021,8 +2077,8 @@ msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
" dependencies checking.\n"
msgstr ""
-" --allow-nodeps - kullanıcıya bağımlılıkları sormadan kuruluma\n
 izin "
-"verir.\n"
+" --allow-nodeps - kullanıcıya bağımlılıkları sormadan kuruluma\n"
+"
 izin verir.\n"
#: ../urpmi:106
#, c-format
@@ -2156,17 +2212,22 @@ msgstr ""
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - hiç bir paket betiğini çalıştırma.\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - çakışanları yazdır.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - kurulumunun atlanılması gereken paketler\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --prefer - tercih edilemesi gereken paketler.\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2176,42 +2237,43 @@ msgstr ""
"fazla\n"
" seçenek teklif et.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - rpm veritabanını kilitleme.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - aynı mimaride olan paketleri güncelle.\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - komut satırındakilere uyanların tümünü seçer. \n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - Sessiz kipi.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --debug - oldukça kalabalık kip.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
-msgstr " komut satırından isimleri veya rpm dosyaları verilenler yüklenecek.\n"
+msgstr ""
+" komut satırından isimleri veya rpm dosyaları verilenler yüklenecek.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr "Hata: Paket listesi boyunca --auto-select parametresi kullanılamaz.\n"
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2220,29 +2282,31 @@ msgstr ""
"Hata: Hata raporu oluşturmak için, kullanılan parametleri\n"
"--bug parametresiyle çalıştırın.\n"
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
-msgstr "--install-src parametresi kulanılırken ikili rpm dosyalarını kuramazsınız."
+msgstr ""
+"--install-src parametresi kulanılırken ikili rpm dosyalarını kuramazsınız."
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr "spec dosyalarını kuramazsınız."
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr "--buildrequires parametresine varsayılan"
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
"Lütfen, --buildrequires parametresine varsayılan olması için, --"
"buildrequires veya --install-src parametrelerini kullanın."
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2251,17 +2315,12 @@ msgstr ""
"[%s] dizini zaten var. Lütfen hata raporlaması için bir başka dizin kullanın "
"ya da bunu silin."
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "[%s] dizini hata raporu için oluşturulamıyor"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr "Ortam değişkenleri dizini %s mevcut değil."
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2270,48 +2329,49 @@ msgstr ""
"Hata: %s salt okunur bağlanmış gözüküyor.\n"
"İşlemi zorlamak için --allow-force parametresini kullanın."
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr "Ortam güncelleniyor...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (yükseltme için)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (yükseltme için)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (kurulum için)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (kurulum için)"
-#: ../urpmi:462
+#: ../urpmi:450
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
-msgstr "'%s' bağımlılık sorununu aşabilmek için, aşağıdaki paketlerden biri gerekli:"
+msgstr ""
+"'%s' bağımlılık sorununu aşabilmek için, aşağıdaki paketlerden biri gerekli:"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Seçiminiz nedir? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2322,7 +2382,7 @@ msgstr ""
"için kurulamaz:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2333,7 +2393,7 @@ msgstr ""
"için kurulamazlar:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2342,12 +2402,12 @@ msgstr ""
"\n"
"Yine de devam edilsin mi?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (E/h) "
-#: ../urpmi:524
+#: ../urpmi:512
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2356,7 +2416,7 @@ msgstr ""
"İstenen paket kurulamaz:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2365,12 +2425,12 @@ msgstr ""
"İstenen bazı paketler kurulamaz:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "%s paketinin kaldırılması sisteminizi çökertecektir."
-#: ../urpmi:551
+#: ../urpmi:538
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2381,7 +2441,7 @@ msgstr ""
"için aşağıdaki paketlerin kaldırılması gerekiyor:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2392,32 +2452,12 @@ msgstr ""
"için aşağıdaki paketlerin kaldırılması gerekiyor:\n"
"%s\n"
-#: ../urpmi:560
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Diğer paketlerin güncellenmesi için aşağıdaki paketlerin kaldırılması "
-"gerekiyor:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Diğer paketlerin güncellenmesi için aşağıdaki paketlerin kaldırılması "
-"gerekiyor:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(sadece deneme, gerçekte kaldırma yapılmayacak.)"
-#: ../urpmi:583
+#: ../urpmi:568
#, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2428,46 +2468,46 @@ msgstr ""
"çağırmalısınız:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "Aşağıdaki gereksiz paketler kaldırılacak"
msgstr[1] "Aşağıdaki gereksiz paketler kaldırılacak"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(sadece deneme, gerçekte kurulum yapılmayacak.)"
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr "Diskin %s kadarı kullanılacak."
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr "Diskin %s kadarı boşalacak."
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr "Paketler için %s alınacak"
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
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:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "İptal"
-#: ../urpmi:648
+#: ../urpmi:633
#, c-format
msgid "Press Enter when mounted..."
msgstr "Hazır olduğunuzda Enter'a basın..."
@@ -2543,7 +2583,8 @@ msgid ""
" or discard non-update media (when used with --distrib)\n"
msgstr ""
" --update - bir güncelleme kaynağı oluştur,\n"
-" veya güncellem-olmayan kaynağı görmezden gel (--distrib ile kullanıldığında)\n"
+" veya güncellem-olmayan kaynağı görmezden gel (--distrib "
+"ile kullanıldığında)\n"
#: ../urpmi.addmedia:67
#, c-format
@@ -2578,7 +2619,8 @@ msgid ""
" --distrib - automatically create all media from an installation\n"
" medium.\n"
msgstr ""
-" --distrib - tüm kurulum kaynaklarını otomatik olarak bir kurulum ortamından\n"
+" --distrib - tüm kurulum kaynaklarını otomatik olarak bir kurulum "
+"ortamından\n"
" oluştur.\n"
#: ../urpmi.addmedia:75
@@ -2618,7 +2660,8 @@ msgstr " --nopubkey -eklenen kaynağın ortak anahtarını alma.\n"
#: ../urpmi.addmedia:82
#, c-format
msgid " --raw - add the media in config, but don't update it.\n"
-msgstr " --raw - yapılandırmaya kurulum kaynağını ekle; ancak güncelleme.\n"
+msgstr ""
+" --raw - yapılandırmaya kurulum kaynağını ekle; ancak güncelleme.\n"
#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
#, c-format
@@ -2721,7 +2764,8 @@ msgstr ""
#: ../urpmi.recover:37
#, c-format
-msgid " --list - list transactions since provided date/duration argument\n"
+msgid ""
+" --list - list transactions since provided date/duration argument\n"
msgstr ""
" --list - verilen tarih/süre argümanından beri yapılan tüm "
"işlemleri listele.\n"
@@ -2734,7 +2778,8 @@ msgstr " --list-all - rpmdb'deki tüm işlemleri listele (uzun)\n"
#: ../urpmi.recover:39
#, c-format
msgid " --list-safe - list transactions since checkpoint\n"
-msgstr " --list-safe - denetleme noktasından beri olan işlemleri listele.\n"
+msgstr ""
+" --list-safe - denetleme noktasından beri olan işlemleri listele.\n"
#: ../urpmi.recover:40
#, c-format
@@ -2785,17 +2830,20 @@ msgstr "Suni komut satırı argümanları [%s]\n"
#: ../urpmi.recover:84
#, c-format
msgid "You can't specify --checkpoint and --rollback at the same time\n"
-msgstr "Aynı anda hem --rollback hem de --cehckpoint komutlarını belirleyemezsiniz.\n"
+msgstr ""
+"Aynı anda hem --rollback hem de --cehckpoint komutlarını belirleyemezsiniz.\n"
#: ../urpmi.recover:86
#, c-format
msgid "You can't specify --checkpoint and --list at the same time\n"
-msgstr "Aynı anda hem --checkpoint hem de --list komutlarını belirleyemezsiniz.\n"
+msgstr ""
+"Aynı anda hem --checkpoint hem de --list komutlarını belirleyemezsiniz.\n"
#: ../urpmi.recover:88
#, c-format
msgid "You can't specify --rollback and --list at the same time\n"
-msgstr "Aynı anda hem --rollback hem de --list komutlarını belirleyemezsiniz.\n"
+msgstr ""
+"Aynı anda hem --rollback hem de --list komutlarını belirleyemezsiniz.\n"
#: ../urpmi.recover:90
#, c-format
@@ -2849,7 +2897,8 @@ msgstr " -a - tüm kaynakları seçer.\n"
#: ../urpmi.removemedia:42
#, c-format
msgid " -y - fuzzy match on media names.\n"
-msgstr " -y - kurulum kaynağı isimleri üzerinde bulanık eşleşme.\n"
+msgstr ""
+" -y - kurulum kaynağı isimleri üzerinde bulanık eşleşme.\n"
#: ../urpmi.removemedia:59
#, c-format
@@ -2860,8 +2909,8 @@ msgstr "Paketleri kurmak için sadece sistem yöneticisi yetkilidir"
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr ""
-"Kaldırılacak bir şey yok. (yeni bir kurulum kaynağı eklemek için \"urpmi.addmedia\" "
-"kullanın)\n"
+"Kaldırılacak bir şey yok. (yeni bir kurulum kaynağı eklemek için \"urpmi."
+"addmedia\" kullanın)\n"
#: ../urpmi.removemedia:78
#, c-format
@@ -2899,7 +2948,8 @@ msgstr " --ignore - güncelleme, kaynağı yok sayılan olarak işaretle.
#: ../urpmi.update:47
#, c-format
msgid " --no-ignore - don't update, mark the media as enabled.\n"
-msgstr " --no-ignore - güncelleme, kaynağı etkinleştirilmiş olarak işaretle.\n"
+msgstr ""
+" --no-ignore - güncelleme, kaynağı etkinleştirilmiş olarak işaretle.\n"
#: ../urpmi.update:49
#, c-format
@@ -3007,12 +3057,15 @@ msgstr " --list-media - erişilebilir kurulum kaynaklarını listele\n"
#: ../urpmq:60
#, c-format
msgid " --list-url - list available media and their url.\n"
-msgstr " --list-url - erişilebilir kurulum kaynaklarını ve bağlantılarını gösterir.\n"
+msgstr ""
+" --list-url - erişilebilir kurulum kaynaklarını ve bağlantılarını "
+"gösterir.\n"
#: ../urpmq:61
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
-msgstr " --list-nodes - --parallel kullanırken erişilebilir düğümleri listele.\n"
+msgstr ""
+" --list-nodes - --parallel kullanırken erişilebilir düğümleri listele.\n"
#: ../urpmq:62
#, c-format
@@ -3021,17 +3074,21 @@ msgstr " --list-aliases - mevcut parelel alias'lari listele.\n"
#: ../urpmq:63
#, c-format
-msgid " --dump-config - dump the config in form of urpmi.addmedia argument.\n"
-msgstr " --dump-config - yapılandırmayı urpmi.addmedia argümanı biçiminde boşalt.\n"
+msgid ""
+" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+" --dump-config - yapılandırmayı urpmi.addmedia argümanı biçiminde boşalt.\n"
#: ../urpmq:64
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
-msgstr " --src - ardından gelen paket bir kaynak paketi ( -s ile aynı).\n"
+msgstr ""
+" --src - ardından gelen paket bir kaynak paketi ( -s ile aynı).\n"
#: ../urpmq:65
#, c-format
-msgid " --sources - give all source packages before downloading (root only).\n"
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
msgstr ""
" --sources - İndirmeye başlamadan önce tüm kaynak paketleri yolla."
"(Sadece root için geçerlidir).\n"
@@ -3152,12 +3209,14 @@ msgstr " -m - du'nun eşiti.\n"
#: ../urpmq:104
#, c-format
msgid " -r - print version and release with name also.\n"
-msgstr " -r - isminin yanıda sürüm numarasını ve dağıtımını da yazar.\n"
+msgstr ""
+" -r - isminin yanıda sürüm numarasını ve dağıtımını da yazar.\n"
#: ../urpmq:105
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
-msgstr " -s - bir sonraki paket bir kaynak paketidir(--src ile aynı).\n"
+msgstr ""
+" -s - bir sonraki paket bir kaynak paketidir(--src ile aynı).\n"
#: ../urpmq:106
#, c-format
@@ -3181,7 +3240,8 @@ msgstr ""
#: ../urpmq:109
#, c-format
msgid " names or rpm files given on command line are queried.\n"
-msgstr " komut satırından isimleri veya rpm dosyaları verilenler sorgulandı.\n"
+msgstr ""
+" komut satırından isimleri veya rpm dosyaları verilenler sorgulandı.\n"
#: ../urpmq:156
#, c-format
@@ -3214,14 +3274,16 @@ msgstr ""
#: ../urpmq:408
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
"\"%s\" ortamı için xml bilgisi bulunamadı. %s paketi için herhangi bir sonuç "
"döndürülemedi."
#: ../urpmq:409
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
"\"%s\" ortamı için xml bilgisi bulunamadı. %s paketleri için herhangi bir "
"sonuç döndürülemedi."
@@ -3231,6 +3293,15 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Değişiklik günlüğü bulunamadı!\n"
+#~ msgid "examining %s file"
+#~ msgstr "%s dosyası sınanıyor"
+
+#~ msgid "invalid MD5SUM file"
+#~ msgstr "geçersiz MD5SUM dosyası"
+
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "incelenmiş sentez %s olarak bulundu."
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - bir güncelleme ortamı oluştur.\n"
@@ -3254,4 +3325,3 @@ msgstr "Değişiklik günlüğü bulunamadı!\n"
#~ msgid "Checking to remove the following packages"
#~ msgstr "Kaldırılmaları için sıradaki paketler sınanıyor"
-
diff --git a/po/uk.po b/po/uk.po
index bfb8a4b1..4df5e3d5 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: 2008-09-23 18:55+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2008-09-04 19:35+0300\n"
"Last-Translator: Taras Boychuk <btr0001@ukr.net>\n"
"Language-Team: ukrainian <translation@linux.org.ua>\n"
@@ -20,7 +20,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: ../gurpmi:31 ../gurpmi2:74
#, c-format
@@ -32,7 +33,7 @@ msgstr "Встановлення RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Помилка: неможливо знайти файл %s, дію припинено"
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_O Гаразд"
@@ -98,7 +99,7 @@ msgstr "_Встановити"
msgid "_Save"
msgstr "З_берегти"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_C Скасувати"
@@ -146,12 +147,15 @@ msgstr ""
#: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select — автоматично вибрати пакунки для поновлення системи.\n"
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select — автоматично вибрати пакунки для поновлення системи.\n"
#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
msgstr ""
" --force — примусово виконати, навіть якщо деяких пакунків не "
"існує.\n"
@@ -169,14 +173,15 @@ msgstr ""
#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
-msgstr " --media — використовувати тільки задані носії, відокремлені комою.\n"
+msgstr ""
+" --media — використовувати тільки задані носії, відокремлені комою.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p — дозволити пошук в provides, щоб знайти пакунок.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P — не шукати в provides, щоб знайти пакунок.\n"
@@ -195,7 +200,8 @@ msgstr " --test — лише перевірити, чи встанов
#: ../gurpmi.pm:57 ../urpmi:76
#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
" --searchmedia — використовувати тільки задані носії для пошуку запитаних "
"(або поновлюваних) пакунків.\n"
@@ -215,7 +221,22 @@ msgstr "Будь ласка, зачекайте..."
msgid "Must be root"
msgstr "Потрібно бути root"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "встановлюється %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Встановлюється пакунок..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Встановлюється пакунок..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -231,37 +252,37 @@ msgstr ""
msgid "Warning"
msgstr "Попередження"
-#: ../gurpmi2:134 ../urpmi:624
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Гаразд"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (поновити)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (встановити)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Вибір пакунків"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Потрібен один із наступних пакунків:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Перервати"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -272,17 +293,19 @@ msgstr ""
"%s\n"
"Продовжувати встановлення?"
-#: ../gurpmi2:241 ../urpmi:591
+#: ../gurpmi2:240 ../urpmi:592
#, 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 "Наступний пакунок буде встановлено для задоволення залежностей:"
-#: ../gurpmi2:242 ../urpmi:592
+#: ../gurpmi2:241 ../urpmi:593
#, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Наступні пакунки буде встановлено для задоволення залежностей:"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
@@ -290,42 +313,37 @@ msgstr[0] "(%d пакунок, %d Мб)"
msgstr[1] "(%d пакунки, %d Мб)"
msgstr[2] "(%d пакунків, %d Мб)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Встановлюється пакунок..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "неможливо одержати початкові пакунки, завершується"
-#: ../gurpmi2:266 ../urpm/install.pm:81
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Підготовка..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Встановлюється пакунок `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:619
+#: ../gurpmi2:286 ../urpmi:620
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Вставте, будь ласка, носій з назвою «%s»"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Звантажується пакунок %s"
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "Виконано"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:114
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -336,28 +354,28 @@ msgstr ""
"%s\n"
"Можливо, Вам потрібно поновити вашу базу даних urpmi"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "Невдала спроба встановлення:"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Все вже встановлено"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Встановлення завершено"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "вилучається %s"
-#: ../gurpmi2:354 ../urpmi:686
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "перезапуск urpmi"
@@ -396,7 +414,7 @@ msgstr " типово %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f — вивести повну назву rpm (NVRA)\n"
-#: ../rurpmi:11 ../urpmi:268
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Тільки користувачу root дозволяється встановлювати пакунки"
@@ -492,59 +510,59 @@ msgstr "Цю дію заборонено до виконання в обмеже
msgid "bad proxy declaration on command line\n"
msgstr "неправильне оголошення проксі в командному рядку\n"
-#: ../urpm/args.pm:305
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: неможливо прочитати rpm-файл \"%s\"\n"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "неочікуваний вираз %s"
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "перед %s немає виразу"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "неочікуваний вираз %s (можливо, слід було вказати -a або -o ?)"
-#: ../urpm/args.pm:393
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "відсутній вираз, який слід закрити"
-#: ../urpm/args.pm:402
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"типово urpmf очікує на формальний вираз. Вам слід скористатися параметром «--"
"literal»"
-#: ../urpm/args.pm:470
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "каталогу chroot не існує"
-#: ../urpm/args.pm:493
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr "Не можна використовувати %s без %s"
-#: ../urpm/args.pm:496 ../urpm/args.pm:499 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr "Не можна використовувати %s разом з %s"
-#: ../urpm/args.pm:507
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr "Забагато аргументів\n"
-#: ../urpm/bug_report.pm:54 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Копіювання невдале"
@@ -737,54 +755,55 @@ msgstr "відновлення rpm-файлів з носія \"%s\"..."
msgid "[repackaging]"
msgstr "[перепакування]"
-#: ../urpm/install.pm:168
+#: ../urpm/install.pm:169
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
"створено транзакцію для встановлення на %s (вилучити=%d, встановити=%d, "
"поновити=%d)"
-#: ../urpm/install.pm:171
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "неможливо створити транзакцію"
-#: ../urpm/install.pm:194
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "неможливо вилучити rpm з delta-rpm-пакунка %s"
-#: ../urpm/install.pm:207
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "неможливо встановити пакунок %s"
-#: ../urpm/install.pm:210
+#: ../urpm/install.pm:211
#, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "вилучення помилкового rpm (%s) з %s"
-#: ../urpm/install.pm:211 ../urpm/install.pm:268
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, c-format
msgid "removing %s failed: %s"
msgstr "вилучення %s зазнало невдачі: %s"
-#: ../urpm/install.pm:249
+#: ../urpm/install.pm:250
#, c-format
msgid "Removing package %s"
msgstr "Вилучення пакунка %s"
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "вилучається пакунок %s"
-#: ../urpm/install.pm:266
+#: ../urpm/install.pm:267
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "вилучення встановлених rpm (%s) з %s"
-#: ../urpm/install.pm:274
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Додаткова інформація про пакунок %s"
@@ -1013,7 +1032,8 @@ msgstr "неможливо обробити media.cfg"
#: ../urpm/media.pm:831
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
-msgstr "немає доступу до першого носія дистрибутива (не знайдено файла media.cfg)"
+msgstr ""
+"немає доступу до першого носія дистрибутива (не знайдено файла media.cfg)"
#: ../urpm/media.pm:849
#, c-format
@@ -1195,13 +1215,13 @@ msgstr "знайдено розташування на земній кулі %s
msgid "getting mirror list from %s"
msgstr "отримання списку дзеркал з %s"
-#: ../urpm/msg.pm:63 ../urpmi:501 ../urpmi:516 ../urpmi:611
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "НнNn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:552 ../urpmi:647 ../urpmi:653
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1284,11 +1304,11 @@ msgstr[0] ""
"Вказаний нижче пакунок тепер не потрібен, скористайтеся командою «urpme --"
"auto-orphans», щоб вилучити його."
msgstr[1] ""
-"Вказані нижче пакунки тепер не потрібні, скористайтеся командою «urpme --"
-"auto-orphans», щоб вилучити їх."
+"Вказані нижче пакунки тепер не потрібні, скористайтеся командою «urpme --auto-"
+"orphans», щоб вилучити їх."
msgstr[2] ""
-"Вказані нижче пакунки тепер не потрібні, скористайтеся командою «urpme --"
-"auto-orphans», щоб вилучити їх."
+"Вказані нижче пакунки тепер не потрібні, скористайтеся командою «urpme --auto-"
+"orphans», щоб вилучити їх."
#: ../urpm/parallel.pm:14
#, c-format
@@ -1364,6 +1384,308 @@ msgstr "монтується %s"
msgid "unmounting %s"
msgstr "розмонтовується %s"
+#: ../urpm/search.pm:29 ../urpmf:29
+#, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2006 Mandriva.\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 %s\n"
+" Авторські права © 2002-2006 Mandriva.\n"
+" Це безкоштовна програма, її можна розповсюджуватися за дотримання умов GNU "
+"GPL.\n"
+"\n"
+"використання: urpmf [параметри] вираз-шаблон\n"
+
+#: ../urpm/search.pm:36 ../urpmf:36
+#, c-format
+msgid " --version - print this tool's version number.\n"
+msgstr " --version — вивести номер версії інструмента.\n"
+
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid " --env - use specific environment (typically a bug report).\n"
+msgstr ""
+" --env — використовувати специфічне оточення (звичайно звіт\n"
+" про помилку).\n"
+
+#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid " --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+" --excludemedia — не використовувати вказані джерела, розділені комами.\n"
+
+#: ../urpm/search.pm:39 ../urpmf:39
+#, c-format
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+" --literal, -l — не використовувати шаблонів, сприймати аргумент "
+"буквально.\n"
+
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+" --urpmi-root — використовувати іншого адміністративного користувача для "
+"встановлення urpmi db і rpm.\n"
+
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+" --sortmedia - sort media according to substrings separated by comma.\n"
+msgstr ""
+" --sortmedia — сортувати джерела відповідно до підписів, відділених "
+"комами.\n"
+
+#: ../urpm/search.pm:43 ../urpmf:43
+#, c-format
+msgid " --use-distrib - use the given path to access media\n"
+msgstr ""
+" --use-distrib — використовувати для доступу до носія вказаний шлях\n"
+
+#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+" --synthesis — використовувати вказаний файл synthesis замість бази "
+"даних urpmi.\n"
+
+#: ../urpm/search.pm:45 ../urpmf:45
+#, c-format
+msgid " --uniq - do not print identical lines twice.\n"
+msgstr " --uniq — не виводити однакові рядки.\n"
+
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid " --update - use only update media.\n"
+msgstr " --update — використовування тільки носії з поновленнями.\n"
+
+#: ../urpm/search.pm:47 ../urpmf:47
+#, c-format
+msgid " --verbose - verbose mode.\n"
+msgstr " --verbose — детальний режим.\n"
+
+#: ../urpm/search.pm:48 ../urpmf:48
+#, c-format
+msgid " -i - ignore case distinctions in patterns.\n"
+msgstr " -i — нехтувати регістрами в усіх шаблонах.\n"
+
+#: ../urpm/search.pm:49 ../urpmf:49
+#, c-format
+msgid " -I - honor case distinctions in patterns (default).\n"
+msgstr ""
+" -I — зважати на регістр символів у шаблонах (типова "
+"поведінка).\n"
+
+#: ../urpm/search.pm:50 ../urpmf:50
+#, c-format
+msgid " -F<str> - change field separator (defaults to ':').\n"
+msgstr " -F<str> — змінити роздільник полів (типовим є «:»).\n"
+
+#: ../urpm/search.pm:51 ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Вирази-шаблони:\n"
+
+#: ../urpm/search.pm:52 ../urpmf:52
+#, c-format
+msgid " text - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+" text — будь-який текст обробляється як формальний вираз, якщо не "
+"використано параметра -l.\n"
+
+#: ../urpm/search.pm:53 ../urpmf:53
+#, c-format
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -e — включати код perl безпосередньо як perl -e.\n"
+
+#: ../urpm/search.pm:54 ../urpmf:54
+#, c-format
+msgid " -a - binary AND operator.\n"
+msgstr " -a — двійковий оператор AND.\n"
+
+#: ../urpm/search.pm:55 ../urpmf:55
+#, c-format
+msgid " -o - binary OR operator.\n"
+msgstr " -o — двійковий оператор OR.\n"
+
+#: ../urpm/search.pm:56 ../urpmf:56
+#, c-format
+msgid " ! - unary NOT.\n"
+msgstr " ! — унарний NOT.\n"
+
+#: ../urpm/search.pm:57 ../urpmf:57
+#, c-format
+msgid " ( ) - left and right parentheses.\n"
+msgstr " ( ) — ліва і права дужки.\n"
+
+#: ../urpm/search.pm:58 ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Список міток:\n"
+
+#: ../urpm/search.pm:59 ../urpmf:59
+#, c-format
+msgid " --qf - specify a printf-like output format\n"
+msgstr " --qf — вказати формат виводу у стилі printf\n"
+
+#: ../urpm/search.pm:60 ../urpmf:60
+#, c-format
+msgid " example: '%%name:%%files'\n"
+msgstr " приклад: '%%name:%%files'\n"
+
+#: ../urpm/search.pm:61 ../urpmf:61
+#, c-format
+msgid " --arch - architecture\n"
+msgstr " --arch — архітектура\n"
+
+#: ../urpm/search.pm:62 ../urpmf:62
+#, c-format
+msgid " --buildhost - build host\n"
+msgstr " --buildhost — вузол збирання\n"
+
+#: ../urpm/search.pm:63 ../urpmf:63
+#, c-format
+msgid " --buildtime - build time\n"
+msgstr " --buildtime — час збирання\n"
+
+#: ../urpm/search.pm:64 ../urpmf:64
+#, c-format
+msgid " --conffiles - configuration files\n"
+msgstr " --conffiles — файли налаштування\n"
+
+#: ../urpm/search.pm:65 ../urpmf:65
+#, c-format
+msgid " --conflicts - conflict tags\n"
+msgstr " --conflicts — мітки конфліктів\n"
+
+#: ../urpm/search.pm:66 ../urpmf:66
+#, c-format
+msgid " --description - package description\n"
+msgstr " --description — опис пакунка\n"
+
+#: ../urpm/search.pm:67 ../urpmf:67
+#, c-format
+msgid " --distribution - distribution\n"
+msgstr " --distribution — дистрибутив\n"
+
+#: ../urpm/search.pm:68 ../urpmf:68
+#, c-format
+msgid " --epoch - epoch\n"
+msgstr " --epoch — епоха\n"
+
+#: ../urpm/search.pm:69 ../urpmf:69
+#, c-format
+msgid " --filename - filename of the package\n"
+msgstr " --filename — назва файл пакунка\n"
+
+#: ../urpm/search.pm:70 ../urpmf:70
+#, c-format
+msgid " --files - list of files contained in the package\n"
+msgstr " --files — список файлів, що містяться у пакунку\n"
+
+#: ../urpm/search.pm:71 ../urpmf:71
+#, c-format
+msgid " --group - group\n"
+msgstr " --group — група\n"
+
+#: ../urpm/search.pm:72 ../urpmf:72
+#, c-format
+msgid " --license - license\n"
+msgstr " --license — ліцензія\n"
+
+#: ../urpm/search.pm:73 ../urpmf:73
+#, c-format
+msgid " --name - package name\n"
+msgstr " --name — назва пакунка\n"
+
+#: ../urpm/search.pm:74 ../urpmf:74
+#, c-format
+msgid " --obsoletes - obsoletes tags\n"
+msgstr " --obsoletes — мітки застарілих (obsoletes)\n"
+
+#: ../urpm/search.pm:75 ../urpmf:75
+#, c-format
+msgid " --packager - packager\n"
+msgstr " --packager — пакувальник\n"
+
+#: ../urpm/search.pm:76 ../urpmf:76
+#, c-format
+msgid " --provides - provides tags\n"
+msgstr " --provides — мітки дозволів (provides)\n"
+
+#: ../urpm/search.pm:77 ../urpmf:77
+#, c-format
+msgid " --requires - requires tags\n"
+msgstr " --requires — мітки залежностей (requires)\n"
+
+#: ../urpm/search.pm:78 ../urpmf:78
+#, c-format
+msgid " --size - installed size\n"
+msgstr " --size — розмір після встановлення\n"
+
+#: ../urpm/search.pm:79 ../urpmf:79
+#, c-format
+msgid " --sourcerpm - source rpm name\n"
+msgstr " --sourcerpm — назва джерельного rpm\n"
+
+#: ../urpm/search.pm:80 ../urpmf:80
+#, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --suggests — мітки пропозицій (suggests)\n"
+
+#: ../urpm/search.pm:81 ../urpmf:81
+#, c-format
+msgid " --summary - summary\n"
+msgstr " --summary — резюме\n"
+
+#: ../urpm/search.pm:82 ../urpmf:82
+#, c-format
+msgid " --url - url\n"
+msgstr " --url — адреса url\n"
+
+#: ../urpm/search.pm:83 ../urpmf:83
+#, c-format
+msgid " --vendor - vendor\n"
+msgstr " --vendor — виробник\n"
+
+#: ../urpm/search.pm:84 ../urpmf:84
+#, c-format
+msgid " -m - the media in which the package was found\n"
+msgstr " -m — носій, на якому було знайдено пакунок\n"
+
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
+#, c-format
+msgid " -f - print version, release and arch with name.\n"
+msgstr " -f — вивести версію, випуск і архів з назвою.\n"
+
+#: ../urpm/search.pm:197 ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "Неправильний формат: можна використовувати лише багатозначні мітки"
+
+#: ../urpm/search.pm:290 ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "немає файла hdlist для носія «%s»"
+
+#: ../urpm/search.pm:297 ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "немає файла synthesis для носія «%s»"
+
+#: ../urpm/search.pm:304 ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "немає файла xml-info для носія «%s»"
+
#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1371,7 +1693,8 @@ msgstr "urpmi було перезапущено, список пріоритет
#: ../urpm/select.pm:32
#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
"urpmi було перезапущено, список пріоритетних пакунків зазнав змін: %s проти %"
"s"
@@ -1459,17 +1782,17 @@ msgstr "для того, щоб встановити %s"
msgid "due to conflicts with %s"
msgstr "через конфлікти з %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Неправильний підпис (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Неправильний ідентифікатор ключа (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Немає підпису (%s)"
@@ -1528,14 +1851,15 @@ msgstr " --auto-orphans — вилучити «осиротілі»\n"
#: ../urpme:49
#, c-format
msgid " --test - verify if the removal can be achieved correctly.\n"
-msgstr " --test — перевірити, чи є коректний доступ до змінного пристрою.\n"
+msgstr ""
+" --test — перевірити, чи є коректний доступ до змінного пристрою.\n"
#: ../urpme:51 ../urpmi:109 ../urpmq:68
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel — розподілений urpmi поміж машин псевдоніма.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage — перепакувати файли перед вилученням\n"
@@ -1543,20 +1867,14 @@ msgstr " --repackage — перепакувати файли перед ви
#: ../urpme:53
#, c-format
msgid " --root - use another root for rpm removal.\n"
-msgstr " --root — використовувати інший root для rpm на змінному пристрої.\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
-#, c-format
-msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
-" --urpmi-root — використовувати іншого адміністративного користувача для "
-"встановлення urpmi db і rpm.\n"
+" --root — використовувати інший root для rpm на змінному пристрої.\n"
#: ../urpme:55 ../urpmi:101
#, c-format
msgid " --justdb - update only the rpm db, not the filesystem.\n"
-msgstr " --justdb — оновлювати лише базу даних rpm, а не файлову систему.\n"
+msgstr ""
+" --justdb — оновлювати лише базу даних rpm, а не файлову систему.\n"
#: ../urpme:56
#, c-format
@@ -1573,7 +1891,7 @@ msgstr ""
"використовується\n"
" для встановлення (вилучення) chroot з параметром --root.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose — детальний режим.\n"
@@ -1602,9 +1920,12 @@ msgstr "невідомий пакунок"
#, c-format
msgid "Removing the following package will break your system:"
msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "Вилучення наведеного нижче пакунка призведе до пошкодження вашої системи:"
-msgstr[1] "Вилучення наведених нижче пакунків призведе до пошкодження вашої системи:"
-msgstr[2] "Вилучення наведених нижче пакунків призведе до пошкодження вашої системи:"
+msgstr[0] ""
+"Вилучення наведеного нижче пакунка призведе до пошкодження вашої системи:"
+msgstr[1] ""
+"Вилучення наведених нижче пакунків призведе до пошкодження вашої системи:"
+msgstr[2] ""
+"Вилучення наведених нижче пакунків призведе до пошкодження вашої системи:"
#: ../urpme:126
#, c-format
@@ -1619,7 +1940,8 @@ msgstr "«Осиротілих» пакунків немає"
#: ../urpme:149
#, 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] "Щоб задовольнити залежності, буде вилучено %d пакунок"
msgstr[1] "Щоб задовольнити залежності, буде вилучено %d пакунків"
msgstr[2] "Щоб задовольнити залежності, буде вилучено %d пакунків"
@@ -1640,7 +1962,7 @@ msgstr[0] "Вилучити %d пакунок?"
msgstr[1] "Вилучити %d пакунки?"
msgstr[2] "Вилучити %d пакунків?"
-#: ../urpme:161 ../urpmi:553 ../urpmi:648 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (Т/н) "
@@ -1660,300 +1982,11 @@ msgstr "Вилучення зазнало невдачі"
msgid "Removal is possible"
msgstr "Вилучення можливе"
-#: ../urpmf:29
-#, c-format
-msgid ""
-"urpmf version %s\n"
-"Copyright (C) 2002-2006 Mandriva.\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 %s\n"
-" Авторські права © 2002-2006 Mandriva.\n"
-" Це безкоштовна програма, її можна розповсюджуватися за дотримання умов GNU "
-"GPL.\n"
-"\n"
-"використання: urpmf [параметри] вираз-шаблон\n"
-
-#: ../urpmf:36
-#, c-format
-msgid " --version - print this tool's version number.\n"
-msgstr " --version — вивести номер версії інструмента.\n"
-
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid " --env - use specific environment (typically a bug report).\n"
-msgstr ""
-" --env — використовувати специфічне оточення (звичайно звіт\n"
-" про помилку).\n"
-
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid " --excludemedia - do not use the given media, separated by comma.\n"
-msgstr " --excludemedia — не використовувати вказані джерела, розділені комами.\n"
-
-#: ../urpmf:39
-#, c-format
-msgid " --literal, -l - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-" --literal, -l — не використовувати шаблонів, сприймати аргумент "
-"буквально.\n"
-
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid " --sortmedia - sort media according to substrings separated by comma.\n"
-msgstr ""
-" --sortmedia — сортувати джерела відповідно до підписів, відділених "
-"комами.\n"
-
-#: ../urpmf:43
-#, c-format
-msgid " --use-distrib - use the given path to access media\n"
-msgstr " --use-distrib — використовувати для доступу до носія вказаний шлях\n"
-
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-" --synthesis — використовувати вказаний файл synthesis замість бази "
-"даних urpmi.\n"
-
-#: ../urpmf:45
-#, c-format
-msgid " --uniq - do not print identical lines twice.\n"
-msgstr " --uniq — не виводити однакові рядки.\n"
-
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid " --update - use only update media.\n"
-msgstr " --update — використовування тільки носії з поновленнями.\n"
-
-#: ../urpmf:47
-#, c-format
-msgid " --verbose - verbose mode.\n"
-msgstr " --verbose — детальний режим.\n"
-
-#: ../urpmf:48
-#, c-format
-msgid " -i - ignore case distinctions in patterns.\n"
-msgstr " -i — нехтувати регістрами в усіх шаблонах.\n"
-
-#: ../urpmf:49
-#, c-format
-msgid " -I - honor case distinctions in patterns (default).\n"
-msgstr ""
-" -I — зважати на регістр символів у шаблонах (типова "
-"поведінка).\n"
-
-#: ../urpmf:50
-#, c-format
-msgid " -F<str> - change field separator (defaults to ':').\n"
-msgstr " -F<str> — змінити роздільник полів (типовим є «:»).\n"
-
-#: ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Вирази-шаблони:\n"
-
-#: ../urpmf:52
-#, c-format
-msgid " text - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-" text — будь-який текст обробляється як формальний вираз, якщо не "
-"використано параметра -l.\n"
-
-#: ../urpmf:53
-#, c-format
-msgid " -e - include perl code directly as perl -e.\n"
-msgstr " -e — включати код perl безпосередньо як perl -e.\n"
-
-#: ../urpmf:54
-#, c-format
-msgid " -a - binary AND operator.\n"
-msgstr " -a — двійковий оператор AND.\n"
-
-#: ../urpmf:55
-#, c-format
-msgid " -o - binary OR operator.\n"
-msgstr " -o — двійковий оператор OR.\n"
-
-#: ../urpmf:56
-#, c-format
-msgid " ! - unary NOT.\n"
-msgstr " ! — унарний NOT.\n"
-
-#: ../urpmf:57
-#, c-format
-msgid " ( ) - left and right parentheses.\n"
-msgstr " ( ) — ліва і права дужки.\n"
-
-#: ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Список міток:\n"
-
-#: ../urpmf:59
-#, c-format
-msgid " --qf - specify a printf-like output format\n"
-msgstr " --qf — вказати формат виводу у стилі printf\n"
-
-#: ../urpmf:60
-#, c-format
-msgid " example: '%%name:%%files'\n"
-msgstr " приклад: '%%name:%%files'\n"
-
-#: ../urpmf:61
-#, c-format
-msgid " --arch - architecture\n"
-msgstr " --arch — архітектура\n"
-
-#: ../urpmf:62
-#, c-format
-msgid " --buildhost - build host\n"
-msgstr " --buildhost — вузол збирання\n"
-
-#: ../urpmf:63
-#, c-format
-msgid " --buildtime - build time\n"
-msgstr " --buildtime — час збирання\n"
-
-#: ../urpmf:64
-#, c-format
-msgid " --conffiles - configuration files\n"
-msgstr " --conffiles — файли налаштування\n"
-
-#: ../urpmf:65
-#, c-format
-msgid " --conflicts - conflict tags\n"
-msgstr " --conflicts — мітки конфліктів\n"
-
-#: ../urpmf:66
-#, c-format
-msgid " --description - package description\n"
-msgstr " --description — опис пакунка\n"
-
-#: ../urpmf:67
-#, c-format
-msgid " --distribution - distribution\n"
-msgstr " --distribution — дистрибутив\n"
-
-#: ../urpmf:68
-#, c-format
-msgid " --epoch - epoch\n"
-msgstr " --epoch — епоха\n"
-
-#: ../urpmf:69
-#, c-format
-msgid " --filename - filename of the package\n"
-msgstr " --filename — назва файл пакунка\n"
-
-#: ../urpmf:70
-#, c-format
-msgid " --files - list of files contained in the package\n"
-msgstr " --files — список файлів, що містяться у пакунку\n"
-
-#: ../urpmf:71
-#, c-format
-msgid " --group - group\n"
-msgstr " --group — група\n"
-
-#: ../urpmf:72
-#, c-format
-msgid " --license - license\n"
-msgstr " --license — ліцензія\n"
-
-#: ../urpmf:73
-#, c-format
-msgid " --name - package name\n"
-msgstr " --name — назва пакунка\n"
-
-#: ../urpmf:74
-#, c-format
-msgid " --obsoletes - obsoletes tags\n"
-msgstr " --obsoletes — мітки застарілих (obsoletes)\n"
-
-#: ../urpmf:75
-#, c-format
-msgid " --packager - packager\n"
-msgstr " --packager — пакувальник\n"
-
-#: ../urpmf:76
-#, c-format
-msgid " --provides - provides tags\n"
-msgstr " --provides — мітки дозволів (provides)\n"
-
-#: ../urpmf:77
-#, c-format
-msgid " --requires - requires tags\n"
-msgstr " --requires — мітки залежностей (requires)\n"
-
-#: ../urpmf:78
-#, c-format
-msgid " --size - installed size\n"
-msgstr " --size — розмір після встановлення\n"
-
-#: ../urpmf:79
-#, c-format
-msgid " --sourcerpm - source rpm name\n"
-msgstr " --sourcerpm — назва джерельного rpm\n"
-
-#: ../urpmf:80
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests — мітки пропозицій (suggests)\n"
-
-#: ../urpmf:81
-#, c-format
-msgid " --summary - summary\n"
-msgstr " --summary — резюме\n"
-
-#: ../urpmf:82
-#, c-format
-msgid " --url - url\n"
-msgstr " --url — адреса url\n"
-
-#: ../urpmf:83
-#, c-format
-msgid " --vendor - vendor\n"
-msgstr " --vendor — виробник\n"
-
-#: ../urpmf:84
-#, c-format
-msgid " -m - the media in which the package was found\n"
-msgstr " -m — носій, на якому було знайдено пакунок\n"
-
-#: ../urpmf:85 ../urpmq:99
-#, c-format
-msgid " -f - print version, release and arch with name.\n"
-msgstr " -f — вивести версію, випуск і архів з назвою.\n"
-
#: ../urpmf:153
#, c-format
msgid "unterminated expression (%s)"
msgstr "незавершений вираз (%s)"
-#: ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Неправильний формат: можна використовувати лише багатозначні мітки"
-
-#: ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "немає файла hdlist для носія «%s»"
-
-#: ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "немає файла synthesis для носія «%s»"
-
-#: ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "немає файла xml-info для носія «%s»"
-
#: ../urpmi:81
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -2048,7 +2081,8 @@ msgstr " --noclean — не стирати rpm з кешу.\n"
#: ../urpmi:102
#, c-format
-msgid " --replacepkgs - force installing packages which are already installed.\n"
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
msgstr " --replacepkgs — примусове встановлення вже встановлених пакунків.\n"
#: ../urpmi:104
@@ -2117,7 +2151,8 @@ msgstr " --wget-options — додаткові параметри, які сл
#: ../urpmi:121
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
-msgstr " --prozilla-options — додаткові параметри, які слід передати prozilla\n"
+msgstr ""
+" --prozilla-options — додаткові параметри, які слід передати prozilla\n"
#: ../urpmi:122
#, c-format
@@ -2183,24 +2218,30 @@ msgstr " --ignoresize — не перевіряти місце на диск
#: ../urpmi:139
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
-msgstr " --ignorearch — дозволити встановлення rpm для невідповідних архітектур.\n"
+msgstr ""
+" --ignorearch — дозволити встановлення rpm для невідповідних архітектур.\n"
#: ../urpmi:140
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts — не виконувати скриптів пакунка\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts — вивести список conflicts: всі конфлікти.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip — пакунки, які при встановленні будуть пропущені.\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --prefer — пакунки, яким слід надавати перевагу\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2209,42 +2250,44 @@ msgstr ""
" --more-choices — якщо знайдено кілька пакунків, пропонує ширший вибір, \n"
" ніж типово\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock — не блокувати базу даних rpm.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
-msgstr " --strict-arch — поновити тільки пакунки з такою самою архітектурою.\n"
+msgstr ""
+" --strict-arch — поновити тільки пакунки з такою самою архітектурою.\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a — вибрати всі відповідності в командному рядку.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q — режим без повідомлень.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --debug — режим з дуже докладними повідомленнями.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " назви або rpm-файли, задані в командному рядку, буде встановлено.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
-msgstr "Помилка: не можна використовувати --auto-select лише зі списком пакунків.\n"
+msgstr ""
+"Помилка: не можна використовувати --auto-select лише зі списком пакунків.\n"
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2254,31 +2297,32 @@ msgstr ""
"рядка\n"
"з параметром --bug.\n"
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
"Ви не можете встановлювати бінарні файли rpm, якщо використовуєте параметр --"
"install-src"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr "Ви не можете встановлювати файлів spec"
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr "типовим є --buildrequires"
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
"будь ласка, скористайтеся --buildrequires або --install-src, типовим є --"
"buildrequires"
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2287,12 +2331,12 @@ msgstr ""
"Тека [%s] вже існує, використайте іншу теку на звіт про помилку, або знищіть "
"його"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Неможливо створити теку [%s] для звіту про помилку"
-#: ../urpmi:274
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2301,48 +2345,49 @@ msgstr ""
"Помилка: схоже, %s змонтовано в режимі тільки читання.\n"
"Використовуйте --allow-force, щоб виконати цю дію."
-#: ../urpmi:348
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr "Оновлення носія...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:435
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (для оновлення)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:437
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (для оновлення)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:441
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (для встановлення)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (для встановлення)"
-#: ../urpmi:449
+#: ../urpmi:450
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
-msgstr "Щоб задовольнити залежність «%s», слід встановити один з таких пакунків:"
+msgstr ""
+"Щоб задовольнити залежність «%s», слід встановити один з таких пакунків:"
-#: ../urpmi:452
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Що оберете? (1-%d) "
-#: ../urpmi:494
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2353,7 +2398,7 @@ msgstr ""
"від пакунків, які є старішими від встановлених:\n"
"%s"
-#: ../urpmi:496
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2364,7 +2409,7 @@ msgstr ""
"від пакунків, які є старішими від встановлених:\n"
"%s"
-#: ../urpmi:502 ../urpmi:517
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2373,12 +2418,12 @@ msgstr ""
"\n"
"Продовжувати встановлення за будь-яких умов?"
-#: ../urpmi:503 ../urpmi:518 ../urpmi:612 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (Y/n) (Т/н) "
-#: ../urpmi:511
+#: ../urpmi:512
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2387,7 +2432,7 @@ msgstr ""
"Замовлений пакунок не може бути встановлено:\n"
"%s"
-#: ../urpmi:512
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2396,12 +2441,12 @@ msgstr ""
"Деякі із замовлених пакунків неможливо встановити:\n"
"%s"
-#: ../urpmi:529
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "вилучення пакунка %s пошкодить систему"
-#: ../urpmi:537
+#: ../urpmi:538
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2412,7 +2457,7 @@ msgstr ""
"слід вилучити для того, щоб поновити інші:\n"
"%s\n"
-#: ../urpmi:539
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2423,12 +2468,12 @@ msgstr ""
"бути вилучені для того, щоб поновити інші:\n"
"%s\n"
-#: ../urpmi:547
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(лише для перевірки, вилучення проводитися не буде)"
-#: ../urpmi:567
+#: ../urpmi:568
#, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2439,7 +2484,7 @@ msgstr ""
"встановити такі залежності:\n"
"%s\n"
-#: ../urpmi:578
+#: ../urpmi:579
#, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
@@ -2447,27 +2492,27 @@ msgstr[0] "Наведений нижче «осиротілий» пакунок
msgstr[1] "Наведені нижче «осиротілі» пакунки буде вилучено."
msgstr[2] "Наведені нижче «осиротілі» пакунки буде вилучено."
-#: ../urpmi:594
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(лише для перевірки, встановлення проводитися не буде)"
-#: ../urpmi:600
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr "Буде використано %s додаткового місця на диску."
-#: ../urpmi:601
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr "Буде звільнено %s місця на диску."
-#: ../urpmi:602
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr "Буде отримано %s пакунків."
-#: ../urpmi:603
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2475,12 +2520,12 @@ msgstr[0] "Продовжити встановлення %d пакунка?"
msgstr[1] "Продовжити встановлення %d пакунків?"
msgstr[2] "Продовжити встановлення %d пакунків?"
-#: ../urpmi:624
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Скасувати"
-#: ../urpmi:632
+#: ../urpmi:633
#, c-format
msgid "Press Enter when mounted..."
msgstr "Натисніть Enter, коли змонтуєте..."
@@ -2532,12 +2577,14 @@ msgstr ""
#: ../urpmi.addmedia:55 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
-msgstr " --wget — використовувати wget для доступу до віддалених файлів.\n"
+msgstr ""
+" --wget — використовувати wget для доступу до віддалених файлів.\n"
#: ../urpmi.addmedia:56 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
-msgstr " --curl — використовувати curl для доступу до віддалених файлів.\n"
+msgstr ""
+" --curl — використовувати curl для доступу до віддалених файлів.\n"
#: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:75
#, c-format
@@ -2549,7 +2596,8 @@ msgstr ""
#: ../urpmi.addmedia:58 ../urpmi.update:36
#, c-format
msgid " --aria2 - use aria2 to retrieve distant files.\n"
-msgstr " --aria2 — використовувати aria2 для отримання віддалених файлів.\n"
+msgstr ""
+" --aria2 — використовувати aria2 для отримання віддалених файлів.\n"
#: ../urpmi.addmedia:65
#, c-format
@@ -2591,7 +2639,8 @@ msgstr " --no-probe — не намагатися знайти файли s
msgid ""
" --distrib - automatically create all media from an installation\n"
" medium.\n"
-msgstr " --distrib — автоматично створювати всі носії із носія встановлення.\n"
+msgstr ""
+" --distrib — автоматично створювати всі носії із носія встановлення.\n"
#: ../urpmi.addmedia:75
#, c-format
@@ -2632,7 +2681,8 @@ msgstr " --nopubkey — не імпортувати публічний кл
#: ../urpmi.addmedia:82
#, c-format
msgid " --raw - add the media in config, but don't update it.\n"
-msgstr " --raw — додати носія в конфігурацію, але не поновлювати його.\n"
+msgstr ""
+" --raw — додати носія в конфігурацію, але не поновлювати його.\n"
#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
#, c-format
@@ -2657,7 +2707,8 @@ msgstr "непотрібні аргументи до --distrib --mirrorlist <url
#: ../urpmi.addmedia:120
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
-msgstr "помилковий <url> (для локального каталогу слід вказати абсолютний шлях)"
+msgstr ""
+"помилковий <url> (для локального каталогу слід вказати абсолютний шлях)"
#: ../urpmi.addmedia:124
#, c-format
@@ -2733,7 +2784,8 @@ msgstr ""
#: ../urpmi.recover:37
#, c-format
-msgid " --list - list transactions since provided date/duration argument\n"
+msgid ""
+" --list - list transactions since provided date/duration argument\n"
msgstr ""
" --list — показати список транзакцій з часу заданого аргументу дата/"
"період\n"
@@ -2741,12 +2793,14 @@ msgstr ""
#: ../urpmi.recover:38
#, c-format
msgid " --list-all - list all transactions in rpmdb (long)\n"
-msgstr " --list-all — показати список всіх транзакцій у базі даних rpm (довго)\n"
+msgstr ""
+" --list-all — показати список всіх транзакцій у базі даних rpm (довго)\n"
#: ../urpmi.recover:39
#, c-format
msgid " --list-safe - list transactions since checkpoint\n"
-msgstr " --list-safe — показати список транзакцій після контрольної точки\n"
+msgstr ""
+" --list-safe — показати список транзакцій після контрольної точки\n"
#: ../urpmi.recover:40
#, c-format
@@ -3032,8 +3086,10 @@ msgstr " --list-aliases — вивести список доступних па
#: ../urpmq:63
#, c-format
-msgid " --dump-config - dump the config in form of urpmi.addmedia argument.\n"
-msgstr " --dump-config — вивести конфігурацію у формі аргументу urpmi.addmedia.\n"
+msgid ""
+" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+" --dump-config — вивести конфігурацію у формі аргументу urpmi.addmedia.\n"
#: ../urpmq:64
#, c-format
@@ -3044,7 +3100,8 @@ msgstr ""
#: ../urpmq:65
#, c-format
-msgid " --sources - give all source packages before downloading (root only).\n"
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
msgstr ""
" --sources — вивести всі вихідні пакунки перед завантаженням (тільки "
"root).\n"
@@ -3182,7 +3239,8 @@ msgstr ""
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
-msgstr " -u — пропустити пакунок, якщо новіша версія вже встановлена.\n"
+msgstr ""
+" -u — пропустити пакунок, якщо новіша версія вже встановлена.\n"
#: ../urpmq:107
#, c-format
@@ -3230,20 +3288,21 @@ msgstr ""
#: ../urpmq:408
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
msgstr ""
-"немає файла відомостей xml для носія «%s», не отримано жодного результату "
-"для пакунка %s"
+"немає файла відомостей xml для носія «%s», не отримано жодного результату для "
+"пакунка %s"
#: ../urpmq:409
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-"немає файла відомостей xml для носія «%s», не отримано жодного результату "
-"для пакунків %s"
+"немає файла відомостей xml для носія «%s», не отримано жодного результату для "
+"пакунків %s"
#: ../urpmq:473
#, c-format
msgid "No changelog found\n"
msgstr "Не знайдено журналу змін\n"
-
diff --git a/po/urpmi.pot b/po/urpmi.pot
index e18c7998..85a1dfa0 100644
--- a/po/urpmi.pot
+++ b/po/urpmi.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-10-07 13:39+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+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"
@@ -179,7 +179,22 @@ msgstr ""
msgid "Must be root"
msgstr ""
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, c-format
+msgid "Distribution Upgrade"
+msgstr ""
+
+#: ../gurpmi2:70
+#, c-format
+msgid "Packages installation"
+msgstr ""
+
+#: ../gurpmi2:97
+#, c-format
+msgid "Preparing packages installation..."
+msgstr ""
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -249,12 +264,7 @@ msgid_plural "(%d packages, %d MB)"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:249
-#, c-format
-msgid "Package installation..."
-msgstr ""
-
-#: ../gurpmi2:251 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr ""
@@ -1294,560 +1304,561 @@ msgstr ""
msgid "unmounting %s"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/search.pm:29 ../urpmf:29
#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2006 Mandriva.\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 ""
-#: ../urpm/select.pm:32
+#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgid " --version - print this tool's version number.\n"
msgstr ""
-#: ../urpm/select.pm:170
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
#, c-format
-msgid "No package named %s"
+msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
#, c-format
-msgid "The following packages contain %s: %s"
+msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
-#: ../urpm/select.pm:174
+#: ../urpm/search.pm:39 ../urpmf:39
#, c-format
-msgid "You should use \"-a\" to use all of them"
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpm/select.pm:295
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
#, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
+msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
-#: ../urpm/select.pm:538
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
#, c-format
-msgid "Package %s is already installed"
+msgid ""
+" --sortmedia - sort media according to substrings separated by comma.\n"
msgstr ""
-#: ../urpm/select.pm:539
+#: ../urpm/search.pm:43 ../urpmf:43
#, c-format
-msgid "Packages %s are already installed"
+msgid " --use-distrib - use the given path to access media\n"
msgstr ""
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
#, c-format
-msgid "due to missing %s"
+msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
-#: ../urpm/select.pm:558
+#: ../urpm/search.pm:45 ../urpmf:45
#, c-format
-msgid "due to already installed %s"
+msgid " --uniq - do not print identical lines twice.\n"
msgstr ""
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
#, c-format
-msgid "due to unsatisfied %s"
+msgid " --update - use only update media.\n"
msgstr ""
-#: ../urpm/select.pm:565
+#: ../urpm/search.pm:47 ../urpmf:47
#, c-format
-msgid "trying to promote %s"
+msgid " --verbose - verbose mode.\n"
msgstr ""
-#: ../urpm/select.pm:566
+#: ../urpm/search.pm:48 ../urpmf:48
#, c-format
-msgid "in order to keep %s"
+msgid " -i - ignore case distinctions in patterns.\n"
msgstr ""
-#: ../urpm/select.pm:607
+#: ../urpm/search.pm:49 ../urpmf:49
#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
+msgid " -I - honor case distinctions in patterns (default).\n"
msgstr ""
-#: ../urpm/select.pm:608
+#: ../urpm/search.pm:50 ../urpmf:50
#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
+msgid " -F<str> - change field separator (defaults to ':').\n"
msgstr ""
-#: ../urpm/select.pm:635
+#: ../urpm/search.pm:51 ../urpmf:51
#, c-format
-msgid "in order to install %s"
+msgid "Pattern expressions:\n"
msgstr ""
-#: ../urpm/select.pm:645
+#: ../urpm/search.pm:52 ../urpmf:52
#, c-format
-msgid "due to conflicts with %s"
+msgid " text - any text is parsed as a regexp, unless -l is used.\n"
msgstr ""
-#: ../urpm/signature.pm:49
+#: ../urpm/search.pm:53 ../urpmf:53
#, c-format
-msgid "Invalid signature (%s)"
+msgid " -e - include perl code directly as perl -e.\n"
msgstr ""
-#: ../urpm/signature.pm:80
+#: ../urpm/search.pm:54 ../urpmf:54
#, c-format
-msgid "Invalid Key ID (%s)"
+msgid " -a - binary AND operator.\n"
msgstr ""
-#: ../urpm/signature.pm:82
+#: ../urpm/search.pm:55 ../urpmf:55
#, c-format
-msgid "Missing signature (%s)"
+msgid " -o - binary OR operator.\n"
msgstr ""
-#: ../urpm/sys.pm:178
+#: ../urpm/search.pm:56 ../urpmf:56
#, c-format
-msgid "system"
+msgid " ! - unary NOT.\n"
msgstr ""
-#: ../urpm/sys.pm:213
+#: ../urpm/search.pm:57 ../urpmf:57
#, c-format
-msgid "You should restart %s for %s"
+msgid " ( ) - left and right parentheses.\n"
msgstr ""
-#: ../urpm/sys.pm:316
+#: ../urpm/search.pm:58 ../urpmf:58
#, c-format
-msgid "Can't write file"
+msgid "List of tags:\n"
msgstr ""
-#: ../urpm/sys.pm:316
+#: ../urpm/search.pm:59 ../urpmf:59
#, c-format
-msgid "Can't open file"
+msgid " --qf - specify a printf-like output format\n"
msgstr ""
-#: ../urpm/sys.pm:329
+#: ../urpm/search.pm:60 ../urpmf:60
#, c-format
-msgid "Can't move file %s to %s"
+msgid " example: '%%name:%%files'\n"
msgstr ""
-#: ../urpme:41
+#: ../urpm/search.pm:61 ../urpmf:61
#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+msgid " --arch - architecture\n"
msgstr ""
-#: ../urpme:47
+#: ../urpm/search.pm:62 ../urpmf:62
#, c-format
-msgid " --auto - automatically select a package in choices.\n"
+msgid " --buildhost - build host\n"
msgstr ""
-#: ../urpme:48
+#: ../urpm/search.pm:63 ../urpmf:63
#, c-format
-msgid " --auto-orphans - remove orphans\n"
+msgid " --buildtime - build time\n"
msgstr ""
-#: ../urpme:49
+#: ../urpm/search.pm:64 ../urpmf:64
#, c-format
-msgid " --test - verify if the removal can be achieved correctly.\n"
+msgid " --conffiles - configuration files\n"
msgstr ""
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#: ../urpm/search.pm:65 ../urpmf:65
#, c-format
-msgid " --parallel - distributed urpmi across machines of alias.\n"
+msgid " --conflicts - conflict tags\n"
msgstr ""
-#: ../urpme:52 ../urpmi:142
+#: ../urpm/search.pm:66 ../urpmf:66
#, c-format
-msgid " --repackage - Re-package the files before erasing\n"
+msgid " --description - package description\n"
msgstr ""
-#: ../urpme:53
+#: ../urpm/search.pm:67 ../urpmf:67
#, c-format
-msgid " --root - use another root for rpm removal.\n"
+msgid " --distribution - distribution\n"
msgstr ""
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#: ../urpm/search.pm:68 ../urpmf:68
#, c-format
-msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
+msgid " --epoch - epoch\n"
msgstr ""
-#: ../urpme:55 ../urpmi:101
+#: ../urpm/search.pm:69 ../urpmf:69
#, c-format
-msgid " --justdb - update only the rpm db, not the filesystem.\n"
+msgid " --filename - filename of the package\n"
msgstr ""
-#: ../urpme:56
+#: ../urpm/search.pm:70 ../urpmf:70
#, c-format
-msgid " --noscripts - do not execute package scriptlet(s).\n"
+msgid " --files - list of files contained in the package\n"
msgstr ""
-#: ../urpme:57
+#: ../urpm/search.pm:71 ../urpmf:71
#, c-format
-msgid ""
-" --use-distrib - configure urpme on the fly from a distrib tree, useful\n"
-" to (un)install a chroot with --root option.\n"
+msgid " --group - group\n"
msgstr ""
-#: ../urpme:59 ../urpmi:153 ../urpmq:89
+#: ../urpm/search.pm:72 ../urpmf:72
#, c-format
-msgid " --verbose, -v - verbose mode.\n"
+msgid " --license - license\n"
msgstr ""
-#: ../urpme:60
+#: ../urpm/search.pm:73 ../urpmf:73
#, c-format
-msgid " -a - select all packages matching expression.\n"
+msgid " --name - package name\n"
msgstr ""
-#: ../urpme:73
+#: ../urpm/search.pm:74 ../urpmf:74
#, c-format
-msgid "Only superuser is allowed to remove packages"
+msgid " --obsoletes - obsoletes tags\n"
msgstr ""
-#: ../urpme:106
+#: ../urpm/search.pm:75 ../urpmf:75
#, c-format
-msgid "unknown packages"
+msgid " --packager - packager\n"
msgstr ""
-#: ../urpme:106
+#: ../urpm/search.pm:76 ../urpmf:76
#, c-format
-msgid "unknown package"
+msgid " --provides - provides tags\n"
msgstr ""
-#: ../urpme:121
+#: ../urpm/search.pm:77 ../urpmf:77
#, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] ""
-msgstr[1] ""
+msgid " --requires - requires tags\n"
+msgstr ""
-#: ../urpme:126
+#: ../urpm/search.pm:78 ../urpmf:78
#, c-format
-msgid "Nothing to remove"
+msgid " --size - installed size\n"
msgstr ""
-#: ../urpme:143
+#: ../urpm/search.pm:79 ../urpmf:79
#, c-format
-msgid "No orphans to remove"
+msgid " --sourcerpm - source rpm name\n"
msgstr ""
-#: ../urpme:149
+#: ../urpm/search.pm:80 ../urpmf:80
#, 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] ""
-msgstr[1] ""
+msgid " --suggests - suggests tags\n"
+msgstr ""
-#: ../urpme:154
+#: ../urpm/search.pm:81 ../urpmf:81
#, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] ""
-msgstr[1] ""
+msgid " --summary - summary\n"
+msgstr ""
-#: ../urpme:161
+#: ../urpm/search.pm:82 ../urpmf:82
#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] ""
-msgstr[1] ""
+msgid " --url - url\n"
+msgstr ""
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
+#: ../urpm/search.pm:83 ../urpmf:83
#, c-format
-msgid " (y/N) "
+msgid " --vendor - vendor\n"
msgstr ""
-#: ../urpme:166
+#: ../urpm/search.pm:84 ../urpmf:84
#, c-format
-msgid "testing removal of %s"
+msgid " -m - the media in which the package was found\n"
msgstr ""
-#: ../urpme:181
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
#, c-format
-msgid "Removal failed"
+msgid " -f - print version, release and arch with name.\n"
msgstr ""
-#: ../urpme:183
+#: ../urpm/search.pm:197 ../urpmf:198
#, c-format
-msgid "Removal is possible"
+msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:29
+#: ../urpm/search.pm:290 ../urpmf:291
#, c-format
-msgid ""
-"urpmf version %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage: urpmf [options] pattern-expression\n"
+msgid "no hdlist available for medium \"%s\""
msgstr ""
-#: ../urpmf:36
+#: ../urpm/search.pm:297 ../urpmf:298
#, c-format
-msgid " --version - print this tool's version number.\n"
+msgid "no synthesis available for medium \"%s\""
msgstr ""
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:304 ../urpmf:307
#, c-format
-msgid " --env - use specific environment (typically a bug report).\n"
+msgid "no xml-info available for medium \"%s\""
msgstr ""
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../urpm/select.pm:30
#, c-format
-msgid " --excludemedia - do not use the given media, separated by comma.\n"
+msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpmf:39
+#: ../urpm/select.pm:32
#, c-format
msgid ""
-" --literal, -l - don't match patterns, use argument as a literal string.\n"
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../urpm/select.pm:170
#, c-format
-msgid ""
-" --sortmedia - sort media according to substrings separated by comma.\n"
+msgid "No package named %s"
msgstr ""
-#: ../urpmf:43
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
-msgid " --use-distrib - use the given path to access media\n"
+msgid "The following packages contain %s: %s"
msgstr ""
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../urpm/select.pm:174
#, c-format
-msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
+msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpmf:45
+#: ../urpm/select.pm:295
#, c-format
-msgid " --uniq - do not print identical lines twice.\n"
+msgid "found package(s) %s in urpmi db, but none are installed"
msgstr ""
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/select.pm:538
#, c-format
-msgid " --update - use only update media.\n"
+msgid "Package %s is already installed"
msgstr ""
-#: ../urpmf:47
+#: ../urpm/select.pm:539
#, c-format
-msgid " --verbose - verbose mode.\n"
+msgid "Packages %s are already installed"
msgstr ""
-#: ../urpmf:48
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
-msgid " -i - ignore case distinctions in patterns.\n"
+msgid "due to missing %s"
msgstr ""
-#: ../urpmf:49
+#: ../urpm/select.pm:558
#, c-format
-msgid " -I - honor case distinctions in patterns (default).\n"
+msgid "due to already installed %s"
msgstr ""
-#: ../urpmf:50
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
-msgid " -F<str> - change field separator (defaults to ':').\n"
+msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmf:51
+#: ../urpm/select.pm:565
#, c-format
-msgid "Pattern expressions:\n"
+msgid "trying to promote %s"
msgstr ""
-#: ../urpmf:52
+#: ../urpm/select.pm:566
#, c-format
-msgid " text - any text is parsed as a regexp, unless -l is used.\n"
+msgid "in order to keep %s"
msgstr ""
-#: ../urpmf:53
+#: ../urpm/select.pm:607
#, c-format
-msgid " -e - include perl code directly as perl -e.\n"
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
msgstr ""
-#: ../urpmf:54
+#: ../urpm/select.pm:608
#, c-format
-msgid " -a - binary AND operator.\n"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
msgstr ""
-#: ../urpmf:55
+#: ../urpm/select.pm:635
#, c-format
-msgid " -o - binary OR operator.\n"
+msgid "in order to install %s"
msgstr ""
-#: ../urpmf:56
+#: ../urpm/select.pm:645
#, c-format
-msgid " ! - unary NOT.\n"
+msgid "due to conflicts with %s"
msgstr ""
-#: ../urpmf:57
+#: ../urpm/signature.pm:32
#, c-format
-msgid " ( ) - left and right parentheses.\n"
+msgid "Invalid signature (%s)"
msgstr ""
-#: ../urpmf:58
+#: ../urpm/signature.pm:63
#, c-format
-msgid "List of tags:\n"
+msgid "Invalid Key ID (%s)"
msgstr ""
-#: ../urpmf:59
+#: ../urpm/signature.pm:65
#, c-format
-msgid " --qf - specify a printf-like output format\n"
+msgid "Missing signature (%s)"
msgstr ""
-#: ../urpmf:60
+#: ../urpm/sys.pm:178
#, c-format
-msgid " example: '%%name:%%files'\n"
+msgid "system"
msgstr ""
-#: ../urpmf:61
+#: ../urpm/sys.pm:213
#, c-format
-msgid " --arch - architecture\n"
+msgid "You should restart %s for %s"
msgstr ""
-#: ../urpmf:62
+#: ../urpm/sys.pm:316
#, c-format
-msgid " --buildhost - build host\n"
+msgid "Can't write file"
msgstr ""
-#: ../urpmf:63
+#: ../urpm/sys.pm:316
#, c-format
-msgid " --buildtime - build time\n"
+msgid "Can't open file"
msgstr ""
-#: ../urpmf:64
+#: ../urpm/sys.pm:329
#, c-format
-msgid " --conffiles - configuration files\n"
+msgid "Can't move file %s to %s"
msgstr ""
-#: ../urpmf:65
+#: ../urpme:41
#, c-format
-msgid " --conflicts - conflict tags\n"
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
msgstr ""
-#: ../urpmf:66
+#: ../urpme:47
#, c-format
-msgid " --description - package description\n"
+msgid " --auto - automatically select a package in choices.\n"
msgstr ""
-#: ../urpmf:67
+#: ../urpme:48
#, c-format
-msgid " --distribution - distribution\n"
+msgid " --auto-orphans - remove orphans\n"
msgstr ""
-#: ../urpmf:68
+#: ../urpme:49
#, c-format
-msgid " --epoch - epoch\n"
+msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
-#: ../urpmf:69
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
#, c-format
-msgid " --filename - filename of the package\n"
+msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
-#: ../urpmf:70
+#: ../urpme:52 ../urpmi:142
#, c-format
-msgid " --files - list of files contained in the package\n"
+msgid " --repackage - Re-package the files before erasing\n"
msgstr ""
-#: ../urpmf:71
+#: ../urpme:53
#, c-format
-msgid " --group - group\n"
+msgid " --root - use another root for rpm removal.\n"
msgstr ""
-#: ../urpmf:72
+#: ../urpme:55 ../urpmi:101
#, c-format
-msgid " --license - license\n"
+msgid " --justdb - update only the rpm db, not the filesystem.\n"
msgstr ""
-#: ../urpmf:73
+#: ../urpme:56
#, c-format
-msgid " --name - package name\n"
+msgid " --noscripts - do not execute package scriptlet(s).\n"
msgstr ""
-#: ../urpmf:74
+#: ../urpme:57
#, c-format
-msgid " --obsoletes - obsoletes tags\n"
+msgid ""
+" --use-distrib - configure urpme on the fly from a distrib tree, useful\n"
+" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpmf:75
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
-msgid " --packager - packager\n"
+msgid " --verbose, -v - verbose mode.\n"
msgstr ""
-#: ../urpmf:76
+#: ../urpme:60
#, c-format
-msgid " --provides - provides tags\n"
+msgid " -a - select all packages matching expression.\n"
msgstr ""
-#: ../urpmf:77
+#: ../urpme:73
#, c-format
-msgid " --requires - requires tags\n"
+msgid "Only superuser is allowed to remove packages"
msgstr ""
-#: ../urpmf:78
+#: ../urpme:106
#, c-format
-msgid " --size - installed size\n"
+msgid "unknown packages"
msgstr ""
-#: ../urpmf:79
+#: ../urpme:106
#, c-format
-msgid " --sourcerpm - source rpm name\n"
+msgid "unknown package"
msgstr ""
-#: ../urpmf:80
+#: ../urpme:121
#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr ""
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] ""
+msgstr[1] ""
-#: ../urpmf:81
+#: ../urpme:126
#, c-format
-msgid " --summary - summary\n"
+msgid "Nothing to remove"
msgstr ""
-#: ../urpmf:82
+#: ../urpme:143
#, c-format
-msgid " --url - url\n"
+msgid "No orphans to remove"
msgstr ""
-#: ../urpmf:83
+#: ../urpme:149
#, c-format
-msgid " --vendor - vendor\n"
-msgstr ""
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+msgstr[1] ""
-#: ../urpmf:84
+#: ../urpme:154
#, c-format
-msgid " -m - the media in which the package was found\n"
-msgstr ""
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] ""
+msgstr[1] ""
-#: ../urpmf:85 ../urpmq:99
+#: ../urpme:161
#, c-format
-msgid " -f - print version, release and arch with name.\n"
-msgstr ""
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] ""
+msgstr[1] ""
-#: ../urpmf:153
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
-msgid "unterminated expression (%s)"
+msgid " (y/N) "
msgstr ""
-#: ../urpmf:198
+#: ../urpme:166
#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
+msgid "testing removal of %s"
msgstr ""
-#: ../urpmf:291
+#: ../urpme:181
#, c-format
-msgid "no hdlist available for medium \"%s\""
+msgid "Removal failed"
msgstr ""
-#: ../urpmf:298
+#: ../urpme:183
#, c-format
-msgid "no synthesis available for medium \"%s\""
+msgid "Removal is possible"
msgstr ""
-#: ../urpmf:307
+#: ../urpmf:153
#, c-format
-msgid "no xml-info available for medium \"%s\""
+msgid "unterminated expression (%s)"
msgstr ""
#: ../urpmi:81
diff --git a/po/uz.po b/po/uz.po
index 09be3744..81ebc679 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+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"
@@ -28,7 +28,7 @@ msgstr "RPM o'rnatish"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Xato: %s fayli topilmadi, amal bekor qilinadi"
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -86,7 +86,7 @@ msgstr "O'r_natish"
msgid "_Save"
msgstr "_Saqlash"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Bekor qilish"
@@ -117,9 +117,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - shu yordam xabarini ko'rsatish.\n"
@@ -154,19 +153,19 @@ msgstr ""
" (--no-verify-rpm ushbu amalning teskarisi, andoza "
"bo'yicha paketning elektron imzosi tekshiriladi).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - faqat ko'rsatilgan, vergul bilan ajratilgan, "
"to'plamlardan foydalanish.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
@@ -205,7 +204,22 @@ msgstr "Iltimos kutib turing..."
msgid "Must be root"
msgstr "root bo'lish kerak"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, c-format
+msgid "Distribution Upgrade"
+msgstr ""
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Paketni o'rnatish..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Paketni o'rnatish..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -221,37 +235,37 @@ msgstr ""
msgid "Warning"
msgstr "Diqqat"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (yangilash)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (o'rnatish)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Paket tanlovi"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Quyidagi paketlardan biri kerak:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "To'_xtatish"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -262,60 +276,55 @@ msgstr ""
"%s\n"
"O'rnatishni davom ettirishni istaysizmi?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Bog'liqliklarni ta'minlash uchun quyidagi paket ham o'rnatiladi:"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Bog'liqliklarni ta'minlash uchun quyidagi paketlar ham o'rnatiladi:"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d-ta paket, %d Mb)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Paketni o'rnatish..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr ""
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Tayyorlanmoqda..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "\"%s\" (%s/%s) paketi o'rnatilmoqda..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Iltimos \"%s\" nomli to'plamni [%s] uskunasiga qo'ying"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "\"%s\" paketi olinmoqda..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Tayyor"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -326,28 +335,28 @@ msgstr ""
"%s\n"
"Balki urpmi ma'lumot bazasini yangilashingiz kerak."
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "O'rnatish muvaffaqiyatsiz tugadi:"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Hamma narsa allaqachon o'rnatilgan"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "O'rnatish tugadi"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "%s o'chirilmoqda"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "urpmi qaytadan ishga tushmoqda"
@@ -388,7 +397,7 @@ msgstr " %s - andoza.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - RPM-faylining to'liq nomini ko'rsatish (NVRA)\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Faqat boshqaruvchi paketlarni o'rnatishi mumkin"
@@ -398,134 +407,143 @@ msgstr "Faqat boshqaruvchi paketlarni o'rnatishi mumkin"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "to'plamni yaratib bo'lmadi: \"%s\"\n"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "\"%s\" paketi olinmoqda..."
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr ""
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "rpmdb'ni ochib bo'lmadi"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "RPM-faylining nomi (%s) noto'g'ri"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "RPM-fayli (%s) olinmoqda..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...olish tugadi"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...olish muvaffaqiyatsiz tugadi: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "RPM-fayliga (%s) murojaat qilib bo'lmadi"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr ""
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "RPM-faylini ro'yxatdan o'tkazib bo'lmadi"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr ""
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr ""
-#: ../urpm/args.pm:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Imzo yetishmaydi (%s)"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot direktoriyasi mavjud emas"
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr "%s amalidan %s amalisiz foydalanib bo'lmaydi"
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr "%s amalidan %s amali bilan birga foydalanib bo'lmaydi"
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Nusxa ko'chirish muvaffaqiyatsiz tugadi"
@@ -572,122 +590,122 @@ msgstr "\"%s\" to'plami ikki marta aniqlangan, amal bekor qilinadi"
msgid "unable to write config file [%s]"
msgstr "moslama faylini (%s) yozib bo'lmadi"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "%s topilmadi, %s ishlatiladi"
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Proksiga ulanish uchun kerakli ma'lumotni kiriting\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Foydalanuvchi:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Maxfiy so'z:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr "%s muvaffaqiyatsiz tugadi: xato kodi %d"
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr "%s muvaffaqiyatsiz tugadi: xato kodi %d"
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, c-format
msgid "copy failed"
msgstr "nusxa ko'chirish muvaffaqiyatsiz tugadi"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, c-format
msgid "wget is missing\n"
msgstr "wget dasturi yetishmayapti\n"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, c-format
msgid "curl is missing\n"
msgstr "curl dasturi yetishmayapti\n"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr "curl muvaffaqiyatsiz tugadi: yozib olish bekor qilindi\n"
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr "rsync dasturi yetishmayapti\n"
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr "ssh dasturi yetishmayapti\n"
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr "prozilla dasturi yetishmayapti\n"
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr "prozilla dasturini ishga tushirib bo'lmadi\n"
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "prozilla dasturi yetishmayapti\n"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr " %s%% bajarildi, jami = %s, ETA = %s, tezlik = %s"
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr " %s%% bajarildi, tezlik = %s"
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, c-format
msgid "retrieving %s"
msgstr "%s olinmoqda"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, c-format
msgid "retrieved %s"
msgstr "%s olindi"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "%s uchun noma'lum protokol aniqlangan"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "%s topilmadi, %s ishlatiladi"
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr ""
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "noma'lum protokol: %s"
@@ -707,58 +725,58 @@ msgstr "%s paketi topilmadi."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "RPM-fayllari \"%s\" to'plamidan olinmoqda..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr ""
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "delta-rpm paketidan RPM-faylini ajratib bo'lmadi: %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "%s paketini o'rnatib bo'lmadi"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "to'plam olib tashlanmoqda: \"%s\""
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "...olish muvaffaqiyatsiz tugadi: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, c-format
msgid "Removing package %s"
msgstr "%s paketi olib tashlanmoqda"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "%s paketi olib tashlanmoqda"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr ""
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "%s paketi haqida ko'proq ma'lumot"
@@ -803,91 +821,81 @@ msgstr "to'xtatilmoqda"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "O'rnatish muvaffaqiyatsiz tugadi"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "O'rnatish muvaffaqiyatsiz tugadi:"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, c-format
msgid "The following package has bad signature"
msgstr "Quyidagi paketning imzosi xato"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Quyidagi paketlarning imzolari noto'g'ri"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "O'rnatishni davom etishni istaysizmi?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "to'plam olib tashlanmoqda: \"%s\""
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr ""
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "o'rnatilmoqda: %s, qaerdan: %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "%s o'rnatilmoqda"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Bog'liqliklarni tekshirmasdan o'rnatib ko'raymi? (h/Y) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr "Paketlarni yangilash muhtoji yo'q"
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "O'rnatish mumkin"
#: ../urpm/md5sum.pm:26
#, c-format
-msgid "examining %s file"
-msgstr "%s fayli tekshirilmoqda"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
-#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "DIQQAT: MD5SUM faylida %s uchun md5sum haqida ma'lumot mavjud emas"
@@ -964,231 +972,231 @@ msgstr ""
msgid "medium \"%s\" already exists"
msgstr "to'plam allaqachon mavjud: \"%s\""
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr "(andoza bo'yicha e'tiborga olinmadi)"
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, c-format
msgid "adding medium \"%s\""
msgstr "to'plam qo'shilmoqda: %s"
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, fuzzy, c-format
msgid "directory %s does not exist"
msgstr "chroot direktoriyasi mavjud emas"
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, c-format
msgid "unable to parse media.cfg"
msgstr ""
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, c-format
msgid "retrieving media.cfg file..."
msgstr "media.cfg fayli yozib olinmoqda..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr ""
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "to'plam olib tashlanmoqda: \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "to'plam uchun urpmi qaytadan moslanmoqda: \"%s\""
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...qaytadan moslash muvaffaqiyatsiz tugadi"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "...qaytadan moslash tugadi"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "to'plamni yangilash hojati yo'q: \"%s\""
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "synthesis fayli (%s) tekshirilmoqda"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "to'plamining synthesis faylini o'qishda muammo ro'y berdi: \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr ""
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...nusxa ko'chirish muvaffaqiyatsiz tugadi"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr ""
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...nusxa ko'chirish bajarildi"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr ""
"'%s' faylidan nusxa ko'chirish muvaffaqiyatsiz tugadi (uning hajmi juda "
"kichik)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr ""
"olingan hdlist (yoki synthesis) fayli uchun md5sum soni hisoblanmoqda..."
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "%s'dan nusxa ko'chirish muvaffaqiyatsiz tugadi (md5sum noto'g'ri)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "hdlist fayli (%s) tekshirilmoqda"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "%s va %s tozalanmoqda"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "to'plamning hdlist fayli %s xato: %s"
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "'%s' uchun pubkey fayli tekshirilmoqda..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "RPM-faylining nomi (%s) noto'g'ri"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "'%s' uchun hdlist (yoki synthesis) fayli yozib olinmoqda..."
-
-#: ../urpm/media.pm:1478
-#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "qidirilgan hdlist (yoki synthesis) fayli topildi: %s"
+msgid "no metadata found for medium \"%s\""
+msgstr "to'plam uchun hech qanday hdlist fayli topilmadi: \"%s\""
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "to'plam uchun hech qanday hdlist fayli topilmadi: \"%s\""
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "'%s' uchun hdlist (yoki synthesis) fayli yozib olinmoqda..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "'%s' uchun pubkey fayli tekshirilmoqda..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr ""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "'%s' uchun pubkey faylini import qilib bo'lmadi"
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "to'plam uchun hech qanday hdlist fayli topilmadi: \"%s\""
+
+#: ../urpm/media.pm:1612
#, c-format
msgid "updated medium \"%s\""
msgstr "to'plam yangilandi: \"%s\""
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "RPM-fayllari %s'dan o'qilmoqda"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "JjJjNn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1259,7 +1267,7 @@ msgstr "Gb"
msgid "TB"
msgstr "Tb"
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1613,11 +1621,6 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr ""
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1633,118 +1636,136 @@ msgstr "to'plam uchun hdlist synthesis fayli yaratildi: \"%s\""
msgid "no xml-info available for medium \"%s\""
msgstr "to'plam uchun ro'yxat fayli yozilmoqda: \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "%s nomli paket mavjud emas"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Quyidagi paketlarda %s bor: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "%s paketlarini o'rnatib bo'lmaydi"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, c-format
msgid "Package %s is already installed"
msgstr "%s paketi allaqachon o'rnatilgan"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, c-format
msgid "Packages %s are already installed"
msgstr "%s paketlari allaqachon o'rnatilgan"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "%s yetishmaganiga ko'ra"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, c-format
msgid "due to already installed %s"
msgstr "%s paketi allaqachon o'rnatilganligi uchun"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr ""
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "%s'ni qoldirish uchun"
#: ../urpm/select.pm:607
#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Boshqa paketlarni yangilash uchun quyidagi paketni olib tashlash kerak:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Boshqa paketlarni yangilash uchun quyidagi paketlarni olib tashlash kerak:\n"
+"%s"
+
+#: ../urpm/select.pm:635
+#, c-format
msgid "in order to install %s"
msgstr "%s'ni o'rnatish uchun"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr ""
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Imzo haqiqiy emas (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr ""
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Imzo yetishmaydi (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't write file"
msgstr "Faylini saqlab bo'lmadi"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't open file"
msgstr "Faylini ochib bo'lmadi"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "%s amalidan %s amali bilan birga foydalanib bo'lmaydi"
@@ -1787,7 +1808,7 @@ msgstr ""
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr ""
@@ -1814,7 +1835,7 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - ortiqcha xabarlar bilan.\n"
@@ -1875,7 +1896,7 @@ msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "%d-ta paketni olib tashlashni istaysizmi?"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (h/Y) "
@@ -2113,152 +2134,152 @@ msgstr ""
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr ""
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --verbose - ortiqcha xabarlar bilan.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr ""
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr ""
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr ""
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --verbose - ortiqcha xabarlar bilan.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr ""
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr ""
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr "To'plam yangilanmoqda...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (yangilash)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (yangilash)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (o'rnatish)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (o'rnatish)"
-#: ../urpmi:462
+#: ../urpmi:450
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "'%s' bog'liqlikni ta'minlash uchun quyidagi paketlardan bittasi kerak:"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Nimani tanlaysiz? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2269,7 +2290,7 @@ msgstr ""
"paketlardan ko'ra eskiroq paketlarga bog'liq:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2280,7 +2301,7 @@ msgstr ""
"paketlardan ko'ra eskiroq paketlarga bog'liq:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2289,12 +2310,12 @@ msgstr ""
"\n"
"Bunga qaramasdan davom etishni istaysizmi?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (H/y) "
-#: ../urpmi:524
+#: ../urpmi:512
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2303,7 +2324,7 @@ msgstr ""
"Talab qilingan paketni o'rnatib bo'lmaydi:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2312,12 +2333,12 @@ msgstr ""
"Talab qilingan ba'zi bir paketlarni o'rnatib bo'lmaydi:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "paketni (%s) olib tashlash tizimni ishdan chiqaradi"
-#: ../urpmi:551
+#: ../urpmi:538
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2328,7 +2349,7 @@ msgstr ""
"uchun quyidagi paketni olib tashlash kerak:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2339,30 +2360,12 @@ msgstr ""
"uchun quyidagi paketlarni olib tashlash kerak:\n"
"%s\n"
-#: ../urpmi:560
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Boshqa paketlarni yangilash uchun quyidagi paketni olib tashlash kerak:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Boshqa paketlarni yangilash uchun quyidagi paketlarni olib tashlash kerak:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(sinov usuli, hech narsa olib tashlanmaydi)"
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2372,45 +2375,45 @@ msgstr ""
"Quyidagi bog'liqliklarni o'rnatish uchun siz root bo'lishingiz kerak:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] ""
"Bog'liqliklarni ta'minlash uchun quyidagi %d-ta paket olib tashlanadi"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(sinov usuli, hech narsa o'rnatilmaydi)"
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr "Diskda qo'shimcha %s joy ishlatiladi."
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr "Diskda %s joy bo'shatiladi."
-#: ../urpmi:618
+#: ../urpmi:603
#, fuzzy, c-format
msgid "%s of packages will be retrieved."
msgstr "Diskda %s joy bo'shatiladi."
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
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:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Bekor qilish"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Tayyor bo'lganda ENTER tugmasini bosing..."
@@ -3133,6 +3136,13 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Changelog fayli topilmadi\n"
+#~ msgid "examining %s file"
+#~ msgstr "%s fayli tekshirilmoqda"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "qidirilgan hdlist (yoki synthesis) fayli topildi: %s"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - yangilash to'plamini yaratish.\n"
diff --git a/po/uz@cyrillic.po b/po/uz@cyrillic.po
index e26ea80e..1537bf40 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+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"
@@ -28,7 +28,7 @@ msgstr "RPM ўрнатиш"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Хато: %s файли топилмади, амал бекор қилинади"
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Ок"
@@ -86,7 +86,7 @@ msgstr "Ўр_натиш"
msgid "_Save"
msgstr "_Сақлаш"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Бекор қилиш"
@@ -117,9 +117,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - шу ёрдам хабарини кўрсатиш.\n"
@@ -153,19 +152,19 @@ msgstr ""
" (--no-verify-rpm ушбу амалнинг тескариси, андоза бўйича "
"пакетнинг электрон имзоси текширилади).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - фақат кўрсатилган, вергул билан ажратилган, тўпламлардан "
"фойдаланиш.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
@@ -203,7 +202,22 @@ msgstr "Илтимос кутиб туринг..."
msgid "Must be root"
msgstr "root бўлиш керак"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, c-format
+msgid "Distribution Upgrade"
+msgstr ""
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Пакетни ўрнатиш..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Пакетни ўрнатиш..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -219,37 +233,37 @@ msgstr ""
msgid "Warning"
msgstr "Диққат"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "Ок"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (янгилаш)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (ўрнатиш)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Пакет танлови"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Қуйидаги пакетлардан бири керак:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "Тў_хтатиш"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -260,60 +274,55 @@ msgstr ""
"%s\n"
"Ўрнатишни давом эттиришни истайсизми?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Боғлиқликларни таъминлаш учун қуйидаги пакет ҳам ўрнатилади:"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Боғлиқликларни таъминлаш учун қуйидаги пакетлар ҳам ўрнатилади:"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d-та пакет, %d Мб)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Пакетни ўрнатиш..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr ""
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Тайёрланмоқда..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "\"%s\" (%s/%s) пакети ўрнатилмоқда..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Илтимос \"%s\" номли тўпламни [%s] ускунасига қўйинг"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "\"%s\" пакети олинмоқда..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Тайёр"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -324,28 +333,28 @@ msgstr ""
"%s\n"
"Балки urpmi маълумот базасини янгилашингиз керак."
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "Ўрнатиш муваффақиятсиз тугади:"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Ҳамма нарса аллақачон ўрнатилган"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Ўрнатиш тугади"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "%s ўчирилмоқда"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "urpmi қайтадан ишга тушмоқда"
@@ -386,7 +395,7 @@ msgstr " %s - андоза.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - RPM-файлининг тўлиқ номини кўрсатиш (NVRA)\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Фақат бошқарувчи пакетларни ўрнатиши мумкин"
@@ -396,134 +405,143 @@ msgstr "Фақат бошқарувчи пакетларни ўрнатиши м
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "тўпламни яратиб бўлмади: \"%s\"\n"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "\"%s\" пакети олинмоқда..."
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr ""
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "rpmdb'ни очиб бўлмади"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "RPM-файлининг номи (%s) нотўғри"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "RPM-файли (%s) олинмоқда..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...олиш тугади"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...олиш муваффақиятсиз тугади: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "RPM-файлига (%s) мурожаат қилиб бўлмади"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr ""
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "RPM-файлини рўйхатдан ўтказиб бўлмади"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr ""
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr ""
-#: ../urpm/args.pm:298
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: RPM-файлини (%s) ўқиб бўлмади\n"
-#: ../urpm/args.pm:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Имзо етишмайди (%s)"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot директорияси мавжуд эмас"
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr "%s амалидан %s амалисиз фойдаланиб бўлмайди"
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr "%s амалидан %s амали билан бирга фойдаланиб бўлмайди"
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Нусха кўчириш муваффақиятсиз тугади"
@@ -570,122 +588,122 @@ msgstr "\"%s\" тўплами икки марта аниқланган, амал
msgid "unable to write config file [%s]"
msgstr "мослама файлини (%s) ёзиб бўлмади"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "%s топилмади, %s ишлатилади"
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Проксига уланиш учун керакли маълумотни киритинг\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Фойдаланувчи:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Махфий сўз:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr "%s муваффақиятсиз тугади: хато коди %d"
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr "%s муваффақиятсиз тугади: хато коди %d"
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, c-format
msgid "copy failed"
msgstr "нусха кўчириш муваффақиятсиз тугади"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, c-format
msgid "wget is missing\n"
msgstr "wget дастури етишмаяпти\n"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, c-format
msgid "curl is missing\n"
msgstr "curl дастури етишмаяпти\n"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr "curl муваффақиятсиз тугади: ёзиб олиш бекор қилинди\n"
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr "rsync дастури етишмаяпти\n"
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr "ssh дастури етишмаяпти\n"
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr "prozilla дастури етишмаяпти\n"
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr "prozilla дастурини ишга тушириб бўлмади\n"
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "prozilla дастури етишмаяпти\n"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr " %s%% бажарилди, жами = %s, ETA = %s, тезлик = %s"
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr " %s%% бажарилди, тезлик = %s"
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, c-format
msgid "retrieving %s"
msgstr "%s олинмоқда"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, c-format
msgid "retrieved %s"
msgstr "%s олинди"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "%s учун номаълум протокол аниқланган"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "%s топилмади, %s ишлатилади"
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr ""
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "номаълум протокол: %s"
@@ -705,58 +723,58 @@ msgstr "%s пакети топилмади."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "RPM-файллари \"%s\" тўпламидан олинмоқда..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr ""
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "delta-rpm пакетидан RPM-файлини ажратиб бўлмади: %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "%s пакетини ўрнатиб бўлмади"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "тўплам олиб ташланмоқда: \"%s\""
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "...олиш муваффақиятсиз тугади: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, c-format
msgid "Removing package %s"
msgstr "%s пакети олиб ташланмоқда"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "%s пакети олиб ташланмоқда"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr ""
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "%s пакети ҳақида кўпроқ маълумот"
@@ -801,91 +819,81 @@ msgstr "тўхтатилмоқда"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Ўрнатиш муваффақиятсиз тугади"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Ўрнатиш муваффақиятсиз тугади:"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, c-format
msgid "The following package has bad signature"
msgstr "Қуйидаги пакетнинг имзоси хато"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Қуйидаги пакетларнинг имзолари нотўғри"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Ўрнатишни давом этишни истайсизми?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "тўплам олиб ташланмоқда: \"%s\""
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr ""
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "ўрнатилмоқда: %s, қаердан: %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "%s ўрнатилмоқда"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Боғлиқликларни текширмасдан ўрнатиб кўрайми? (ҳ/Й) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr "Пакетларни янгилаш муҳтожи йўқ"
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Ўрнатиш мумкин"
#: ../urpm/md5sum.pm:26
#, c-format
-msgid "examining %s file"
-msgstr "%s файли текширилмоқда"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
-#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "ДИҚҚАТ: MD5SUM файлида %s учун md5sum ҳақида маълумот мавжуд эмас"
@@ -960,229 +968,229 @@ msgstr ""
msgid "medium \"%s\" already exists"
msgstr "тўплам аллақачон мавжуд: \"%s\""
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr "(андоза бўйича эътиборга олинмади)"
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, c-format
msgid "adding medium \"%s\""
msgstr "тўплам қўшилмоқда: %s"
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, fuzzy, c-format
msgid "directory %s does not exist"
msgstr "chroot директорияси мавжуд эмас"
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, c-format
msgid "unable to parse media.cfg"
msgstr ""
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, c-format
msgid "retrieving media.cfg file..."
msgstr "media.cfg файли ёзиб олинмоқда..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr ""
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "тўплам олиб ташланмоқда: \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "тўплам учун urpmi қайтадан мосланмоқда: \"%s\""
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...қайтадан мослаш муваффақиятсиз тугади"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "...қайтадан мослаш тугади"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "тўпламни янгилаш ҳожати йўқ: \"%s\""
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "synthesis файли (%s) текширилмоқда"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "тўпламининг synthesis файлини ўқишда муаммо рўй берди: \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr ""
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...нусха кўчириш муваффақиятсиз тугади"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr ""
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...нусха кўчириш бажарилди"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr ""
"'%s' файлидан нусха кўчириш муваффақиятсиз тугади (унинг ҳажми жуда кичик)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "олинган hdlist (ёки synthesis) файли учун md5sum сони ҳисобланмоқда..."
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "%s'дан нусха кўчириш муваффақиятсиз тугади (md5sum нотўғри)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "hdlist файли (%s) текширилмоқда"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "%s ва %s тозаланмоқда"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "тўпламнинг hdlist файли %s хато: %s"
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "'%s' учун pubkey файли текширилмоқда..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "RPM-файлининг номи (%s) нотўғри"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "'%s' учун hdlist (ёки synthesis) файли ёзиб олинмоқда..."
-
-#: ../urpm/media.pm:1478
-#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "қидирилган hdlist (ёки synthesis) файли топилди: %s"
+msgid "no metadata found for medium \"%s\""
+msgstr "тўплам учун ҳеч қандай hdlist файли топилмади: \"%s\""
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "тўплам учун ҳеч қандай hdlist файли топилмади: \"%s\""
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "'%s' учун hdlist (ёки synthesis) файли ёзиб олинмоқда..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "'%s' учун pubkey файли текширилмоқда..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr ""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "'%s' учун pubkey файлини импорт қилиб бўлмади"
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "тўплам учун ҳеч қандай hdlist файли топилмади: \"%s\""
+
+#: ../urpm/media.pm:1612
#, c-format
msgid "updated medium \"%s\""
msgstr "тўплам янгиланди: \"%s\""
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "RPM-файллари %s'дан ўқилмоқда"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "ЖжJjNn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1253,7 +1261,7 @@ msgstr "Гб"
msgid "TB"
msgstr "Тб"
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1607,11 +1615,6 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr ""
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1627,118 +1630,136 @@ msgstr "тўплам учун hdlist synthesis файли яратилди: \"%s
msgid "no xml-info available for medium \"%s\""
msgstr "тўплам учун рўйхат файли ёзилмоқда: \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "%s номли пакет мавжуд эмас"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Қуйидаги пакетларда %s бор: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "%s пакетларини ўрнатиб бўлмайди"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, c-format
msgid "Package %s is already installed"
msgstr "%s пакети аллақачон ўрнатилган"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, c-format
msgid "Packages %s are already installed"
msgstr "%s пакетлари аллақачон ўрнатилган"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "%s етишмаганига кўра"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, c-format
msgid "due to already installed %s"
msgstr "%s пакети аллақачон ўрнатилганлиги учун"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr ""
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "%s'ни қолдириш учун"
#: ../urpm/select.pm:607
#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Бошқа пакетларни янгилаш учун қуйидаги пакетни олиб ташлаш керак:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Бошқа пакетларни янгилаш учун қуйидаги пакетларни олиб ташлаш керак:\n"
+"%s"
+
+#: ../urpm/select.pm:635
+#, c-format
msgid "in order to install %s"
msgstr "%s'ни ўрнатиш учун"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr ""
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Имзо ҳақиқий эмас (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr ""
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Имзо етишмайди (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't write file"
msgstr "Файлини сақлаб бўлмади"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't open file"
msgstr "Файлини очиб бўлмади"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "%s амалидан %s амали билан бирга фойдаланиб бўлмайди"
@@ -1779,7 +1800,7 @@ msgstr " --test - олиб ташлашни тўғри бажариш
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr ""
@@ -1806,7 +1827,7 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - ортиқча хабарлар билан.\n"
@@ -1866,7 +1887,7 @@ msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "%d-та пакетни олиб ташлашни истайсизми?"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (ҳ/Й) "
@@ -2104,152 +2125,152 @@ msgstr ""
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr ""
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --verbose - ортиқча хабарлар билан.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr ""
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr ""
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr ""
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --verbose - ортиқча хабарлар билан.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr ""
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr ""
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr "Тўплам янгиланмоқда...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (янгилаш)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (янгилаш)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (ўрнатиш)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (ўрнатиш)"
-#: ../urpmi:462
+#: ../urpmi:450
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "'%s' боғлиқликни таъминлаш учун қуйидаги пакетлардан биттаси керак:"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Нимани танлайсиз? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2260,7 +2281,7 @@ msgstr ""
"пакетлардан кўра эскироқ пакетларга боғлиқ:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2271,7 +2292,7 @@ msgstr ""
"пакетлардан кўра эскироқ пакетларга боғлиқ:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2280,12 +2301,12 @@ msgstr ""
"\n"
"Бунга қарамасдан давом этишни истайсизми?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (Ҳ/й) "
-#: ../urpmi:524
+#: ../urpmi:512
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2294,7 +2315,7 @@ msgstr ""
"Талаб қилинган пакетни ўрнатиб бўлмайди:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2303,12 +2324,12 @@ msgstr ""
"Талаб қилинган баъзи бир пакетларни ўрнатиб бўлмайди:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "пакетни (%s) олиб ташлаш тизимни ишдан чиқаради"
-#: ../urpmi:551
+#: ../urpmi:538
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2319,7 +2340,7 @@ msgstr ""
"учун қуйидаги пакетни олиб ташлаш керак:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2330,30 +2351,12 @@ msgstr ""
"учун қуйидаги пакетларни олиб ташлаш керак:\n"
"%s\n"
-#: ../urpmi:560
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Бошқа пакетларни янгилаш учун қуйидаги пакетни олиб ташлаш керак:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Бошқа пакетларни янгилаш учун қуйидаги пакетларни олиб ташлаш керак:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(синов усули, ҳеч нарса олиб ташланмайди)"
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2363,44 +2366,44 @@ msgstr ""
"Қуйидаги боғлиқликларни ўрнатиш учун сиз root бўлишингиз керак:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "Боғлиқликларни таъминлаш учун қуйидаги %d-та пакет олиб ташланади"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(синов усули, ҳеч нарса ўрнатилмайди)"
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr "Дискда қўшимча %s жой ишлатилади."
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr "Дискда %s жой бўшатилади."
-#: ../urpmi:618
+#: ../urpmi:603
#, fuzzy, c-format
msgid "%s of packages will be retrieved."
msgstr "Дискда %s жой бўшатилади."
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "%d-та пакетни ўрнатиш билан давом этишни истайсизми?"
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Бекор қилиш"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Тайёр бўлганда ENTER тугмасини босинг..."
@@ -3119,6 +3122,13 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Changelog файли топилмади\n"
+#~ msgid "examining %s file"
+#~ msgstr "%s файли текширилмоқда"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "қидирилган hdlist (ёки synthesis) файли топилди: %s"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - янгилаш тўпламини яратиш.\n"
diff --git a/po/vi.po b/po/vi.po
index a7591fae..91724fd8 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+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"
@@ -25,7 +25,7 @@ msgstr "Cài đặt RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_OK"
@@ -91,7 +91,7 @@ msgstr "_Cài đặt"
msgid "_Save"
msgstr "_Lưu"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "Bỏ _qua"
@@ -123,9 +123,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - in thông tin trợ giúp này.\n"
@@ -160,18 +159,18 @@ msgstr ""
" --verify-rpm - xác minh chữ ký rpm trước khi cài đặt.\n"
" (--no-verify-rpm để tắt nó, mặc định là bật).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - chỉ dùng phương tiện được trao, ngăn cách bởi dấu phẩy.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - cho phép tìm gói tin trong số các nhà cung cấp.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - không tìm các nhà cung cấp để kiếm gói tin.\n"
@@ -211,7 +210,22 @@ msgstr "Hãy chờ..."
msgid "Must be root"
msgstr "Phải là root"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "phân phối %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Cài đặt gói..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Cài đặt gói..."
+
+#: ../gurpmi2:111
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -227,37 +241,37 @@ msgstr ""
msgid "Warning"
msgstr "Cảnh báo"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "OK"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr "(để nâng cấp)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr "(để cài đặt)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Cần một gói trong các gói tin sau đây:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "Hủy _bỏ"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -268,60 +282,55 @@ msgstr ""
"%s\n"
"Tiếp tục?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Để thỏa mãn phụ thuộc, gói tin sau đây sẽ được cài đặt (%d MB)"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Để thỏa mãn phụ thuộc, gói tin sau đây sẽ được cài đặt (%d MB)"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d các gói, %d MB)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Cài đặt gói..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "không thể lấy các gói nguồn, hủy bỏ"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Đang chuẩn bị..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Đang cài đặt gói `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Hãy nạp phương tiện có tên \"%s\" trên thiết bị [%s]"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Đang tải về gói `%s'..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "H_oàn thành"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -332,28 +341,28 @@ msgstr ""
"%s\n"
"Có thể bạn nên cập nhật cơ sở dữ liệu của urpmi."
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Cài đặt không được"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Mọi thứ đã được cài đặt rồi"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Kết thúc cài đặt"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "gỡ bỏ %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "khởi chạy lại urpmi"
@@ -392,7 +401,7 @@ msgstr " mặc định là %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -g - in ra các nhóm với tên.\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Chỉ cho phép người dùng cao cấp được cài đặt các gói"
@@ -402,134 +411,143 @@ msgstr "Chỉ cho phép người dùng cao cấp được cài đặt các gói"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "Không thể tạo thư mục [%s] cho báo cáo lỗi"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "Đang tải về gói `%s'..."
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "đang dùng môi trường đặc hiệu trên %s\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "không thể mở rpmdb"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "tên tập tin rpm [%s] không hợp lệ"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "đang thu thập tập tin rpm [%s] ..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...hoàn thành việc thu thập"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...không thu thập được: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "không thể truy cập tập tin rpm [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "không thể phân tích cú pháp \"%s\" trong tập tin [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "không thể đăng ký tập tin rpm"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "lỗi đăng ký các gói tin cục bộ"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, 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:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Thiếu chữ ký (%s)"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Sao chép không được"
@@ -576,122 +594,122 @@ msgstr ""
msgid "unable to write config file [%s]"
msgstr "Không thể ghi tập tin cấu hình [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr ""
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Hãy nhập các yêu cầu để truy cập proxy\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Ngươì dùng:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Mật khẩu:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr ""
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr ""
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, fuzzy, c-format
msgid "copy failed"
msgstr "Sao chép không được"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, fuzzy, c-format
msgid "wget is missing\n"
msgstr "do thiếu %s"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, fuzzy, c-format
msgid "curl is missing\n"
msgstr "do thiếu %s"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr ""
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr ""
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr ""
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr ""
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr ""
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "do thiếu %s"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr ""
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, fuzzy, c-format
msgid "retrieving %s"
msgstr "gỡ bỏ %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...không thu thập được: %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "chỉ định giao thức không xác định cho %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr ""
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, 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:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "không thể quản lý giao thức: %s"
@@ -711,12 +729,12 @@ msgstr "Không tìm thấy gói tin %s."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "đang thu thập các tập tin rpm từ phương tiện \"%s\"..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -724,47 +742,47 @@ msgstr ""
"đã tạo phiên giao dịch cho việc cài đặt trên %s (gỡ bỏ=%d, cài đặt=%d, nâng "
"cấp=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "không thể tạo phiên giao dịch"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "không thể lấy rpm ra từ gói tin delta-rpm %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "không thể cài đặt gói %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "cài đặt %s từ %s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "...không thu thập được: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "gỡ bỏ gói %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "gỡ bỏ gói %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "cài đặt %s từ %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Thêm thông tin cho gói %s"
@@ -809,90 +827,80 @@ msgstr "Cảnh báo"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Cài đặt không được"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Cài đặt không được"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, 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:140
+#: ../urpm/main_loop.pm:143
#, 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:141
+#: ../urpm/main_loop.pm:144
#, 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:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "cài đặt %s từ %s"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "phân phối %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "cài đặt %s từ %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "đang cài đặt %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
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:249
+#: ../urpm/main_loop.pm:252
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Thử cố gắng cài đặt (--force)? (Có/[Không])"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "Có khả năng cài đặt"
#: ../urpm/md5sum.pm:26
-#, fuzzy, c-format
-msgid "examining %s file"
-msgstr "đang kiểm tra tập tin MD5SUM"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "cảnh báo: không có md5sum của %s trong tập tin MD5SUM"
@@ -966,223 +974,223 @@ msgstr "nên cài đặt thay vì nâng cấp gói %s"
msgid "medium \"%s\" already exists"
msgstr "phương tiện \"%s\" đã tồn tại rồi"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "đang đọc các header từ phương tiện \"%s\""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "gỡ bỏ phương tiện \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr ""
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "không thể mở rpmdb"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"không thể truy cập phương tiện cài đặt thứ nhất (không thấy tập tin hdlists)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "đang lấy về tập tin hdlists..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "đang thử chọn phương tiện không tồn tại \"%s\""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "đang chọn đa phương tiện: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "gỡ bỏ phương tiện \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "đang cấu hình lại urpmi cho phương tiện \"%s\""
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...không cấu hình lại được"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "hoàn thành việc cấu hình lại"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "phương tiện \"%s\" không được chọn"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "đang kiểm tra tập tin tổng hợp [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "trục trặc khi đọc tập tin tổng hợp của phương tiện \"%s\""
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "đang ghi tập tin danh sách cho phương tiện \"%s\""
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...sao chép không được"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "đang sao chép tập tin mô tả của \"%s\"..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...sao chép hoàn thành"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "lỗi sao chép [%s] (có lẽ tập tin nhỏ)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "tính toán md5sum của hdlist (hoặc synthesis) nguồn thu thập được"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "Lỗi bản sao của [%s] (md5sum không so khớp)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "đang kiểm tra tập tin hdlist [%s]"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "cài đặt %s từ %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "không tìm thấy tập tin hdlist cho phương tiện \"%s\""
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "đang sao chép tập tin mô tả của \"%s\"..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "tên tập tin rpm [%s] không hợp lệ"
-#: ../urpm/media.pm:1461
-#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "đang thu thập hdlist (hoặc synthesis) nguồn của \"%s\"..."
-
-#: ../urpm/media.pm:1478
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "đã tìm thấy hdlist (hoặc synthesis) nguồn được dò là %s"
+msgid "no metadata found for medium \"%s\""
+msgstr "không tìm thấy tập tin hdlist cho phương tiện \"%s\""
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "không tìm thấy tập tin hdlist cho phương tiện \"%s\""
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "đang thu thập hdlist (hoặc synthesis) nguồn của \"%s\"..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "đang kiểm tra tập tin pubkey của \"%s\"..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...đã nhập key %s từ tập tin pubkey của \"%s\""
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "không thể nhập tập tin pubkey của \"%s\""
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "không tìm thấy tập tin hdlist cho phương tiện \"%s\""
+
+#: ../urpm/media.pm:1612
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "đã thêm phương tiện %s"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "đang đọc các tập tin rpm từ [%s]"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "NnKk"
@@ -1192,7 +1200,7 @@ msgstr "NnKk"
# can hit those keys in their keyboard to reply.
# please keep the 'Yy' for compatibility reasons
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1263,7 +1271,7 @@ msgstr ""
msgid "TB"
msgstr ""
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1624,11 +1632,6 @@ msgstr " -f - in phiên bản, phát hành và arch với tên.\n"
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "đang dùng môi trường đặc hiệu trên %s\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1644,118 +1647,136 @@ msgstr "build tập tin tổng hợp hdlist cho phương tiện \"%s\""
msgid "no xml-info available for medium \"%s\""
msgstr "đang ghi tập tin danh sách cho phương tiện \"%s\""
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Không có gói tin với tên %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Các gói tin sau đây chứa %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
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:543
+#: ../urpm/select.pm:538
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Mọi thứ đã được cài đặt rồi"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Mọi thứ đã được cài đặt rồi"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "do thiếu %s"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "Mọi thứ đã được cài đặt rồi"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "vì không thỏa mãn %s"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "thử xúc tiến %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "để giữ %s"
#: ../urpm/select.pm:607
+#, fuzzy, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+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:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+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:635
#, c-format
msgid "in order to install %s"
msgstr "để cài đặt %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "vì xung đột với %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Chữ ký không hợp lệ (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Key ID không hợp lệ (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "Thiếu chữ ký (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "không thể ghi tập tin [%s]"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "Sao chép không được"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "Sao chép không được"
@@ -1798,7 +1819,7 @@ msgstr ""
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - phân phối urpmi qua các máy của alias.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - in ra tag packager: packager.\n"
@@ -1827,7 +1848,7 @@ msgstr ""
" --use-distrib - cấu hình nhanh chóng urpmi từ một distrib tree, giúp\n"
" cài đặt/bỏ cài đặt một chroot bằng tùy chọn --root.\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - phương thức verbose.\n"
@@ -1887,7 +1908,7 @@ msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "gỡ bỏ gói %s"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (Có/Không) "
@@ -2146,17 +2167,22 @@ msgstr " --url - in ra tag url: url.\n"
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - in ra mô tả tag: mô tả.\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - in ra xung đột tag: toàn bộ các xung đột.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - các gói tin cài đặt nên được bỏ qua\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, fuzzy, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --skip - các gói tin cài đặt nên được bỏ qua\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2165,71 +2191,71 @@ msgstr ""
" --more-choices - khi tìm thấy vài gói tin, đề xuất thêm lựa chọn so với\n"
" mặc định.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - không xóa rpms khỏi cache.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
" --strict-arch - chỉ nâng cấp các gói có cùng cấu trúc (architecture).\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - chọn toàn bộ các tương hợp trong dòng lệnh.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - chế độ yên lặng.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --verbose - phương thức verbose.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " tên hay tập tin rpm có trong dòng lệnh sẽ được cài đặt.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "Cái có thể được làm bằng các tập tin nhị phân khi dùng --install-src"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2238,17 +2264,12 @@ msgstr ""
"Thư mục [%s] đã tồn tại rồi, hãy dùng thư mục khác để ghi báo cáo lỗi hoặc "
"xóa thư mục đó đi"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Không thể tạo thư mục [%s] cho báo cáo lỗi"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2257,48 +2278,48 @@ msgstr ""
"Lỗi: %s được mount là read-only.\n"
"Dùng --allow-force để ép hoạt động."
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "(để nâng cấp)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "(để nâng cấp)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "(để cài đặt)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "(để cài đặt)"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "Để thỏa mãn các phụ thuộc, %d gói sau đây sẽ được gỡ bỏ (%d MB)"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Bạn lựa chọn gì? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2309,7 +2330,7 @@ msgstr ""
"gói cũ hơn các gói đã cài đặt:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2320,19 +2341,19 @@ msgstr ""
"gói cũ hơn các gói đã cài đặt:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Vẫn tiếp tục bằng bất cứ giá nào?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (Có/Không) "
-#: ../urpmi:524
+#: ../urpmi:512
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2341,7 +2362,7 @@ msgstr ""
"Không thể cài đặt một số gói tin được yêu cầu:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2350,12 +2371,12 @@ msgstr ""
"Không thể cài đặt một số gói tin được yêu cầu:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "việc gỡ bỏ gói tin %s sẽ phá vỡ hệ thống"
-#: ../urpmi:551
+#: ../urpmi:538
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2366,7 +2387,7 @@ msgstr ""
"để nâng cấp các gói khác:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2377,30 +2398,12 @@ msgstr ""
"để nâng cấp các gói khác:\n"
"%s\n"
-#: ../urpmi:560
-#, fuzzy, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Các gói sau đây phải được gỡ bỏ để nâng cấp các gói khác:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Các gói sau đây phải được gỡ bỏ để nâng cấp các gói khác:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2410,44 +2413,44 @@ msgstr ""
"Bạn phải là root để cài đặt các phụ thuộc sau đây:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "Để thỏa mãn các phụ thuộc, %d gói sau đây sẽ được gỡ bỏ (%d MB)"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Bỏ qua"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Nhấn Enter khi sẵn sàng ..."
@@ -3193,6 +3196,14 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Không thấy changelog\n"
+#, fuzzy
+#~ msgid "examining %s file"
+#~ msgstr "đang kiểm tra tập tin MD5SUM"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "đã tìm thấy hdlist (hoặc synthesis) nguồn được dò là %s"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - tạo phương tiện cập nhật.\n"
diff --git a/po/wa.po b/po/wa.po
index 6a11b068..bddc059b 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+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"
@@ -32,7 +32,7 @@ msgstr "Astalaedje do pacaedje"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Aroke: dji n' a savou trover l' fitchî %s, dj' arestêye l' operåcion"
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "'l est bon"
@@ -98,7 +98,7 @@ msgstr "_Astaler"
msgid "_Save"
msgstr "_Schaper"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "_Rinoncî"
@@ -130,9 +130,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - mostere ci messaedje d' aidance chal.\n"
@@ -171,19 +170,19 @@ msgstr ""
" --verify-rpm - verifyî li sinateure rpm divant d' astaler.\n"
" (--no-verify-rpm po n' nén l' fé, prémetou=verifyî).\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - eployî rén k' les sopoirts dinés, separés pa des comas.\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - fé des rcweraedjes ezès aloyances po trover on pacaedje.\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
@@ -226,7 +225,22 @@ msgstr "Tårdjîz on pô s' i vos plait..."
msgid "Must be root"
msgstr "Vos dvoz esse root"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "dji distribouwe %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Astalaedje do pacaedje..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Astalaedje do pacaedje..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -242,37 +256,37 @@ msgstr ""
msgid "Warning"
msgstr "Adviertixhmint"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "'l est bon"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (a mete a djoû)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (a-z astaler)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "Tchoezixhaedje des pacaedjes"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "I gn a mezåjhe d' onk des pacaedjes ki shuvèt:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "_Rinoncî"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -284,61 +298,56 @@ msgstr ""
"%s\n"
"Continouwer tot l' minme avou l' astalaedje?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Po satisfyî les aloyaedjes, li pacaedje aloyî ki shût va esse astalé:"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Po satisfyî les aloyaedjes, les pacaedjes shuvants vont esse astalés"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d pacaedje, %d Mo)"
msgstr[1] "(%d pacaedjes, %d Mo)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Astalaedje do pacaedje..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "dji n' a savou prinde les pacaedjes sourdants, dji lai toumer"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Dj' aprestêye..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Dj' astale li pacaedje «%s» (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "S' i vs plait metoz li sopoirt lomé «%s» el éndjin [%s]"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "Dj' aberwetêye li pacaedje «%s»..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Fwait"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -349,28 +358,28 @@ msgstr ""
"%s\n"
"Vos dvrîz motoit mete a djoû li båze di dnêyes urpmi."
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "L' astalåcion a fwait berwete:"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "tot a ddja stî astalé"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "L' astalåcion a fini"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "dji oistêye li pacaedje %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "renondant urpmi"
@@ -410,7 +419,7 @@ msgstr " li prémetou est %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - håyner l' no etir do rpm (NVRA).\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Seulmint li super-uzeu a l' droet d' astaler des pacaedjes"
@@ -420,134 +429,143 @@ msgstr "Seulmint li super-uzeu a l' droet d' astaler des pacaedjes"
msgid "Running urpmi in restricted mode..."
msgstr "Enondant urpmi e môde rastrindou..."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "dji n' sai askepyî l' ridant [%s] po fé des rapoirts di bug"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "Dj' aberwetêye li pacaedje «%s»..."
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "eployant on evironmint specifike so %s\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "dji n' sai drovi l' båze rpmdb"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "no d' fitchî rpm nén valåbe [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "aberwetaedje di fitchî rpm [%s]..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...l' aberwetaedje a stî comifåt"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...l' aberwetaedje a fwait berwete: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "dji n' sai aveur accès å fitchî rpm [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "dji n' sai analijhî l' fitchî spec «%s» [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "dji n' sai redjîstrer l' fitchî rpm"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Årtchitecteure nén copatibe pol rpm [%s]"
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "åk n' a nén stî tot-z eredjistrant les pacaedjes locås"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
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:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, 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:298
+#: ../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:375
+#: ../urpm/args.pm:383
#, fuzzy, c-format
msgid "unexpected expression %s"
msgstr "Patrons po les ratourneures:\n"
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "I manke li sinateure (%s)"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, fuzzy, c-format
msgid "no expression to close"
msgstr "Patrons po les ratourneures:\n"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "li ridant po candjî d' raecene (chroot) n' egzistêye nén"
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr "Dji n' sai eployî %s sins %s"
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr "Dji n' sai eployî %s avou %s"
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr "Pår trop d' årgumints\n"
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Li copiaedje a fwait berwete"
@@ -594,122 +612,122 @@ msgstr "li sopoirt «%s» est defini deus côps, dji lai toumer"
msgid "unable to write config file [%s]"
msgstr "dji n' sai scrire li fitchî d' apontiaedje [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "%s n' est nén la, dji rtchai so %s"
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Dinez vos informåcions po-z aveur accès å procsi\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "No d' uzeu:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Sicret:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr "%s a fwait berwete: sinå di rexhowe %d"
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr "%s a fwait berwete: côde di rexhowe %d"
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, c-format
msgid "copy failed"
msgstr "li copiaedje a fwait berwete"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, c-format
msgid "wget is missing\n"
msgstr "wget n' est nén la\n"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, c-format
msgid "curl is missing\n"
msgstr "curl n' est nén la\n"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr "curl a fwait berwete: aberwetaedje nén fwait\n"
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr "rsync n' est nén la\n"
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr "ssh n' est nén la\n"
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr "prozilla n' est nén la\n"
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr "Dji n' sai enonder prozilla\n"
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "prozilla n' est nén la\n"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr " %s%% di %s di fwait, ETA = %s, radisté = %s"
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr " %s%% di fwait, radisté = %s"
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, c-format
msgid "retrieving %s"
msgstr "prindant %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, c-format
msgid "retrieved %s"
msgstr "%s a stî pris"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "protocole nén cnoxhou defini po %s"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "%s n' est nén la, dji rtchai so %s"
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, 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:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "dji n' sai manaedjî l' protocole: %s"
@@ -729,12 +747,12 @@ msgstr "li pacaedje %s n' a nén stî trové."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "aberwetaedje des fitchîs rpms do sopoirt «%s»..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -742,47 +760,47 @@ msgstr ""
"ahivé ene transaccion po l' astalaedje so %s (oister=%d, astaler=%d, mete a "
"djoû=%d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "dji n' sai ahiver ene transaccion"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "dji n' sai saetchî èn rpm foû do pacaedje delta-rpm %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "dji n' sai astaler l' pacaedje %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "oistaedje des rpms astalés (%s) a pårti di %s"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "...l' aberwetaedje a fwait berwete: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "dji oistêye li pacaedje %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "dji oistêye li pacaedje %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "oistaedje des rpms astalés (%s) a pårti di %s"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "Pus di racsegnes sol pacaedje %s"
@@ -827,91 +845,81 @@ msgstr "Adviertixhmint"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "L' astalåcion a fwait berwete"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "L' astalåcion a fwait berwete:"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, c-format
msgid "The following package has bad signature"
msgstr "Li pacaedje ki shût a-st ene mwaijhe sinateure"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "Les pacaedjes ki shuvèt ont ene mwaijhe sinateure"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Voloz vs continouwer avou l' astalaedje?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "oistaedje des rpms astalés (%s) a pårti di %s"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "dji distribouwe %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "dj' astale %s a pårti di %s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "dj' astale %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Sayî d' astaler sin verifyî les aloyaedjes? (o/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Sayî d' astaler co pus foirt (--force)? (o/N) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr "Les pacaedjes sont-st a djoû"
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "L' astalaedje est possibe"
#: ../urpm/md5sum.pm:26
#, c-format
-msgid "examining %s file"
-msgstr "corwaitaedje do fitchî %s"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
-#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr ""
"adviertixhmint: li verifiaedje md5sum po %s n' si trove nén e fitchî MD5SUM"
@@ -988,234 +996,234 @@ msgstr "dji va-st astaler purade ki mete a djoû l' pacaedje %s"
msgid "medium \"%s\" already exists"
msgstr "li sopoirt «%s» egzistêye dedja"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr "(ignoré come prémetowe dujhance)"
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "radjoutant l' sopoirt «%s» divant l' sopoirt då lon «%s»"
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, c-format
msgid "adding medium \"%s\""
msgstr "radjoutaedje do sopoirt «%s»"
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, fuzzy, c-format
msgid "directory %s does not exist"
msgstr "li ridant po candjî d' raecene (chroot) n' egzistêye nén"
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "i shonne ki cist eplaeçmint la n' a nole distribucion"
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, c-format
msgid "unable to parse media.cfg"
msgstr "dji n' sai analijhî l' fitchî media.cfg"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"dji n' a savou trover l' sopoirt d' astalaedje (nou fitchî media.cfg di "
"trové)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, c-format
msgid "retrieving media.cfg file..."
msgstr "aberwetaedje do fitchî media.cfg..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "dji saye di tchoezi l' sopoirt «%s» ki n' egzistêye nén"
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "dji tchoezixh des sopoirts multipes: %s"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "dji bodje li sopoirt «%s»"
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "rapontiaedje d' urpmi pol sopoirt «%s»"
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "...li rapontiaedje a fwait berwete"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "li rapontiaedje a stî fwait"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "li sopoirt «%s» est a djoû"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "corwaitaedje do fitchî d' sinteze [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "åk n' a nén stî tot lijhant li fitchî di sinteze do sopoirt «%s»"
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "dji copeye [%s] pol sopoirt «%s»..."
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...li copiaedje a fwait berwete"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "copiaedje do fitchî di discrijhaedjes di «%s»..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...li copiaedje a stî comifåt"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr ""
"li copeye di [%s] a fwait berwete (li fitchî est pår pitit ki s' end est "
"bizåre)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr ""
"dji carcule li md5sum do fitchî «hdlist» (ou del sinteze) ki vént d' esse "
"aberweté"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "li copeye di [%s] a fwait berwete (li md5sum ni corespond nén)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "corwaitaedje do fitchî hdlist [%s]"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "netiaedje di %s et %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "fitchî hdlist %s nén valide pol sopoirt «%s»"
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "copiaedje do fitchî di discrijhaedjes di «%s»..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "no d' fitchî rpm nén valåbe [%s]"
-#: ../urpm/media.pm:1461
-#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "aberwetaedje do sourdant «hdlist» (ou del sinteze) po «%s»..."
-
-#: ../urpm/media.pm:1478
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "«hdlist» (ou sinteze) ki vént d' esse sayî trové come «%s»"
+msgid "no metadata found for medium \"%s\""
+msgstr "nou fitchî hdlist di trové pol sopoirt «%s»"
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "nou fitchî hdlist di trové pol sopoirt «%s»"
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "aberwetaedje do sourdant «hdlist» (ou del sinteze) po «%s»..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "corwaitaedje do fitchî avou l' clé publike da «%s»..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...aberwetaedje del clé %s do fitchî di clés publikes da «%s»"
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "dji n' sai aberweter li clé publike da «%s»"
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "nou fitchî hdlist di trové pol sopoirt «%s»"
+
+#: ../urpm/media.pm:1612
#, c-format
msgid "updated medium \"%s\""
msgstr "sopoirt «%s» metou a djoû"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "lijhant les fitchîs rpm foû di [%s]"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1286,7 +1294,7 @@ msgstr ""
msgid "TB"
msgstr ""
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1661,11 +1669,6 @@ msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
"Cogne nén comifåt: vos n' poloz eployî k' ene seule etike multi-valixhances"
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "eployant on evironmint specifike so %s\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1681,118 +1684,137 @@ msgstr "dji fwai li fitchî d' sinteze hdlist pol sopoirt «%s»"
msgid "no xml-info available for medium \"%s\""
msgstr "dji screye li fitchî d' djivêye («list») pol sopoirt «%s»"
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "Nou pacaedje lomé %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Les pacaedjes ki shuvèt ont å dvins %s: %s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
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:543
+#: ../urpm/select.pm:538
#, c-format
msgid "Package %s is already installed"
msgstr "Li pacaedje %s a ddja stî astalé"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, c-format
msgid "Packages %s are already installed"
msgstr "Les pacaedjes %s ont ddja stî astalés"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "cåze di %s ki n' est nén la"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "Li pacaedje %s a ddja stî astalé"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "cåze di %s ki n' est nén satisfyî"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "dji saye di promouvwer %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "po wårder %s"
#: ../urpm/select.pm:607
#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Li pacaedje shuvant a mezåjhe d' esse oisté po des ôtes esse metous a djoû:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Les pacaedjes shuvants ont mezåjhe d' esse oistés po des ôtes esse metous a "
+"djoû:\n"
+"%s"
+
+#: ../urpm/select.pm:635
+#, c-format
msgid "in order to install %s"
msgstr "po-z astaler %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "cåze di conflits avou %s"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "Sinateure nén valide (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "ID di clé nén valide (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "I manke li sinateure (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "Dji n' sai ahiver l' fitchî d' apontiaedje [%s]"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "Li copiaedje a fwait berwete"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "Dji n' sai eployî %s avou %s"
@@ -1837,7 +1859,7 @@ msgstr ""
" --parallel - distribouwaedje di l' ovraedje d' urpmi so\n"
" so sacwantès éndjoles defineyes come alias.\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Rifé l' pacaedje divant d' disfacer.\n"
@@ -1867,7 +1889,7 @@ msgstr ""
" distribucion, ahessåve po (diz)astaler on sistinme\n"
" chroot avou l' tchuze «--root».\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - môde badjawe.\n"
@@ -1936,7 +1958,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "Oister %d pacaedje?"
msgstr[1] "Oister %d pacaedjes?"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (o/N) "
@@ -2205,17 +2227,22 @@ msgstr ""
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - èn nén enonder les scripres do pacaedje.\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - les conflits avou ds ôtes pacaedjes ou modêyes.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - pacaedjes k' i fåt passer houte et n' nén astaler\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, fuzzy, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --skip - pacaedjes k' i fåt passer houte et n' nén astaler\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2224,73 +2251,73 @@ msgstr ""
" --more-choices - cwand sacwants pacaedjes sont trovés, propoze pus di\n"
" tchuzes ki les prémetowes.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - èn nén serer l' båze di dnêyes rpm.\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
" --strict-arch - mete a djoû seulmint les pacaedjes pol minme "
"årtchitecteure.\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - eployî --all-matches pol roye di comande.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - môde taijheu.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --verbose - môde badjawe.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " les nos ou fitchîs rpm dinés sol roye di cmande seront-st astalés.\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
"Vos n' poloz nén astaler des pacaedjes rpm binaires avou «--install-src»"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2299,17 +2326,12 @@ msgstr ""
"Li ridant [%s] egzistêye dedja, eployîz è èn ôte po les rapoirts di bugs, "
"oudonbén disfacez l'."
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "dji n' sai askepyî l' ridant [%s] po fé des rapoirts di bug"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2318,36 +2340,36 @@ msgstr ""
"Aroke: i shonne ki %s soeye monté e môde seulmint-lére.\n"
"Eployîz --allow-force po foircî l' operåcion."
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr "Metant a djoû les sopoirts...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (a mete a djoû)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (a mete a djoû)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (a-z astaler)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (a-z astaler)"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2356,12 +2378,12 @@ msgstr ""
"Po satisfyî les aloyaedjes, les %d pacaedjes ki shuvèt vont esse disastalés "
"(%d Mo)"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Ké tchoezixhoz vs? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2372,7 +2394,7 @@ msgstr ""
"d' ôtes pacaedjes ki sont pus vîs kel ci k' est astalé:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2383,7 +2405,7 @@ msgstr ""
"d' ôtes pacaedjes ki sont pus vîs k' les cis k' sont astalés:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2392,12 +2414,12 @@ msgstr ""
"\n"
"Voloz vs tot l' minme continouwer l' astalaedje?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (O/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2406,7 +2428,7 @@ msgstr ""
"On pacaedje dimandé n' pout nén esse astalé:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2415,12 +2437,12 @@ msgstr ""
"Sacwants pacaedjes dimandés n' polèt nén esse astalés:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "oister li pacaedje %s va spiyî vosse sistinme"
-#: ../urpmi:551
+#: ../urpmi:538
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2431,7 +2453,7 @@ msgstr ""
"a mezåjhe d' esse oisté po des ôtes esse metous a djoû:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2442,31 +2464,12 @@ msgstr ""
"ont mezåjhe d' esse oistés po des ôtes esse metous a djoû:\n"
"%s\n"
-#: ../urpmi:560
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Li pacaedje shuvant a mezåjhe d' esse oisté po des ôtes esse metous a djoû:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Les pacaedjes shuvants ont mezåjhe d' esse oistés po des ôtes esse metous a "
-"djoû:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(c' est seulmint ene saye, li dizastalaedje n' est nén fwait)"
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2476,7 +2479,7 @@ msgstr ""
"Vos dvoz esse root po-z astaler les aloyances shuvantes:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
@@ -2487,39 +2490,39 @@ msgstr[1] ""
"Po satisfyî les aloyaedjes, les %d pacaedjes ki shuvèt vont esse disastalés "
"(%d Mo)"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(c' est seulmint ene saye, l' astalaedje n' est nén fwait)"
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../urpmi:619
+#: ../urpmi:604
#, fuzzy, c-format
msgid "Proceed with the installation of one package?"
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:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Rinoncî"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Tapez so «enter» cwand c' est fwait..."
@@ -3288,6 +3291,13 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Nou djournå des candjmints di trové\n"
+#~ msgid "examining %s file"
+#~ msgstr "corwaitaedje do fitchî %s"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "«hdlist» (ou sinteze) ki vént d' esse sayî trové come «%s»"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - fé on sopoirt di metaedje a djoû.\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index cfa1bc0a..8f390e0e 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: 2008-09-23 18:55+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+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."
@@ -33,7 +33,7 @@ msgstr "RPM 安装"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "错误: 找不到文件 %s,将取消操作"
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "确定(_O)"
@@ -99,7 +99,7 @@ msgstr "安装(_I)"
msgid "_Save"
msgstr "保存(_S)"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "取消(_C)"
@@ -169,12 +169,12 @@ msgstr ""
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - 只使用列出的介质,介质之间用逗号分隔。\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - 允许在 provides 字段中查找软件包。\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - 不在 provides 字段中查找软件包。\n"
@@ -212,7 +212,22 @@ msgstr "请稍候..."
msgid "Must be root"
msgstr "必须是 root"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "正在分发 %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "软件包安装..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "软件包安装..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -228,37 +243,37 @@ msgstr ""
msgid "Warning"
msgstr "警告"
-#: ../gurpmi2:134 ../urpmi:624
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "确定"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr "(升级)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr "(安装)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "软件包选择"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "需要下列软件包之一:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "中止(_A)"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -269,60 +284,55 @@ msgstr ""
"%s\n"
"仍然继续安装吗?"
-#: ../gurpmi2:241 ../urpmi:591
+#: ../gurpmi2:240 ../urpmi:592
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "为了满足依赖关系,将安装下列软件包:"
-#: ../gurpmi2:242 ../urpmi:592
+#: ../gurpmi2:241 ../urpmi:593
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "为了满足依赖关系,将安装下列软件包:"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d 个软件包,%d MB)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "软件包安装..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "无法读取源软件包,中止"
-#: ../gurpmi2:266 ../urpm/install.pm:81
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "正在准备..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "正在安装软件包“%s”(%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:619
+#: ../gurpmi2:286 ../urpmi:620
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "请插入介质“%s”"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "正在下载软件包“%s”..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "完成(_D)"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:114
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -333,28 +343,28 @@ msgstr ""
"%s\n"
"您可能需要更新您的 urpmi 数据库"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "安装失败: "
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "软件包已经安装"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "安装完成"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "正在删除 %s"
-#: ../gurpmi2:354 ../urpmi:686
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "重新启动 urpmi"
@@ -393,7 +403,7 @@ msgstr " 默认为 %s。\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - 输出 rpm 的完整名称(NVRA)。\n"
-#: ../rurpmi:11 ../urpmi:268
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "只允许超级用户安装软件包"
@@ -489,57 +499,57 @@ msgstr "运行于限制模式运行时,禁止执行此操作"
msgid "bad proxy declaration on command line\n"
msgstr "命令行声明的代理服务器无效\n"
-#: ../urpm/args.pm:305
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "意外表达式 %s"
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "%s 前缺少表达式"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "意外表达式 %s(建议:使用 -a 或 -o?)"
-#: ../urpm/args.pm:393
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "没有要关闭的表达式"
-#: ../urpm/args.pm:402
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr "默认情况下,urpmf 使用正则表达式。您应该使用选项“--literal”"
-#: ../urpm/args.pm:470
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot 目录不存在"
-#: ../urpm/args.pm:493
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr "没有 %2$s 无法使用 %1$s"
-#: ../urpm/args.pm:496 ../urpm/args.pm:499 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr "无法和 %2$s 一起使用 %1$s"
-#: ../urpm/args.pm:507
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr "参数太多\n"
-#: ../urpm/bug_report.pm:54 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "复制失败"
@@ -726,53 +736,53 @@ msgstr "正在从介质“%s”上获取 rpm 文件..."
msgid "[repackaging]"
msgstr "[重新打包]"
-#: ../urpm/install.pm:168
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr "已创建在 %s 上安装的交易(删除=%d,安装=%d,升级=%d)"
-#: ../urpm/install.pm:171
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "无法创建交易"
-#: ../urpm/install.pm:194
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "无法从 delta-rpm 软件包 %s 中提取 rpm"
-#: ../urpm/install.pm:207
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "无法安装软件包 %s"
-#: ../urpm/install.pm:210
+#: ../urpm/install.pm:211
#, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "正在从 %2$s 删除错误的 rpm(%1$s)"
-#: ../urpm/install.pm:211 ../urpm/install.pm:268
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, c-format
msgid "removing %s failed: %s"
msgstr "删除 %s 失败: %s"
-#: ../urpm/install.pm:249
+#: ../urpm/install.pm:250
#, c-format
msgid "Removing package %s"
msgstr "删除软件包 %s"
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "删除软件包 %s"
-#: ../urpm/install.pm:266
+#: ../urpm/install.pm:267
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "正在从 %2$s 删除已安装的 rpm(%1$s)"
-#: ../urpm/install.pm:274
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "关于软件包 %s 的更多信息"
@@ -1181,13 +1191,13 @@ msgstr "找到地理位置较近的 %s %.2f %.2f,从时区 %s"
msgid "getting mirror list from %s"
msgstr "从 %s 中获得镜像列表"
-#: ../urpm/msg.pm:63 ../urpmi:501 ../urpmi:516 ../urpmi:611
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "nN否"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:552 ../urpmi:647 ../urpmi:653
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1340,6 +1350,291 @@ msgstr "正在装载 %s"
msgid "unmounting %s"
msgstr "正在拆卸 %s"
+#: ../urpm/search.pm:29 ../urpmf:29
+#, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2006 Mandriva.\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 版本 %s\n"
+"版权 (C) 2002-2006 Mandriva。\n"
+"这是自由软件,可以依照 GNU GPL 重新发布。\n"
+"\n"
+"用法:\n"
+
+#: ../urpm/search.pm:36 ../urpmf:36
+#, c-format
+msgid " --version - print this tool's version number.\n"
+msgstr " --version - 打印此工具的版本号。\n"
+
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid " --env - use specific environment (typically a bug report).\n"
+msgstr " --env - 使用指定的环境(特别是进行故障报告时)。\n"
+
+#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid " --excludemedia - do not use the given media, separated by comma.\n"
+msgstr " --excludemedia - 不使用给定介质,介质之间用逗号分隔。\n"
+
+#: ../urpm/search.pm:39 ../urpmf:39
+#, c-format
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgstr " --literal, -l - 不匹配模式,参数为字面字符串。\n"
+
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
+msgstr " --urpmi-root - 使用另一个 root 来存储 urpmi db 和安装 rpm。\n"
+
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+" --sortmedia - sort media according to substrings separated by comma.\n"
+msgstr " --sortmedia - 根据用逗号分隔的子字符串排序介质。\n"
+
+#: ../urpm/search.pm:43 ../urpmf:43
+#, c-format
+msgid " --use-distrib - use the given path to access media\n"
+msgstr " --use-distrib - 使用给定的路径访问介质\n"
+
+#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
+msgstr " --synthesis - 使用指定的综合文件而不是 urpmi db。\n"
+
+#: ../urpm/search.pm:45 ../urpmf:45
+#, c-format
+msgid " --uniq - do not print identical lines twice.\n"
+msgstr " --uniq - 不打印相同行。\n"
+
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid " --update - use only update media.\n"
+msgstr " --update - 只使用升级介质。\n"
+
+#: ../urpm/search.pm:47 ../urpmf:47
+#, c-format
+msgid " --verbose - verbose mode.\n"
+msgstr " --verbose - 详细提示。\n"
+
+#: ../urpm/search.pm:48 ../urpmf:48
+#, c-format
+msgid " -i - ignore case distinctions in patterns.\n"
+msgstr " -i - 忽略各种情况下的冲突。\n"
+
+#: ../urpm/search.pm:49 ../urpmf:49
+#, c-format
+msgid " -I - honor case distinctions in patterns (default).\n"
+msgstr " -I - 在模式中遵从大小写(默认值)。\n"
+
+#: ../urpm/search.pm:50 ../urpmf:50
+#, c-format
+msgid " -F<str> - change field separator (defaults to ':').\n"
+msgstr " -F<字符串> - 更改字段分隔符(默认为“:”)。\n"
+
+#: ../urpm/search.pm:51 ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "模式表达式: \n"
+
+#: ../urpm/search.pm:52 ../urpmf:52
+#, c-format
+msgid " text - any text is parsed as a regexp, unless -l is used.\n"
+msgstr " 文本 - 任何文本都将被处理为正则表达式,除非使用了 -l。\n"
+
+#: ../urpm/search.pm:53 ../urpmf:53
+#, c-format
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -e - 直接保留 perl 代码,就像 perl -e。\n"
+
+#: ../urpm/search.pm:54 ../urpmf:54
+#, c-format
+msgid " -a - binary AND operator.\n"
+msgstr " -a - 二元 AND 操作符。\n"
+
+#: ../urpm/search.pm:55 ../urpmf:55
+#, c-format
+msgid " -o - binary OR operator.\n"
+msgstr " -o - 二元 OR 操作符。\n"
+
+#: ../urpm/search.pm:56 ../urpmf:56
+#, c-format
+msgid " ! - unary NOT.\n"
+msgstr " ! - 一元 NOT。\n"
+
+#: ../urpm/search.pm:57 ../urpmf:57
+#, c-format
+msgid " ( ) - left and right parentheses.\n"
+msgstr " ( ) - 左右括号。\n"
+
+#: ../urpm/search.pm:58 ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "标记清单:\n"
+
+#: ../urpm/search.pm:59 ../urpmf:59
+#, c-format
+msgid " --qf - specify a printf-like output format\n"
+msgstr " --qf - 指定类似 printf 的输出格式\n"
+
+#: ../urpm/search.pm:60 ../urpmf:60
+#, c-format
+msgid " example: '%%name:%%files'\n"
+msgstr " 例如:“%%name:%%files”\n"
+
+#: ../urpm/search.pm:61 ../urpmf:61
+#, c-format
+msgid " --arch - architecture\n"
+msgstr " --arch - 体系\n"
+
+#: ../urpm/search.pm:62 ../urpmf:62
+#, c-format
+msgid " --buildhost - build host\n"
+msgstr " --buildhost - 编译主机\n"
+
+#: ../urpm/search.pm:63 ../urpmf:63
+#, c-format
+msgid " --buildtime - build time\n"
+msgstr " --buildtime - 编译时间\n"
+
+#: ../urpm/search.pm:64 ../urpmf:64
+#, c-format
+msgid " --conffiles - configuration files\n"
+msgstr " --conffiles - 配置文件\n"
+
+#: ../urpm/search.pm:65 ../urpmf:65
+#, c-format
+msgid " --conflicts - conflict tags\n"
+msgstr " --conflicts - conflict 标签\n"
+
+#: ../urpm/search.pm:66 ../urpmf:66
+#, c-format
+msgid " --description - package description\n"
+msgstr " --description - 软件包描述\n"
+
+#: ../urpm/search.pm:67 ../urpmf:67
+#, c-format
+msgid " --distribution - distribution\n"
+msgstr " --distribution - 发行版\n"
+
+#: ../urpm/search.pm:68 ../urpmf:68
+#, c-format
+msgid " --epoch - epoch\n"
+msgstr " --epoch - 周期\n"
+
+#: ../urpm/search.pm:69 ../urpmf:69
+#, c-format
+msgid " --filename - filename of the package\n"
+msgstr " --fiename - 软件包文件名\n"
+
+#: ../urpm/search.pm:70 ../urpmf:70
+#, c-format
+msgid " --files - list of files contained in the package\n"
+msgstr " --files - 列出软件包中包含的文件\n"
+
+#: ../urpm/search.pm:71 ../urpmf:71
+#, c-format
+msgid " --group - group\n"
+msgstr " --group - 分组\n"
+
+#: ../urpm/search.pm:72 ../urpmf:72
+#, c-format
+msgid " --license - license\n"
+msgstr " --license - 许可协议\n"
+
+#: ../urpm/search.pm:73 ../urpmf:73
+#, c-format
+msgid " --name - package name\n"
+msgstr " --name - 软件包名称\n"
+
+#: ../urpm/search.pm:74 ../urpmf:74
+#, c-format
+msgid " --obsoletes - obsoletes tags\n"
+msgstr " --obsoletes - obsolets 标签\n"
+
+#: ../urpm/search.pm:75 ../urpmf:75
+#, c-format
+msgid " --packager - packager\n"
+msgstr " --packager - 打包者\n"
+
+#: ../urpm/search.pm:76 ../urpmf:76
+#, c-format
+msgid " --provides - provides tags\n"
+msgstr " --provides - provides 标签\n"
+
+#: ../urpm/search.pm:77 ../urpmf:77
+#, c-format
+msgid " --requires - requires tags\n"
+msgstr " --requires - requires 标签\n"
+
+#: ../urpm/search.pm:78 ../urpmf:78
+#, c-format
+msgid " --size - installed size\n"
+msgstr " --size - 安装大小\n"
+
+#: ../urpm/search.pm:79 ../urpmf:79
+#, c-format
+msgid " --sourcerpm - source rpm name\n"
+msgstr " --sourcerpm - 源 rpm 名称\n"
+
+#: ../urpm/search.pm:80 ../urpmf:80
+#, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --suggests - suggests 标签\n"
+
+#: ../urpm/search.pm:81 ../urpmf:81
+#, c-format
+msgid " --summary - summary\n"
+msgstr " --summary - 摘要\n"
+
+#: ../urpm/search.pm:82 ../urpmf:82
+#, c-format
+msgid " --url - url\n"
+msgstr " --url - url\n"
+
+#: ../urpm/search.pm:83 ../urpmf:83
+#, c-format
+msgid " --vendor - vendor\n"
+msgstr " --vendor - 提供者\n"
+
+#: ../urpm/search.pm:84 ../urpmf:84
+#, c-format
+msgid " -m - the media in which the package was found\n"
+msgstr " -m - 软件包所在介质\n"
+
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
+#, c-format
+msgid " -f - print version, release and arch with name.\n"
+msgstr " -f - 和名称一起打印版本、发行号和平台。\n"
+
+#: ../urpm/search.pm:197 ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "格式不对: 您只能使用一个多值标签"
+
+#: ../urpm/search.pm:290 ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "介质“%s”的 hdlist 不可用"
+
+#: ../urpm/search.pm:297 ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "介质“%s”的综合文件不可用"
+
+#: ../urpm/search.pm:304 ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "介质“%s”没有可用的 xml-info"
+
#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1434,17 +1729,17 @@ msgstr "为了安装 %s"
msgid "due to conflicts with %s"
msgstr "原因是与 %s 冲突"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "无效的签名(%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "无效的密钥 ID(%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "缺少签名(%s)"
@@ -1510,7 +1805,7 @@ msgstr " --test - 验证删除是否可以正确进行。\n"
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - 在多个机器上分布的运行 urpmi。\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - 在删除之前重新对文件打包\n"
@@ -1520,12 +1815,6 @@ msgstr " --repackage - 在删除之前重新对文件打包\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - 使用另一个 root 删除 rpm。\n"
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
-#, c-format
-msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
-msgstr " --urpmi-root - 使用另一个 root 来存储 urpmi db 和安装 rpm。\n"
-
#: ../urpme:55 ../urpmi:101
#, c-format
msgid " --justdb - update only the rpm db, not the filesystem.\n"
@@ -1545,7 +1834,7 @@ msgstr ""
" --use-distrib - 从发行版树中实时配置 urpme,特别用于在 --root 选项\n"
" 下安装/卸载 chroot。\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - 详细提示。\n"
@@ -1605,7 +1894,7 @@ msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "删除 %d 个软件包吗?"
-#: ../urpme:161 ../urpmi:553 ../urpmi:648 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr "(是(y)/否(N))[否]"
@@ -1625,289 +1914,11 @@ msgstr "删除失败"
msgid "Removal is possible"
msgstr "可以删除"
-#: ../urpmf:29
-#, c-format
-msgid ""
-"urpmf version %s\n"
-"Copyright (C) 2002-2006 Mandriva.\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 版本 %s\n"
-"版权 (C) 2002-2006 Mandriva。\n"
-"这是自由软件,可以依照 GNU GPL 重新发布。\n"
-"\n"
-"用法:\n"
-
-#: ../urpmf:36
-#, c-format
-msgid " --version - print this tool's version number.\n"
-msgstr " --version - 打印此工具的版本号。\n"
-
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid " --env - use specific environment (typically a bug report).\n"
-msgstr " --env - 使用指定的环境(特别是进行故障报告时)。\n"
-
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid " --excludemedia - do not use the given media, separated by comma.\n"
-msgstr " --excludemedia - 不使用给定介质,介质之间用逗号分隔。\n"
-
-#: ../urpmf:39
-#, c-format
-msgid ""
-" --literal, -l - don't match patterns, use argument as a literal string.\n"
-msgstr " --literal, -l - 不匹配模式,参数为字面字符串。\n"
-
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-" --sortmedia - sort media according to substrings separated by comma.\n"
-msgstr " --sortmedia - 根据用逗号分隔的子字符串排序介质。\n"
-
-#: ../urpmf:43
-#, c-format
-msgid " --use-distrib - use the given path to access media\n"
-msgstr " --use-distrib - 使用给定的路径访问介质\n"
-
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
-msgstr " --synthesis - 使用指定的综合文件而不是 urpmi db。\n"
-
-#: ../urpmf:45
-#, c-format
-msgid " --uniq - do not print identical lines twice.\n"
-msgstr " --uniq - 不打印相同行。\n"
-
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid " --update - use only update media.\n"
-msgstr " --update - 只使用升级介质。\n"
-
-#: ../urpmf:47
-#, c-format
-msgid " --verbose - verbose mode.\n"
-msgstr " --verbose - 详细提示。\n"
-
-#: ../urpmf:48
-#, c-format
-msgid " -i - ignore case distinctions in patterns.\n"
-msgstr " -i - 忽略各种情况下的冲突。\n"
-
-#: ../urpmf:49
-#, c-format
-msgid " -I - honor case distinctions in patterns (default).\n"
-msgstr " -I - 在模式中遵从大小写(默认值)。\n"
-
-#: ../urpmf:50
-#, c-format
-msgid " -F<str> - change field separator (defaults to ':').\n"
-msgstr " -F<字符串> - 更改字段分隔符(默认为“:”)。\n"
-
-#: ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "模式表达式: \n"
-
-#: ../urpmf:52
-#, c-format
-msgid " text - any text is parsed as a regexp, unless -l is used.\n"
-msgstr " 文本 - 任何文本都将被处理为正则表达式,除非使用了 -l。\n"
-
-#: ../urpmf:53
-#, c-format
-msgid " -e - include perl code directly as perl -e.\n"
-msgstr " -e - 直接保留 perl 代码,就像 perl -e。\n"
-
-#: ../urpmf:54
-#, c-format
-msgid " -a - binary AND operator.\n"
-msgstr " -a - 二元 AND 操作符。\n"
-
-#: ../urpmf:55
-#, c-format
-msgid " -o - binary OR operator.\n"
-msgstr " -o - 二元 OR 操作符。\n"
-
-#: ../urpmf:56
-#, c-format
-msgid " ! - unary NOT.\n"
-msgstr " ! - 一元 NOT。\n"
-
-#: ../urpmf:57
-#, c-format
-msgid " ( ) - left and right parentheses.\n"
-msgstr " ( ) - 左右括号。\n"
-
-#: ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "标记清单:\n"
-
-#: ../urpmf:59
-#, c-format
-msgid " --qf - specify a printf-like output format\n"
-msgstr " --qf - 指定类似 printf 的输出格式\n"
-
-#: ../urpmf:60
-#, c-format
-msgid " example: '%%name:%%files'\n"
-msgstr " 例如:“%%name:%%files”\n"
-
-#: ../urpmf:61
-#, c-format
-msgid " --arch - architecture\n"
-msgstr " --arch - 体系\n"
-
-#: ../urpmf:62
-#, c-format
-msgid " --buildhost - build host\n"
-msgstr " --buildhost - 编译主机\n"
-
-#: ../urpmf:63
-#, c-format
-msgid " --buildtime - build time\n"
-msgstr " --buildtime - 编译时间\n"
-
-#: ../urpmf:64
-#, c-format
-msgid " --conffiles - configuration files\n"
-msgstr " --conffiles - 配置文件\n"
-
-#: ../urpmf:65
-#, c-format
-msgid " --conflicts - conflict tags\n"
-msgstr " --conflicts - conflict 标签\n"
-
-#: ../urpmf:66
-#, c-format
-msgid " --description - package description\n"
-msgstr " --description - 软件包描述\n"
-
-#: ../urpmf:67
-#, c-format
-msgid " --distribution - distribution\n"
-msgstr " --distribution - 发行版\n"
-
-#: ../urpmf:68
-#, c-format
-msgid " --epoch - epoch\n"
-msgstr " --epoch - 周期\n"
-
-#: ../urpmf:69
-#, c-format
-msgid " --filename - filename of the package\n"
-msgstr " --fiename - 软件包文件名\n"
-
-#: ../urpmf:70
-#, c-format
-msgid " --files - list of files contained in the package\n"
-msgstr " --files - 列出软件包中包含的文件\n"
-
-#: ../urpmf:71
-#, c-format
-msgid " --group - group\n"
-msgstr " --group - 分组\n"
-
-#: ../urpmf:72
-#, c-format
-msgid " --license - license\n"
-msgstr " --license - 许可协议\n"
-
-#: ../urpmf:73
-#, c-format
-msgid " --name - package name\n"
-msgstr " --name - 软件包名称\n"
-
-#: ../urpmf:74
-#, c-format
-msgid " --obsoletes - obsoletes tags\n"
-msgstr " --obsoletes - obsolets 标签\n"
-
-#: ../urpmf:75
-#, c-format
-msgid " --packager - packager\n"
-msgstr " --packager - 打包者\n"
-
-#: ../urpmf:76
-#, c-format
-msgid " --provides - provides tags\n"
-msgstr " --provides - provides 标签\n"
-
-#: ../urpmf:77
-#, c-format
-msgid " --requires - requires tags\n"
-msgstr " --requires - requires 标签\n"
-
-#: ../urpmf:78
-#, c-format
-msgid " --size - installed size\n"
-msgstr " --size - 安装大小\n"
-
-#: ../urpmf:79
-#, c-format
-msgid " --sourcerpm - source rpm name\n"
-msgstr " --sourcerpm - 源 rpm 名称\n"
-
-#: ../urpmf:80
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests - suggests 标签\n"
-
-#: ../urpmf:81
-#, c-format
-msgid " --summary - summary\n"
-msgstr " --summary - 摘要\n"
-
-#: ../urpmf:82
-#, c-format
-msgid " --url - url\n"
-msgstr " --url - url\n"
-
-#: ../urpmf:83
-#, c-format
-msgid " --vendor - vendor\n"
-msgstr " --vendor - 提供者\n"
-
-#: ../urpmf:84
-#, c-format
-msgid " -m - the media in which the package was found\n"
-msgstr " -m - 软件包所在介质\n"
-
-#: ../urpmf:85 ../urpmq:99
-#, c-format
-msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - 和名称一起打印版本、发行号和平台。\n"
-
#: ../urpmf:153
#, c-format
msgid "unterminated expression (%s)"
msgstr "未终止的表达式(%s)"
-#: ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "格式不对: 您只能使用一个多值标签"
-
-#: ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "介质“%s”的 hdlist 不可用"
-
-#: ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "介质“%s”的综合文件不可用"
-
-#: ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "介质“%s”没有可用的 xml-info"
-
#: ../urpmi:81
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -2132,17 +2143,22 @@ msgstr " --ignorearch - 允许安装体系不匹配的 RPM。\n"
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - 不执行软件包脚本。\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - 打印 conflict 标签。\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - 安装要跳过的软件包。\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --prefer - 首选的软件包\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2150,82 +2166,82 @@ msgid ""
msgstr ""
" --more-choices - 如果找到了多个软件包,则提供多个选择而不是默认选择。\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - 不锁定 rpm 数据库。\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - 更新只限于相同体系的软件包。\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - 在命令行选择所有匹配。\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - 安静模式。\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --debug - 非常详细模式。\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " 命令行给出的软件包名或 rpm 文件将会被安装。\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr "错误: 无法在使用软件包列表时使用 --auto-select。\n"
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr "错误: 要生成错误报告,请在指定命令行参数时多加 --bug。\n"
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "您无法使用 --install-src 安装二进制 RPM 文件"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr "您不能安装 spec 文件"
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr "正在设置默认为 --buildrequires"
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr "请使用 --buildrequires 或 --install-src,默认为 --buildrequires"
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr "目录 [%s] 已存在,请使用另外一个目录进行错误报告或者删除该目录"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "无法创建故障报告的目录 [%s]"
-#: ../urpmi:274
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2234,48 +2250,48 @@ msgstr ""
"错误: %s 似乎是以只读方式挂载的。\n"
"请使用 --allow-force 强制操作。"
-#: ../urpmi:348
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr "正在更新介质...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:435
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (即将升级)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:437
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (即将升级)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:441
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (即将安装)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (即将安装)"
-#: ../urpmi:449
+#: ../urpmi:450
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "为满足“%s”的依赖关系,需要安装下列软件包之一:"
-#: ../urpmi:452
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "请输入您的选择:(1-%d)"
-#: ../urpmi:494
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2285,7 +2301,7 @@ msgstr ""
"下列软件包无法安装,因为它们所依赖的软件包版本低于目前所安装的版本: \n"
"%s"
-#: ../urpmi:496
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2295,7 +2311,7 @@ msgstr ""
"下列软件包无法安装,因为它们所依赖的软件包版本低于目前所安装的版本: \n"
"%s"
-#: ../urpmi:502 ../urpmi:517
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2304,12 +2320,12 @@ msgstr ""
"\n"
"仍然继续安装吗?"
-#: ../urpmi:503 ../urpmi:518 ../urpmi:612 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr "(是(Y)/否(n))[是]"
-#: ../urpmi:511
+#: ../urpmi:512
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2318,7 +2334,7 @@ msgstr ""
"某些要求的软件包无法安装:\n"
"%s"
-#: ../urpmi:512
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2327,12 +2343,12 @@ msgstr ""
"某些要求的软件包无法安装:\n"
"%s"
-#: ../urpmi:529
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "如果删除软件包 %s 会破坏您的系统"
-#: ../urpmi:537
+#: ../urpmi:538
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2342,7 +2358,7 @@ msgstr ""
"安装无法继续,原因是要升级其它软件包,需要先删除下列软件包:\n"
"%s\n"
-#: ../urpmi:539
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2352,12 +2368,12 @@ msgstr ""
"安装无法继续,原因是要升级其它软件包,需要先删除下列软件包:\n"
"%s\n"
-#: ../urpmi:547
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(只是测试,删除将不会实际发生)"
-#: ../urpmi:567
+#: ../urpmi:568
#, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2367,44 +2383,44 @@ msgstr ""
"您必须首先用 --buildrequires 调用 urpmi,以便安装下列依赖关系:\n"
"%s\n"
-#: ../urpmi:578
+#: ../urpmi:579
#, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "下列孤立软件包将被删除。"
-#: ../urpmi:594
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(只是测试,安装将不会实际发生)"
-#: ../urpmi:600
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr "将会使用 %s 的额外磁盘空间。"
-#: ../urpmi:601
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr "将会释放 %s 的磁盘空间。"
-#: ../urpmi:602
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr "将会获取 %s 的软件包。"
-#: ../urpmi:603
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "继续安装 %d 个软件包吗?"
-#: ../urpmi:624
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "取消"
-#: ../urpmi:632
+#: ../urpmi:633
#, c-format
msgid "Press Enter when mounted..."
msgstr "挂载后按 Enter..."
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 0c41fb3e..95b1ae3d 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
"PO-Revision-Date: 2008-03-22 15:16+0800\n"
"Last-Translator: Shiva Huang <shivahuang@gmail.com>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -42,7 +42,7 @@ msgstr "RPM 套件安裝"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "錯誤:無法找到檔案 %s,作業將取消"
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "確定 (_O)"
@@ -108,7 +108,7 @@ msgstr "安裝 (_I)"
msgid "_Save"
msgstr "儲存 (_S)"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "取消 (_C)"
@@ -139,9 +139,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - 顯示此說明訊息。\n"
@@ -174,17 +173,17 @@ msgstr ""
" --verify-rpm - 安裝前檢驗 RPM 檔案的簽章。\n"
" (--no-verify-rpm 會停用它,預設值為啟用)。\n"
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - 只使用給定的媒體,不同媒體間請以逗號分隔。\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - 允許於 provides 中搜尋套件。\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - 不在 provides 中搜尋套件。\n"
@@ -222,7 +221,22 @@ msgstr "請稍候..."
msgid "Must be root"
msgstr "必須擁有管理者權限"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "正在發佈 %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "套件安裝..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "套件安裝..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -238,37 +252,37 @@ msgstr ""
msgid "Warning"
msgstr "警告"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "確定"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr " (升級用)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr " (安裝用)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "套件選擇"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "需要下列套件之一:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "放棄 (_A)"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -279,60 +293,55 @@ msgstr ""
"%s\n"
"無論如何都要繼續安裝嗎?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "為了滿足相依性,將會安裝下列套件:"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "為了滿足相依性,將會一併安裝下列套件:"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d 個套件,共 %d MB)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "套件安裝..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "無法取得原始碼套件,放棄"
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "準備中..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "正在安裝套件 `%s' (%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "請置入名為 \"%s\" 的媒體"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "正在下載套件 `%s'..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "完成 (_D)"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -343,28 +352,28 @@ msgstr ""
"%s\n"
"您或許要更新您的 urpmi 資料庫"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "安裝失敗;"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "每個套件都已經安裝了"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "安裝完畢"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "正在移除 %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "正在重新啟動 urpmi"
@@ -403,7 +412,7 @@ msgstr " 預設為 %s。\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - 輸出 RPM 的完整名稱 (NVRA)\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "只有擁有管理者權限的使用者才能安裝套件"
@@ -413,134 +422,143 @@ msgstr "只有擁有管理者權限的使用者才能安裝套件"
msgid "Running urpmi in restricted mode..."
msgstr "以限制模式執行 urpmi..."
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, c-format
msgid "fail to create directory %s"
msgstr "無法建立目錄 %s"
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr "%s 目錄的擁有者無效"
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "無法寫入重新打包目錄 [%s]\n"
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr "環境目錄 %s 不存在"
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "正在 %s 上使用特定的環境\n"
+
+#: ../urpm.pm:305
#, c-format
msgid "unable to open rpmdb"
msgstr "無法開啟 rpmdb"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "無效的 rpm 檔案名稱 [%s]"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "正在擷取 rpm 檔案 [%s] ..."
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr "...擷取完成"
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, c-format
msgid "...retrieving failed: %s"
msgstr "...擷取失敗:%s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "無法存取 rpm 檔案 [%s]"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "無法解析 spec 檔案 %s [%s]"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, c-format
msgid "unable to register rpm file"
msgstr "無法註冊 rpm 檔案"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "與 RPM 檔案 [%s] 不相容的硬體架構"
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, c-format
msgid "error registering local packages"
msgstr "註冊本地端套件錯誤"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "使用限制模式執行時禁止該操作程序"
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "命令列傳入的代理伺服器宣告錯誤\n"
-#: ../urpm/args.pm:298
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq:無法讀取 rpm 檔案 \"%s\"\n"
-#: ../urpm/args.pm:375
+#: ../urpm/args.pm:383
#, fuzzy, c-format
msgid "unexpected expression %s"
msgstr "樣版表示式:\n"
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "遺失簽名 (%s)"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, fuzzy, c-format
msgid "no expression to close"
msgstr "樣版表示式:\n"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot 目錄不存在"
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr "參數太多\n"
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "複製失敗"
@@ -587,122 +605,122 @@ msgstr "媒體 '%s' 被定義了兩次,正在取消"
msgid "unable to write config file [%s]"
msgstr "無法寫入設定檔 [%s]"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "%s 無法使用,回到 %s"
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "請輸入您的憑證以使用代理伺服器\n"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "用戶名稱:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "密碼:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr "%s 失敗:離開訊號 %d"
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr ""
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, c-format
msgid "copy failed"
msgstr "複製失敗"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, c-format
msgid "wget is missing\n"
msgstr "wget 遺失了\n"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, c-format
msgid "curl is missing\n"
msgstr "curl 遺失了\n"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr "curl 失敗:已取消下載\n"
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr "rsync 遺失了\n"
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr "ssh 遺失了\n"
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr "prozilla 遺失了\n"
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr "無法執行 prozilla\n"
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, c-format
msgid "aria2 is missing\n"
msgstr "aria2 遺失了\n"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr ""
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, c-format
msgid "retrieving %s"
msgstr "正在取得 %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, c-format
msgid "retrieved %s"
msgstr ".已取得 %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr "%s 中定義了未知的通訊協定"
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "%s 無法使用,回到 %s"
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "沒有找到 webfetch,支援的 webfetch 有:%s\n"
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, c-format
msgid "unable to handle protocol: %s"
msgstr "無法處理通訊協定:%s"
@@ -722,58 +740,58 @@ msgstr "沒有找到套件 %s。"
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "正在由媒體 \"%s\" 擷取 rpm 檔案..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr "[正在重新打包]"
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr "已建立在 %s 上的安裝程序 (移除 = %d,安裝 = %d,升級 = %d)"
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "無法建立安裝程序"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "無法由 delta-rpm 套件包中取出套件 %s"
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "無法安裝套件 %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "正在由 %2$s 移除不良的 RPM (%1$s)"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, c-format
msgid "removing %s failed: %s"
msgstr "移除 %s 失敗:%s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, c-format
msgid "Removing package %s"
msgstr "正在移除套件 %s"
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "正在移除套件 %s"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "正在由 %2$s 移除已安裝的 RPM (%1$s)"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "更多關於套件 %s 的資訊"
@@ -818,18 +836,18 @@ msgstr "放棄"
msgid "%s database is locked (another program is already using it)"
msgstr "%s 資料庫已被鎖定 (另一個程式已經在使用它了)"
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "安裝失敗"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -838,73 +856,63 @@ msgstr ""
"安裝失敗,損毀的套件:\n"
"%s"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, c-format
msgid "The following package has bad signature"
msgstr "下列套件有不正確的簽章"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, c-format
msgid "The following packages have bad signatures"
msgstr "下列套件有不正確的簽章"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "Do you want to continue installation ?"
msgstr "您要繼續安裝嗎?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, c-format
msgid "removing installed rpms (%s)"
msgstr "正在移除已安裝的套件 (%s)"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, c-format
msgid "distributing %s"
msgstr "正在發佈 %s"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, c-format
msgid "installing %s from %s"
msgstr "正在由 %2$s 安裝 %1$s"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, c-format
msgid "installing %s"
msgstr "正在安裝 %s"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "嘗試不檢查相依性直接安裝? (y/N)(是/否)"
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "嘗試採用強制安裝的方式 (--force)? (y/N)(是/否)"
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr "套件都已經更新了"
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, c-format
msgid "Installation is possible"
msgstr "可以安裝"
#: ../urpm/md5sum.pm:26
#, c-format
-msgid "examining %s file"
-msgstr "正在檢驗 %s 檔案"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
-#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "警告:在 MD5SUM 檔案中找不到 %s 的 md5sum"
@@ -977,228 +985,228 @@ msgstr "將會安裝而非升級套件 %s"
msgid "medium \"%s\" already exists"
msgstr "媒體 \"%s\" 已經存在"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr "(預設為忽略)"
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "在遠端媒體 \"%2$s\" 前新增媒體 \"%1$s\""
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, c-format
msgid "adding medium \"%s\""
msgstr "新增媒體 \"%s\""
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr "目錄 %s 不存在"
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "這個位置似乎並沒有包含任何散佈套件"
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, c-format
msgid "unable to parse media.cfg"
msgstr "無法解析 media.cfg"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "無法存取散佈媒體 (找不到 media.cfg 檔案)"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, c-format
msgid "retrieving media.cfg file..."
msgstr "正在擷取 media.cfg 檔案..."
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "正在嘗試選擇不存在的媒體 \"%s\""
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, c-format
msgid "selecting multiple media: %s"
msgstr "正在選擇多個媒體:\"%s\""
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, c-format
msgid "removing medium \"%s\""
msgstr "移除媒體 \"%s\""
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "正在重新設定媒體 \"%s\" 的 urpmi 設定"
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, c-format
msgid "...reconfiguration failed"
msgstr "重新設定失敗"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, c-format
msgid "reconfiguration done"
msgstr "重新設定完成"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "生成名稱檔案時發生錯誤:相依性 %d 沒有找到"
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "媒體 \"%s\" 已經處於最新狀態"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, c-format
msgid "examining synthesis file [%s]"
msgstr "檢驗 synthesis 檔案 [%s]"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "讀取 \"%s\" 媒體的 synthesis 檔案時發生問題"
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "正在複製媒體 \"%2$s\" 的 [%1$s]..."
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, c-format
msgid "...copying failed"
msgstr "...複製失敗"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "正在複製 \"%s\" 的敘述檔案..."
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, c-format
msgid "...copying done"
msgstr "...複製完成"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "複製 [%s] 失敗 (檔案小得可疑)"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "正在計算來源 synthesis 的 md5sum"
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "[%s] 擷取失敗 (md5sum 不合)"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "檢驗 hdlist 檔案 [%s]"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, c-format
msgid "comparing %s and %s"
msgstr "正在比對 %s 與 %s"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "沒有找到媒體 \"%s\" 的 hdlist 檔案"
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "正在複製 \"%s\" 的 MD5SUM 檔案..."
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "無效的 rpm 檔案名稱 [%s]"
-#: ../urpm/media.pm:1461
-#, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "正在擷取 \"%s\" 的來源 synthesis..."
-
-#: ../urpm/media.pm:1478
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "發現尋找到的 hdlist (或 synthesis) 為 %s"
+msgid "no metadata found for medium \"%s\""
+msgstr "沒有找到 \"%s\" 媒體的 synthesis 檔案"
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "沒有找到 \"%s\" 媒體的 synthesis 檔案"
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "正在擷取 \"%s\" 的來源 synthesis..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "檢驗 \"%s\" 的公鑰..."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...由 \"%2$s\" 的公鑰檔案匯入鑰匙 %1$s"
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "無法匯入 \"%s\" 的公鑰"
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "沒有找到 \"%s\" 媒體的 synthesis 檔案"
+
+#: ../urpm/media.pm:1612
#, c-format
msgid "updated medium \"%s\""
msgstr "已更新媒體 \"%s\""
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr "無法從鏡像站列表 %s 找到鏡像站"
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, c-format
msgid "getting mirror list from %s"
msgstr "正由 %s 取得鏡像站列表"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn否"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1269,7 +1277,7 @@ msgstr "GB"
msgid "TB"
msgstr "TB"
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1621,11 +1629,6 @@ msgstr " -f - 顯示版本、發行編號與平台。\n"
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "格式錯誤:您只能使用一個多值標籤"
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "正在 %s 上使用特定的環境\n"
-
#: ../urpm/search.pm:290 ../urpmf:291
#, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1641,118 +1644,136 @@ msgstr "媒體 \"%s\" 沒有可用的 synthesis"
msgid "no xml-info available for medium \"%s\""
msgstr "媒體 \"%s\" 沒有可用的 xml-info"
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, c-format
msgid "No package named %s"
msgstr "沒有套件命名為 %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, c-format
msgid "The following packages contain %s: %s"
msgstr "以下套件包含 %s:%s"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "%s 套件無法安裝"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, c-format
msgid "Package %s is already installed"
msgstr "%s 套件已經安裝了"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, c-format
msgid "Packages %s are already installed"
msgstr "%s 套件已經安裝了"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "由於遺失了 %s"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, c-format
msgid "due to already installed %s"
msgstr "由於已經安裝了 %s"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "由於未滿足 %s"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "正在試著促進 %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "為了要保留 %s"
#: ../urpm/select.pm:607
#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"下列套件必須移除給其他套件來升級:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"下列套件必須移除給其他套件來升級:\n"
+"%s"
+
+#: ../urpm/select.pm:635
+#, c-format
msgid "in order to install %s"
msgstr "為了要安裝 %s"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, c-format
msgid "due to conflicts with %s"
msgstr "由於與 %s 發生衝突"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "無效的簽名 (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "無效的公鑰 ID (%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "遺失簽名 (%s)"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't write file"
msgstr "無法寫入檔案"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, c-format
msgid "Can't open file"
msgstr "無法開啟檔案"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, c-format
msgid "Can't move file %s to %s"
msgstr "無法移動檔案 %s 至 %s"
@@ -1793,7 +1814,7 @@ msgstr " --test - 確認刪除是否能夠正確進行。\n"
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - 在同步管理的機器上分散式的執行 urpmi。\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - 在移除前重新打包檔案\n"
@@ -1822,7 +1843,7 @@ msgstr ""
" --use-distrib - 立即由一個散佈套件樹設定 urpme,在搭配 --root 選項來安\n"
" 裝/移除一個 chroot 時很方便。\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - 詳細訊息模式。\n"
@@ -1882,7 +1903,7 @@ msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "要移除這 %d 個套件嗎?"
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr " (y/N) (是/否) "
@@ -2135,17 +2156,22 @@ msgstr " --ignorearch - 允許安裝硬體架構不相符的 RPM 檔。\n"
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - 不執行套件中的命令稿\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - 衝突標籤\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - 安裝時應該略過的套件\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --prefer - 應該要優先考慮的套件\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2153,87 +2179,82 @@ msgid ""
msgstr ""
" --more-choices - 當找到不只一個套件時,提供除了預設值之外的多個選擇。\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - 不鎖定 RPM 資料庫。\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - 只升級相同平台的套件。\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - 選擇命令列中所有符合的項目。\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - 安靜模式。\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --debug - 非常詳細模式。\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " 將會安裝於命令列指定的名稱或 RPM 檔案。\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr "錯誤:無法與套件列表一起使用 --auto-select。\n"
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr "錯誤:要生成一個臭蟲回報,請指定平常的命令列參數另外再加上 --bug。\n"
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "當使用 --install-src 時您無法安裝二進制 RPM 檔案"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr "您無法安裝 spec 檔案"
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr "--buildrequires 的預設值"
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr "請使用 --buildrequires 或者 --install-src,預設為 --buildrequires"
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr "目錄 [%s] 已經存在,請指定另一個目錄給臭蟲回報或刪除它"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "無法建立 [%s] 目錄給臭蟲回報使用"
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr "環境目錄 %s 不存在"
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2242,48 +2263,48 @@ msgstr ""
"錯誤:%s 似乎被掛載為唯讀模式。\n"
"使用 --allow-force 標籤來強制執行。"
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr "正在更新媒體...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s:%s (升級用)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (升級用)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s:%s (安裝用)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (安裝用)"
-#: ../urpmi:462
+#: ../urpmi:450
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "為了滿足 '%s' 的相依性,需要下列套件之一:"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "您要選擇何者? (1-%d) "
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2293,7 +2314,7 @@ msgstr ""
"下列套件無法安裝,因為它需要比您系統上的套件為舊的版本:\n"
"%s"
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2303,7 +2324,7 @@ msgstr ""
"下列套件無法安裝,因為它們需要比您系統上的套件為舊的版本:\n"
"%s"
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2312,12 +2333,12 @@ msgstr ""
"\n"
"無論如何都要繼續安裝嗎?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (Y/n) (是/否) "
-#: ../urpmi:524
+#: ../urpmi:512
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2326,7 +2347,7 @@ msgstr ""
"某些要求的套件無法安裝:\n"
"%s"
-#: ../urpmi:525
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2335,12 +2356,12 @@ msgstr ""
"某些要求的套件無法安裝:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "移除套件 %s 將破壞您的系統"
-#: ../urpmi:551
+#: ../urpmi:538
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2350,7 +2371,7 @@ msgstr ""
"安裝無法繼續,因為下列套件必須移除給其他套件來升級:\n"
"%s\n"
-#: ../urpmi:553
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2360,30 +2381,12 @@ msgstr ""
"安裝無法繼續,因為下列套件必須移除給其他套件來升級:\n"
"%s\n"
-#: ../urpmi:560
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"下列套件必須移除給其他套件來升級:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"下列套件必須移除給其他套件來升級:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(僅測試,移除動作並不會真的執行)"
-#: ../urpmi:583
+#: ../urpmi:568
#, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2393,44 +2396,44 @@ msgstr ""
"您必須先呼叫 urpmi --buildrequires 來安裝下列相依性套件:\n"
"%s\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "為了滿足相依性,下列 %d 個套件將被移除"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(僅測試,安裝動作並不會真的執行)"
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr "將使用 %s 額外磁碟空間。"
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr "將釋放 %s 磁碟空間。"
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr "將取得 %s 軟體套件。"
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "繼續安裝這 %d 個套件?"
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "取消"
-#: ../urpmi:648
+#: ../urpmi:633
#, c-format
msgid "Press Enter when mounted..."
msgstr "掛載好後請按 Enter..."
@@ -3159,6 +3162,13 @@ msgstr ""
msgid "No changelog found\n"
msgstr "沒有找到更新紀錄\n"
+#~ msgid "examining %s file"
+#~ msgstr "正在檢驗 %s 檔案"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "發現尋找到的 hdlist (或 synthesis) 為 %s"
+
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --update - 建立更新的媒體。\n"