summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFunda Wang <fwang@mandriva.org>2007-08-22 07:57:55 +0000
committerFunda Wang <fwang@mandriva.org>2007-08-22 07:57:55 +0000
commit689f291390d2990f0cdfcd75c9fa91ee93f55ae3 (patch)
treee295e4359f0b0b2b95b910d694e018e435bc2466
parentce4c5e8aeb89338badf46c4498a5b023e2d9dc56 (diff)
downloadurpmi-689f291390d2990f0cdfcd75c9fa91ee93f55ae3.tar
urpmi-689f291390d2990f0cdfcd75c9fa91ee93f55ae3.tar.gz
urpmi-689f291390d2990f0cdfcd75c9fa91ee93f55ae3.tar.bz2
urpmi-689f291390d2990f0cdfcd75c9fa91ee93f55ae3.tar.xz
urpmi-689f291390d2990f0cdfcd75c9fa91ee93f55ae3.zip
Updated POT file
-rw-r--r--po/af.po882
-rw-r--r--po/ar.po877
-rw-r--r--po/az.po878
-rw-r--r--po/bg.po882
-rw-r--r--po/bn.po876
-rw-r--r--po/br.po880
-rw-r--r--po/bs.po875
-rw-r--r--po/ca.po880
-rw-r--r--po/cs.po875
-rw-r--r--po/cy.po873
-rw-r--r--po/da.po873
-rw-r--r--po/de.po874
-rw-r--r--po/el.po875
-rw-r--r--po/eo.po878
-rw-r--r--po/es.po873
-rw-r--r--po/et.po879
-rw-r--r--po/eu.po873
-rw-r--r--po/fa.po874
-rw-r--r--po/fi.po877
-rw-r--r--po/fr.po873
-rw-r--r--po/fur.po887
-rw-r--r--po/ga.po874
-rw-r--r--po/gl.po873
-rw-r--r--po/he.po941
-rw-r--r--po/hi.po873
-rw-r--r--po/hr.po873
-rw-r--r--po/hu.po873
-rw-r--r--po/id.po876
-rw-r--r--po/is.po873
-rw-r--r--po/it.po873
-rw-r--r--po/ja.po871
-rw-r--r--po/ka.po868
-rw-r--r--po/ko.po868
-rw-r--r--po/ky.po873
-rw-r--r--po/lt.po879
-rw-r--r--po/lv.po873
-rw-r--r--po/mk.po875
-rw-r--r--po/mn.po870
-rw-r--r--po/ms.po885
-rw-r--r--po/mt.po880
-rw-r--r--po/nb.po873
-rw-r--r--po/nl.po880
-rw-r--r--po/nn.po981
-rw-r--r--po/pa_IN.po874
-rw-r--r--po/pl.po875
-rw-r--r--po/pt.po1010
-rw-r--r--po/pt_BR.po873
-rw-r--r--po/ro.po884
-rw-r--r--po/ru.po873
-rw-r--r--po/sc.po873
-rw-r--r--po/sk.po878
-rw-r--r--po/sl.po878
-rw-r--r--po/sq.po881
-rw-r--r--po/sr.po883
-rw-r--r--po/sr@Latn.po883
-rw-r--r--po/sv.po873
-rw-r--r--po/tg.po880
-rw-r--r--po/th.po872
-rw-r--r--po/tl.po880
-rw-r--r--po/tr.po878
-rw-r--r--po/uk.po875
-rw-r--r--po/urpmi.pot852
-rw-r--r--po/uz.po871
-rw-r--r--po/uz@Latn.po871
-rw-r--r--po/vi.po874
-rw-r--r--po/wa.po875
-rw-r--r--po/zh_CN.po873
-rw-r--r--po/zh_TW.po873
68 files changed, 32209 insertions, 27622 deletions
diff --git a/po/af.po b/po/af.po
index 0b129f72..7c53ee22 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+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"
@@ -19,7 +19,7 @@ msgstr ""
"X-Generator: KTranslator v 0.6.0\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, fuzzy, c-format
msgid "RPM installation"
msgstr "Stelsel-installasie"
@@ -29,7 +29,7 @@ msgstr "Stelsel-installasie"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -77,7 +77,7 @@ msgstr "_Installeer"
msgid "_Save"
msgstr "_Stoor"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "Kanselleer"
@@ -97,17 +97,17 @@ msgstr "Onbekende konneksie tipe"
msgid "No packages specified"
msgstr "Geen opdrag gespesifiseer nie"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Asseblief wag..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, fuzzy, c-format
msgid "Must be root"
msgstr "Muispoort"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -115,42 +115,42 @@ msgid ""
"Continue installation anyway?"
msgstr "Sommige pakkette kan nie geïnstalleer word nie"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Waarskuwing"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "OK"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "Opgradeer"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, fuzzy, c-format
msgid " (to install)"
msgstr "Verlaat installasie"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Slegs een van die volgende pakkette word benodig:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "Staak"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -161,7 +161,7 @@ msgstr ""
"%s\n"
"Kan ons voort gaan?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
@@ -170,7 +170,7 @@ msgstr ""
"geïnstalleer word:\n"
"\n"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -179,48 +179,49 @@ msgstr ""
"geïnstalleer word:\n"
"\n"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, 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:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Installasievoorbereiding..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, fuzzy, c-format
msgid "unable to get source packages, aborting"
msgstr "Kan nie die bronpakette bekom nie."
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, fuzzy, c-format
+msgid "Preparing..."
+msgstr "Herlaaistelsel word voorberei..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Installeer tans pakket %s (%s/%s)...."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Plaas asseblief die media bekend as \"%s\" in aandrywer [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, fuzzy, c-format
msgid "Downloading package `%s'..."
msgstr "Laai tans pakket '%s' (%s/%s) af ..."
-#: ../gurpmi2:279
-#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Die volgende pakkette het verdagte stempels:\n"
-"\n"
-"%s\n"
-"\n"
-"Wil u hulle steeds installeer?"
+#: ../gurpmi2:291
+#, c-format
+msgid "_Done"
+msgstr "_Klaar"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -231,41 +232,27 @@ msgstr ""
"%s\n"
"Probeer u media se databasis opdateer."
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "verwyder %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, fuzzy, c-format
-msgid "Preparing..."
-msgstr "Herlaaistelsel word voorberei..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Installeer tans pakket %s (%s/%s)...."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Klaar"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Installasie het misluk"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Alles is alreeds installeer"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Geïnstalleer"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "verwyder %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -300,7 +287,7 @@ msgstr ""
"\n"
" DrakBackup Verslag \n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, fuzzy, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Daar was 'n fout met die installasie van die pakkette:"
@@ -310,98 +297,98 @@ msgstr "Daar was 'n fout met die installasie van die pakkette:"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, fuzzy, c-format
msgid "unable to open rpmdb"
msgstr "Kan nie lêer %s oopmaak nie\n"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, fuzzy, c-format
msgid "invalid rpm file name [%s]"
msgstr "in lêername"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr ""
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr ""
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, fuzzy, c-format
msgid "...retrieving failed: %s"
msgstr "FAT-grootteverandering het gefaal: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, fuzzy, c-format
msgid "unable to access rpm file [%s]"
msgstr "Kan nie lêer %s oopmaak nie\n"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "Kan nie lêer %s oopmaak nie\n"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, fuzzy, c-format
msgid "unable to register rpm file"
msgstr "Laat \"%s\" toe om die lêer te skryf"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, fuzzy, c-format
msgid "error registering local packages"
msgstr "Daar was 'n fout met pakkette:"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr ""
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, fuzzy, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "kan nie kieslyslêer:%s lees nie"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, fuzzy, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "Kopieer die lêer vir media '%s'..."
@@ -588,7 +575,12 @@ msgstr "%s is nie gevind nie...\n"
msgid "malformed URL: [%s]"
msgstr ""
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, fuzzy, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "Ondersoek die afgeleë medialêer '%s'..."
@@ -598,43 +590,48 @@ msgstr "Ondersoek die afgeleë medialêer '%s'..."
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, fuzzy, c-format
msgid "unable to create transaction"
msgstr "Probleme met die skep van 'n ssh identiteit"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "Kan nie die bronpakette bekom nie."
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr ""
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, fuzzy, c-format
msgid "unable to install package %s"
msgstr "Probleme met Installasue van pakket %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "Verwyder pakkette..."
+
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing package %s"
msgstr "Verwyder pakkette..."
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "%s word installeer\n"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, fuzzy, c-format
msgid "More information on package %s"
msgstr "Meer inligting rakende pakket..."
@@ -664,11 +661,103 @@ msgstr "Geen opdrag gespesifiseer nie"
msgid "Cannot connect to ldap uri:"
msgstr ""
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "RPM-databasisnavraag het misluk\n"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Waarskuwing"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "RPM-databasisnavraag het misluk\n"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "Die volgende pakkette geïnstalleer word:\n"
+
+#: ../urpm/main_loop.pm:100
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
+msgstr "Die volgende pakkette geïnstalleer word:\n"
+
+#: ../urpm/main_loop.pm:101
+#, fuzzy, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Wil u op hierdie knoppie klik?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Installasie het misluk"
+
+#: ../urpm/main_loop.pm:133
+#, fuzzy, c-format
+msgid "distributing %s"
+msgstr "Begin %s:"
+
+#: ../urpm/main_loop.pm:148
+#, fuzzy, c-format
+msgid "installing %s from %s"
+msgstr "%s word installeer\n"
+
+#: ../urpm/main_loop.pm:150
+#, fuzzy, c-format
+msgid "installing %s"
+msgstr "%s word installeer\n"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Moet ons 'n installasie sonder afhanklikheidstoetsing probeer? (j/N) "
+
+#: ../urpm/main_loop.pm:205
+#, fuzzy, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "Moet ons die installasie afdwing (--force) ? (j/N) "
+
+#: ../urpm/main_loop.pm:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "installasie instruksies"
+msgstr[1] "installasie instruksies"
+
+#: ../urpm/main_loop.pm:258
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "Installasie probleem"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "Alles is alreeds installeer"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Alles is alreeds installeer"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "Alles is alreeds installeer"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Alles is alreeds installeer"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -716,7 +805,7 @@ msgstr ""
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr ""
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, fuzzy, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "Kan nie lêer %s oopmaak nie\n"
@@ -803,7 +892,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Opsoek na geïnstalleerde lettertipes"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr ""
@@ -868,144 +957,149 @@ msgstr "Kan nie lêer %s oopmaak nie\n"
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "Probleme met skep van media."
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, fuzzy, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "Kopieer die lêer vir media '%s'..."
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, fuzzy, c-format
msgid "selecting multiple media: %s"
msgstr "%s word installeer\n"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, fuzzy, c-format
msgid "removing medium \"%s\""
msgstr "Redigeer media \"%s\":"
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "Konfigureer drukker \"%s\" ..."
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "Konfigurasie-lêer"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "Bedienerkonfigurasie"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr ""
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, fuzzy, c-format
msgid "examining hdlist file [%s]"
msgstr "Kan nie lêer: %s skep nie"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, fuzzy, c-format
msgid "examining synthesis file [%s]"
msgstr "Kan nie lêer: %s skep nie"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr ""
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, fuzzy, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "Kopieer die lêer vir media '%s'..."
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "Kopieer die lêer vir media '%s'..."
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, fuzzy, c-format
msgid "...copying failed"
msgstr "Aanteken gevaal"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, fuzzy, c-format
msgid "copying description file of \"%s\"..."
msgstr "in beskrywings"
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, fuzzy, c-format
msgid "...copying done"
msgstr "Aanteken gevaal"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "Installasie het misluk"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr ""
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, fuzzy, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "Installasie het misluk"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr ""
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, fuzzy, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "FAT-grootteverandering het gefaal: %s"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, fuzzy, c-format
msgid "no rpm files found from [%s]"
msgstr "Fout met die lees van lêer %s"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, fuzzy, c-format
msgid "reading rpm files from [%s]"
msgstr "Fout met die lees van lêer %s"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, fuzzy, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "Fout met die lees van lêer %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1013,74 +1107,74 @@ msgid ""
"medium."
msgstr ""
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "Kopieer die lêer vir media '%s'..."
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, fuzzy, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "Ondersoek die afgeleë medialêer '%s'..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr ""
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, fuzzy, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "Kopieer die lêer vir media '%s'..."
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, fuzzy, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "Ondersoek medialêer '%s'....."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, fuzzy, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, fuzzy, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "Kan nie lêer %s oopmaak nie\n"
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, fuzzy, c-format
msgid "writing list file for medium \"%s\""
msgstr "Kopieer die lêer vir media '%s'..."
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "Voeg media by"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, fuzzy, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "Kan nie lêer %s oopmaak nie\n"
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, fuzzy, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "%s from media %s"
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, fuzzy, c-format
msgid "reading headers from medium \"%s\""
msgstr "%s from media %s"
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "JjYy"
@@ -1140,47 +1234,52 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "Probleme met skep van media."
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, fuzzy, c-format
msgid "No package named %s"
msgstr "Teruglus lêernaam: %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, fuzzy, c-format
msgid "The following packages contain %s: %s"
msgstr "Die volgende pakkette geïnstalleer word:\n"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "deur %s wat soek is"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Alles is alreeds installeer"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "deur problematiese %s"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "probeer promosie van %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "om %s te kan behou"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "om %s te kan behou"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "deur %s wat soek is"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, fuzzy, c-format
msgid "unrequested"
msgstr "Begin sodra gevra word"
@@ -1200,6 +1299,16 @@ msgstr ""
msgid "Missing signature (%s)"
msgstr "Ontbrekende velde"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Kan nie lêer %s oopmaak nie\n"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Aanteken gevaal"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1217,8 +1326,8 @@ msgstr ""
"\n"
"gebruik:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1233,18 +1342,18 @@ msgstr "Wys outogeselekteerde pakkette."
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr ""
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --help - druk hierdie help boodskap.\n"
@@ -1254,8 +1363,8 @@ msgstr " --help - druk hierdie help boodskap.\n"
msgid " --root - use another root for rpm removal.\n"
msgstr ""
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
@@ -1272,17 +1381,17 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr ""
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr ""
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " -v - woordryke modus.\n"
@@ -1292,39 +1401,39 @@ msgstr " -v - woordryke modus.\n"
msgid " -a - select all packages matching expression.\n"
msgstr ""
-#: ../urpme:76
+#: ../urpme:73
#, fuzzy, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
-#: ../urpme:107
+#: ../urpme:104
#, fuzzy, c-format
msgid "unknown packages"
msgstr "Inligting rakende pakkette"
-#: ../urpme:107
+#: ../urpme:104
#, fuzzy, c-format
msgid "unknown package"
msgstr "Onbekend"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, fuzzy, c-format
msgid "removing package %s will break your system"
msgstr ""
"Jammer maat, nou wil jy jou Linux rekenaar vernietig:\n"
"\n"
-#: ../urpme:121
+#: ../urpme:118
#, fuzzy, c-format
msgid "Nothing to remove"
msgstr "Geen etiket om te verwyder nie!"
-#: ../urpme:126
+#: ../urpme:123
#, fuzzy, c-format
msgid "Checking to remove the following packages"
msgstr "Slegs een van die volgende pakkette word benodig:"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1338,24 +1447,24 @@ msgstr[1] ""
"geïnstalleer word:\n"
"\n"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr " (%d MB)"
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "Verwyder pakkette..."
msgstr[1] "Verwyder pakkette..."
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, fuzzy, c-format
msgid " (y/N) "
msgstr " (J/n) "
-#: ../urpme:160
+#: ../urpme:157
#, fuzzy, c-format
msgid "Removal failed"
msgstr "Aanteken gevaal"
@@ -1382,12 +1491,12 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --help - druk hierdie help boodskap.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1398,12 +1507,12 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1414,7 +1523,7 @@ msgstr ""
msgid " --use-distrib - use the given path to access media\n"
msgstr ""
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1424,7 +1533,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --help - druk hierdie help boodskap.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, fuzzy, c-format
msgid " --update - use only update media.\n"
msgstr " --help - druk hierdie help boodskap.\n"
@@ -1560,87 +1669,97 @@ msgstr " --help - druk hierdie help boodskap.\n"
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr " --help - druk hierdie help boodskap.\n"
#: ../urpmf:73
+#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr " --help - druk hierdie help boodskap.\n"
+
+#: ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr ""
-#: ../urpmf:74
+#: ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr " --help - druk hierdie help boodskap.\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr ""
-#: ../urpmf:76
+#: ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr ""
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --help - druk hierdie help boodskap.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr ""
-#: ../urpmf:79
+#: ../urpmf:80
+#, c-format
+msgid " --suggests - suggests tags\n"
+msgstr ""
+
+#: ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr ""
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr " --help - druk hierdie help boodskap.\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr " -v - woordryke modus.\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -v - woordryke modus.\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, fuzzy, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -v - woordryke modus.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1657,60 +1776,60 @@ msgstr ""
"\n"
"gebruik:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr ""
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr " --help - druk hierdie help boodskap.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr ""
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr ""
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
"installation.\n"
msgstr ""
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr ""
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
" packages that lead to removals.\n"
msgstr ""
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1718,241 +1837,252 @@ msgid ""
" default is %d.\n"
msgstr ""
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr ""
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr ""
-#: ../urpmi:105
+#: ../urpmi:101
#, fuzzy, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --help - druk hierdie help boodskap.\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr ""
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr ""
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
" dependencies checking.\n"
msgstr ""
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
" dependencies checking and integrity.\n"
msgstr ""
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr ""
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
" to install a chroot with --root option.\n"
msgstr ""
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr ""
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr ""
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr ""
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr ""
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
" (--no-resume disables it, default is disabled).\n"
msgstr ""
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../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 ""
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
" authentication (format is <user:password>).\n"
msgstr ""
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
" next arg.\n"
msgstr ""
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
" (--no-verify-rpm disables it, default is enabled).\n"
msgstr ""
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr ""
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr ""
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr ""
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --help - druk hierdie help boodskap.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr ""
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
-#: ../urpmi:148
+#: ../urpmi:145
+#, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr ""
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:150
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr ""
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, fuzzy, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -v - woordryke modus.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
-#: ../urpmi:155
+#: ../urpmi:153
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -v - woordryke modus.\n"
-#: ../urpmi:157
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
-#: ../urpmi:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi:243
+#: ../urpmi:241
#, 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:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr ""
@@ -1962,41 +2092,43 @@ msgstr ""
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "Opgradeer"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "Opgradeer"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "Verlaat installasie"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "Verlaat installasie"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2006,12 +2138,12 @@ msgstr ""
"geïnstalleer word:\n"
"\n"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Wat is u keuse (1-%d)"
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2019,7 +2151,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2027,33 +2159,33 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Wil u in elk geval voortgaan?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (J/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
"%s"
msgstr "Sommige pakkette kan nie geïnstalleer word nie"
-#: ../urpmi:504
+#: ../urpmi:521
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s"
msgstr "Sommige pakkette kan nie geïnstalleer word nie"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2066,7 +2198,7 @@ msgstr ""
"\n"
"Kan ons voort gaan?"
-#: ../urpmi:537
+#: ../urpmi:554
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2079,7 +2211,7 @@ msgstr ""
"\n"
"Kan ons voort gaan?"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2091,7 +2223,7 @@ msgstr ""
"\n"
"Kan ons voort gaan?"
-#: ../urpmi:545
+#: ../urpmi:562
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2103,123 +2235,46 @@ msgstr ""
"\n"
"Kan ons voort gaan?"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, fuzzy, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
"%s\n"
msgstr "Jy moet stam wees om hierdie opdrag te gebruik !\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, 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:623
+#: ../urpmi:632
#, fuzzy, c-format
msgid "Press Enter when ready..."
msgstr "Druk ENTER wanneer u reg is..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Kanselleer"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "Die volgende pakkette geïnstalleer word:\n"
-
-#: ../urpmi:672
-#, fuzzy, c-format
-msgid "The following packages have bad signatures"
-msgstr "Die volgende pakkette geïnstalleer word:\n"
-
-#: ../urpmi:673
-#, fuzzy, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Wil u op hierdie knoppie klik?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Installasie het misluk"
-
-#: ../urpmi:711
-#, fuzzy, c-format
-msgid "distributing %s"
-msgstr "Begin %s:"
-
-#: ../urpmi:726
-#, fuzzy, c-format
-msgid "installing %s from %s"
-msgstr "%s word installeer\n"
-
-#: ../urpmi:728
-#, fuzzy, c-format
-msgid "installing %s"
-msgstr "%s word installeer\n"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Moet ons 'n installasie sonder afhanklikheidstoetsing probeer? (j/N) "
-
-#: ../urpmi:776
-#, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Moet ons die installasie afdwing (--force) ? (j/N) "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "installasie instruksies"
-msgstr[1] "installasie instruksies"
-
-#: ../urpmi:825
-#, fuzzy, c-format
-msgid "Installation is possible"
-msgstr "Installasie probleem"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Alles is alreeds installeer"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Alles is alreeds installeer"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "Alles is alreeds installeer"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "Alles is alreeds installeer"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, fuzzy, c-format
msgid "restarting urpmi"
msgstr "Begin slurpd: "
@@ -2331,49 +2386,49 @@ msgstr " -v - woordryke modus.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "Probleme met skep van media."
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, fuzzy, c-format
msgid "Only superuser is allowed to add media"
msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "Kan nie lêer: %s skep nie"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, fuzzy, c-format
msgid "Can't create config file [%s]"
msgstr "Kan nie lêer: %s skep nie"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr ""
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, fuzzy, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "Relatiewe pad na die synthesis/hdlist:"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, fuzzy, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "Probleme met skep van media."
@@ -2532,17 +2587,17 @@ msgstr " -v - woordryke modus.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -v - woordryke modus.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, fuzzy, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr ""
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2592,39 +2647,39 @@ msgstr " -v - woordryke modus.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -v - woordryke modus.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, fuzzy, c-format
msgid "Only superuser is allowed to update media"
msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
"(one of %s)\n"
msgstr ""
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr ""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "ignoring media %s"
msgstr "Redigeer media \"%s\":"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "enabling media %s"
msgstr "%s word installeer\n"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2641,195 +2696,208 @@ msgstr ""
"\n"
"gebruik:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
"packages.\n"
msgstr ""
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr ""
-#: ../urpmq:59
+#: ../urpmq:56
#, fuzzy, c-format
msgid " --list - list available packages.\n"
msgstr " --help - druk hierdie help boodskap.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr ""
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr ""
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr ""
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr ""
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr ""
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --help - druk hierdie help boodskap.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
" This permit to querying a distro.\n"
msgstr ""
-#: ../urpmq:84
+#: ../urpmq:81
#, fuzzy, c-format
msgid " --changelog - print changelog.\n"
msgstr " --help - druk hierdie help boodskap.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr ""
-#: ../urpmq:87
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " -v - woordryke modus.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, fuzzy, c-format
msgid ""
" --whatrequires-recursive\n"
" - extended reverse search (includes virtual packages).\n"
msgstr " -v - woordryke modus.\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -v - woordryke modus.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr ""
-#: ../urpmq:94
+#: ../urpmq:91
#, fuzzy, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -v - woordryke modus.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, fuzzy, c-format
msgid " -g - print groups with name also.\n"
msgstr " -v - woordryke modus.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
-#: ../urpmq:98
+#: ../urpmq:95
#, fuzzy, c-format
msgid " -l - list files in package.\n"
msgstr " -v - woordryke modus.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -v - woordryke modus.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, fuzzy, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -v - woordryke modus.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
msgstr ""
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr ""
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:425
#, fuzzy, c-format
msgid "No changelog found\n"
msgstr "Geen beeld gevind nie"
#, fuzzy
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Die volgende pakkette het verdagte stempels:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Wil u hulle steeds installeer?"
+
+#, fuzzy
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Jy moet stam wees om hierdie opdrag te gebruik !\n"
@@ -2855,7 +2923,3 @@ msgstr "Geen beeld gevind nie"
#~ "\n"
#~ "Continue?"
#~ msgstr "Gaan voort"
-
-#, fuzzy
-#~ msgid "unable to write file [%s]"
-#~ msgstr "Kan nie lêer %s oopmaak nie\n"
diff --git a/po/ar.po b/po/ar.po
index 554e709c..8da20d09 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+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"
@@ -22,7 +22,7 @@ msgstr ""
"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && n<=10 ? 2 : "
"3\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "تثبيت RPM"
@@ -32,7 +32,7 @@ msgstr "تثبيت RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_موافق"
@@ -98,7 +98,7 @@ msgstr "_تثبيت"
msgid "_Save"
msgstr "_حفظ"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "ال_غاء"
@@ -120,17 +120,17 @@ msgstr ""
msgid "No packages specified"
msgstr "لا توجد حزمة بالإسم %s"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "انتظر من فضلك..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "يجب أن تكون جذراً"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -141,42 +141,42 @@ msgstr ""
"%s\n"
"استمرار على أي حال؟"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "تحذير"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "موافق"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (للترقية)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (للتثبيت)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "خيارات الحزم"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "أحد الحزم التالية يُحتاج اليه:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "إ_جهاض"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -187,19 +187,19 @@ msgstr ""
"%s\n"
"هل من الممكن المتابعة؟"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "لإرضاء المُعتمدات، سيتمّ تثبيت الحزمة التّالية (%d ميغابايت)"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "لإرضاء المُعتمدات، سيتمّ تثبيت الحزمة التّالية (%d ميغابايت)"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, fuzzy, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
@@ -208,40 +208,42 @@ msgstr[1] "(%d حزم، %d م.ب.)"
msgstr[2] "(%d حزم، %d م.ب.)"
msgstr[3] "(%d حزم، %d م.ب.)"
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "تثبيت الحزم..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "لم يمكن الحصول على الحزمة المصدرية، جاري الإنهاء"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "جاري التحضير..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "جاري تثبيت الحزمة `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "يرجى ادخال الوسيط \"%s\" في الجهاز [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "جاري تنزيل الحزمة `%s'..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"الحزم التالية لها توقيعات سيئة:\n"
-"%s\n"
-"\n"
-"هل تريد متابعة التثبيت؟"
+msgid "_Done"
+msgstr "ا_نتهى"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -252,41 +254,27 @@ msgstr ""
"%s\n"
"ربما تريد تحديث فاعدة بيانات urpmi الخاصة بك"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "جاري إزالة %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "جاري التحضير..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "جاري تثبيت الحزمة `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "ا_نتهى"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "فشل التثبيت"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "كل شئ مثبت مسبقا"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "انتهى التثبيت"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "جاري إزالة %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -321,7 +309,7 @@ msgstr " -g - تطبع المجموعات أيضا مع الأسم
msgid " defaults to %s.\n"
msgstr " الافتراضات هي %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "المستخدم الجذر فقط مسموح له بتثبيت الحزم"
@@ -331,98 +319,98 @@ msgstr "المستخدم الجذر فقط مسموح له بتثبيت الحز
msgid "Running urpmi in restricted mode..."
msgstr "تشغيل urpmi في الوضع المحظور..."
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "تعذر فتح rpmdb"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "اسم ملف rpm غير موجود [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "جاري استرجاع ملف rpm [%s]..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...تم الاسترجاع"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...فشل الإسترجاع: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "لم يمكن الوصول الى ملف rpm [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "تعذر تحليل \"%s\" في الملف [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "تعذر تسجيل ملف rpm"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "خطأ في تسجيل الحزم المحلية"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "هذه العملية محظورة أثناء العمل في الوضع المحظور"
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "تعريف بروكسي خاطئ في سطر الأوامر\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: لم يمكن ايجاد ملف rpm \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "تم بناء ملف تخليق hdlist للوسيط \"%s\""
@@ -611,7 +599,12 @@ msgstr "لم يمكن ايجاد الحزمة %s"
msgid "malformed URL: [%s]"
msgstr "ادخال مشوه: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "جاري استرجاع ملفات rpm للوسيط \"%s\"..."
@@ -621,43 +614,48 @@ msgstr "جاري استرجاع ملفات rpm للوسيط \"%s\"..."
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr "جاري انشاء معاملة للتثبيت على %s (حذف=%d، تثبيت=%d، ترقية=%d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "تعذر انشاء المعاملة"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "تعذر استخراج rpm من حزمة delta-rpm %s"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "جاري اضافة الحزمة %s (id=%d، eid=%d، تحديث=%d، ملف=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "تعذر تثبيث الحزمة %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "جاري حذف الحزمة %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "جاري حذف الحزمة %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "جاري تثبيت %s من %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "معلومات إضافية حول الحزمة %s"
@@ -687,11 +685,105 @@ msgstr "لا توجد حزمة بالإسم %s"
msgid "Cannot connect to ldap uri:"
msgstr ""
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "تم اقفال قاعدة بيانات urpmi"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "تحذير"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "تم اقفال قاعدة بيانات urpmi"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "الحزم التالية تحتوي على توقيعات فاسدة"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "الحزم التالية تحتوي على توقيعات فاسدة"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "هل تريد متابعة التثبيت؟"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "فشل التثبيت"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "جاري توزيع %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "جاري تثبيت %s من %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "جاري تثبيت %s"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "محاولة التثبيت دون التأكد من الاعتمادات؟ (y[نعم]/N[لا])"
+
+#: ../urpm/main_loop.pm:205
+#, fuzzy, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "حاول التثبيت بشكل أقوى (--force)؟ (y[نعم]/N[لا])."
+
+#: ../urpm/main_loop.pm:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "فشل معاملات تثبيت %d"
+msgstr[1] "فشل معاملات تثبيت %d"
+msgstr[2] "فشل معاملات تثبيت %d"
+msgstr[3] "فشل معاملات تثبيت %d"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "التثبيت ممكن"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "كل شئ مثبت مسبقا"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "كل شئ مثبت مسبقا"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "كل شئ مثبت مسبقا"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "كل شئ مثبت مسبقا"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -741,7 +833,7 @@ msgstr "جاري محاولة اختيار الوسيط غير موجود \"%s\"
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "تم بناء ملف تخليق hdlist للوسيط \"%s\""
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "لم يمكن الوصول الى ملف hdlist لـ\"%s\"، تم تجاهل الوسيط"
@@ -832,7 +924,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "البحث بدءً من: %s وإلى: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "جاري القيام بالمرحلة الثانية لحساب المُعتمدات\n"
@@ -897,144 +989,149 @@ msgstr "تعذر فتح rpmdb"
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "لم أستطع التّوصّل إلى وسيط التّثبيت الأوّل (ملفّ hdlists غير موجود)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "جاري محاولة اختيار الوسيط غير موجود \"%s\""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "جاري اختيار الوسيط المتعدد: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "جاري ازالة الوسيط \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "تجري إعادة تهيئة urpmi للوسيط \"%s\""
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...فشلت إعادة التّهيئة"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "تمّت إعادة التّهيئة"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "الوسيط \"%s\" غير مختار"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "جاري اختبار ملف hdlist [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "جاري اختبار ملف التخليق [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "جاري بناء hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr "تعذر إنشاء ملفّ التخليق للوسيط \"%s\". قد يكون ملف hdlist فاسداً."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "مشكلة في قراءة ملف التخليق أو hdlist للوسيط \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "جاري كتابة ملف القوائم للوسيط \"%s\""
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...فشل النسخ"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "جاري نسخ وصف الملف لـ\"%s\"..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...تم النسخ"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "فشل نسخ [%s] (الملفّ صغير بشكل مثيل للشّكّ)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "جاري حساب md5sum لـhdlist المصدر المنسوخ (أو التخليق)"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "فشل نسخ [%s] (md5sum غير متطابقة)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "جاري حساب md5sum لـhdlist المصدر المستحضر (أو التخليق)"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...فشل الإسترجاع: md5sum غير متطابق"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "لم يُعثر على ملفات rpm من [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "جاري قراءة ملفات rpm من [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "تعذر قراءة ملفات rpm من [%s]: %s "
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "لم تُقرأ أية حزم RPM"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1044,74 +1141,74 @@ msgstr ""
"لم يمكن الوصول للوسيط \"%s\"،\n"
"قد يحدث هذا إن قيام بتجهيز الدليل يدويّاً عند إنشاء الوسيط."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "لم يمكن ايجاد ملف hdlist للوسيط \"%s\""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "جاري استرجاع hdlist (أو ملف تخليق) \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "تم ايجاد hdlist (أو ملف تخليق) كـ %s..."
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "لم يمكن ايجاد ملف hdlist للوسيط \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "جاري اختبار ملف pubkey لـ\"%s\"..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...تم استيراد المفتاح %s من ملف pubkey \"%s\""
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "لم يمكن استيراد ملف pubkey الخاص بـ\"%s\""
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "جاري كتابة ملف القوائم للوسيط \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "تمت اضافة الوسيط %s"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "لم يمكن تحليل ملف hdlist لـ \"%s\""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "مشكلة في قراءة ملف التخليق للوسيط \"%s\""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "جاري قراءة الترويسة من الوسيط \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "لاNn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "نyY"
@@ -1171,47 +1268,52 @@ msgstr "تم تحديد الوسيط المفكّك \"%s\" على أنه قاب
msgid "unable to access medium \"%s\""
msgstr "لم يمكن الوصول الى الوسيط \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "لا توجد حزمة بالإسم %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "الحزم التالية تحتوي على %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "بسبب فقدان %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "كل شئ مثبت مسبقا"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "بسبب عدم ارضاء %s"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "جاري محاولة ترقية %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "كي يتم الحفاظ على %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "كي يتم تثبيث %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "بسبب التعارض مع %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "غير مطلوب"
@@ -1231,6 +1333,16 @@ msgstr "مفتاح هوية غير صالح (%s)"
msgid "Missing signature (%s)"
msgstr "توقيع مفقود (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "لا يمكن إنشاء ملف التهيئة [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "فشل النّسخ"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1247,8 +1359,8 @@ msgstr ""
"\n"
"الاستعمال:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - تطبع رسالة المساعدة هذه.\n"
@@ -1263,18 +1375,18 @@ msgstr " --auto - قم باختيار حزمة آلياَ في الاخ
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - تحقق إن كان بالإمكان الإزالة بشكل صحيح.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr " --force - أجبر التنفيذ حتى إن لم تكن بعض الحزم موجودة.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - urpmi موزّع على الأجهزة الخاصّة بالاسم البديل.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - اطبع الصّفة المُغلّف : المغلّف.\n"
@@ -1284,8 +1396,8 @@ msgstr " --packager - اطبع الصّفة المُغلّف : المغلّ
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - استخدام جذر آخر لإزالة rpm.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - استخدم جذر آخر لتثبيت حزم rpm.\n"
@@ -1304,17 +1416,17 @@ msgstr ""
" --use-distrib - هيّئ urpmi بشكل سريع من شجرة توزيع، مفيد\n"
" لتثبيت/إزالة chroot باستخدام خيار --root.\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - حاول أو تجد وتستخدم ملفّ التخليق.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - حاول أن تجد وتستخدم ملف hdlist.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - وضع التفصيل.\n"
@@ -1324,37 +1436,37 @@ msgstr " --verbose, -v - وضع التفصيل.\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - اختر كل الحزم المتفقة مع المعامل.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "يسمح للمستخدم الجذر فقط بحذف الحزم"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "حزم غير معروفة"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "حزمة غير معروفة"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "إزالة الحزمة %s ستتسبب في تعطيل نظامك"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "لا شئ للإزالة"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "جاري التحقق لإزالة الحزم التالية"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1364,12 +1476,12 @@ msgstr[1] "لإرضاء المُعتمدات، ستتم ازالة %d حزمة"
msgstr[2] "لإرضاء المُعتمدات، ستتم ازالة %d حزمة"
msgstr[3] "لإرضاء المُعتمدات، ستتم ازالة %d حزمة"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr " (%d ميغابايت)"
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
@@ -1378,12 +1490,12 @@ msgstr[1] "جاري حذف الحزمة %s"
msgstr[2] "جاري حذف الحزمة %s"
msgstr[3] "جاري حذف الحزمة %s"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (ن/ل)"
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "فشلت عملية الإزالة"
@@ -1409,12 +1521,12 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - إعرض معلومات الإصدار ثم اخرج\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr " --env - استخدم بيئة محدّدة (عادة تقرير خطا).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr " --excludemedia - لا تستخدم الوسيط المحدّد، مفصولة بفواصل.\n"
@@ -1425,12 +1537,12 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - استخدم فقط الوسيط المحدّد، مفصولة بفواصل.\n"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1441,7 +1553,7 @@ msgstr " --sortmedia - افرز الوسيط بناءً على النصّ ا
msgid " --use-distrib - use the given path to access media\n"
msgstr " --synthesis - استخدم التخليق التالي بدلاً من قاعدة بيانات urpmi.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - استخدم التخليق التالي بدلاً من قاعدة بيانات urpmi.\n"
@@ -1451,7 +1563,7 @@ msgstr " --synthesis - استخدم التخليق التالي بدلاً
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - لا تطبع الأسماء المتشابهة.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - استخدم وسيط التحديث فقط.\n"
@@ -1585,75 +1697,85 @@ msgstr " --group - اطبع علامة المجموعة : المجمو
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr " --name - إطبع أسماء الحزم فقط.\n"
#: ../urpmf:73
#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr " --name - إطبع أسماء الحزم فقط.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - اطبع الصّفة الملغيّات : كل الملغيّات.\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr " --packager - اطبع الصّفة المُغلّف : المغلّف.\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, fuzzy, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - اطبع الصّفة يُوفّر : كل ما يُوفّره.\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, fuzzy, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - اطبع الصّفة يتطلّب : كل ما يتطلّب.\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --size - اطبع حجم الصّفة : الصّفة.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, fuzzy, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - اطبع الصّفة sourcerpm: الحزمة المصدريّة.\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - اطبع الصّفة الملغيّات : كل الملغيّات.\n"
+
+#: ../urpmf:81
#, fuzzy, c-format
msgid " --summary - summary\n"
msgstr " --summary, -S - عرض التلخيص.\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr " --url - اطبع الصّفة عنوان url: عنوان url.\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr " --verbose - وضع التفصيل.\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -l - اسرد الملفّات في الحزمة.\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - اطبع النّسخة، الإصدار وarch مع الاسم.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "جاري استخدام بيئة محددة على %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1662,12 +1784,12 @@ msgstr ""
"ملاحظة: بما أنّه لا يوجد وسيط من الوسائط المبحوث فيها يستعمل hdlist، فإنّ "
"urpmf لم يستطع إرجاع أيّة نتيجة\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "إستعمل --name للبحث عن أسماء الحزم.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1683,7 +1805,7 @@ msgstr ""
"\n"
"الاستعمال:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1691,47 +1813,47 @@ msgstr ""
" --searchmedia - استخدم فقط الوسط المُعطى للبحث عن الحزم المطلوبة (أو "
"المُحدّثة).\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr " --auto-select - اختر الحزم آليا لترقية النظام.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr " --auto-select - اختر الحزم آليا لترقية النظام.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - عطّل التحقّق من MD5SUM للملفّات.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - أجبر تحديث مفتاح gpg.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
"installation.\n"
msgstr " --no-uninstall - لا تسأل أبداً أن تزيل حزمةً، بل تجاهل التثبيت.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - عدم تثبيت الحزم (فقط تنزيلها)\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1740,7 +1862,7 @@ msgstr ""
" --keep - إبقاء الحزم الموجودة إن أمكن، ورفض الحزم\n"
" المطلوبة التي تؤدي إلى إزالة غيرها.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1750,37 +1872,43 @@ msgstr ""
" --split-level - جزّء على شكل معاملات صغيرة إن كان هناك أكثر من عدد الحزم\n"
" المحدّة سوف يتمّ تثبيته أو تحديثه، والمفترض هو %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - small transaction length, default is %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy, -y - افرض البحث التقريبي.\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src, -s - الحزمة التالية هي حزمة مصدريّة.\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr " --install-src - ثبّت الحزمة المصدريّة فقط (لا المجمّعة).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - أزل حزمة rpm من الذاكرة المخبّئة قبل أي شيء آخر.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - عدم إخلاء حزم rpms من المخزن.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1789,7 +1917,7 @@ msgstr ""
" --allow-nodeps - اسمح بسؤال المستخدم عن تثبيت الحزم دون\n"
" التّحقّق من المعتمدات.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1798,12 +1926,12 @@ msgstr ""
" --allow-force - اسمح بسؤال المستخدم عن تثبيت الحزم دون\n"
" التّحقّق من المعتمدات والتّكامل.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - استخدم جذر آخر لتثبيت حزم rpm.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1812,47 +1940,47 @@ msgstr ""
" --use-distrib - أعدّ urpmi بشكل سريع من شجرة توزيع، مفيد\n"
" لتثبيت chroot باستخدام الخيار --root.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - استخدم wget لجلب الملفّات البعيدة.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - استخدم curl لجلب الملفّات البعيدة.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, fuzzy, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --curl - استخدم curl لجلب الملفّات البعيدة.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - حدّ من سرعة التنزيل.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1862,7 +1990,7 @@ msgstr ""
" (يقوم الخيار --no-resume بتعطيله، والوضع الافتراضي هو "
"معطّل).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1871,7 +1999,7 @@ msgstr ""
" --proxy - استخدم بروكسي HTTP المحدّد، رقم المنفذ الافتراضي\n"
" هو 1080 (بتنسيق <proxyhost[:port]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1881,7 +2009,7 @@ msgstr ""
"البروكسي\n"
" (بتنسيق <user:password>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1890,7 +2018,7 @@ msgstr ""
" --bug - أخرج تقرير خطأ في الدّليل المحدّد. "
"بالكلمة التالية.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, fuzzy, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1900,44 +2028,49 @@ msgstr ""
" (--no-verify-rpm يعطّل هذا الخيار، وهو ممكّن بشكل "
"افتراضي.)\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, fuzzy, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr " --test - تحقّق إن كان بالإمكان التثبيت بشكل صحيح.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - استثن المسارات الفصولة بفاصلة.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - استثْن ملفّات التوثيق.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, fuzzy, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr " --no-uninstall - لا تسأل أبداً أن تزيل حزمةً، بل تجاهل التثبيت.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --url - اطبع الصّفة عنوان url: عنوان url.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - اطبع وصف الصّفة : الوصف.\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - الحزم اللّازم تخطّي إعداداها\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - الحزم اللّازم تخطّي إعداداها\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1946,66 +2079,66 @@ msgstr ""
" --more-choices - في حالة العثور على عدّة حزم، إقترح عددا أكبر من الخيارات\n"
" عن العدد الافتراضي.\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - عدم إخلاء حزم rpms من المخزن.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - ترقية الحزم ذات البُنية ذاتها فقط.\n"
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - اختر كل التطابقات على سطر الأوامر.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - السماح بالبحث في المعطيات ليجاد حزمة.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - لا تبحث في المعطيات لإيجاد حزمة.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - وضع هادئ.\n"
-#: ../urpmi:157
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " الأسماء أو ملفات rpm المعطاة على سطر الأوامر سيتم تثبيتها.\n"
-#: ../urpmi:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "ماذا يمكن فعله مع ملف rpm تنفيذي عند استخدام المعامل --install-src"
-#: ../urpmi:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr "الدّليل [%s] موجود مسبقاً، رجاء استخدم دليلاً آخر لتقرير المشكلة أو حذفها"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "تعذر انشاء الدليل [%s] لتقرير العيوب"
@@ -2015,7 +2148,7 @@ msgstr "تعذر انشاء الدليل [%s] لتقرير العيوب"
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2024,46 +2157,48 @@ msgstr ""
"خطأ: يبدو أن %s مركّب بوضع القراءة فقط.\n"
"استخدم --allow-force لإجبار العملية."
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (للترقية)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (للترقية)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (للتثبيت)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, c-format
msgid "%s (to install)"
msgstr "%s (للتثبيت)"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "لإرضاء المُعتمدات، ستتم ازالة %d حزمة"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "ما هو اختيارك؟ (1-%d)"
-#: ../urpmi:481
+#: ../urpmi:498
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2074,7 +2209,7 @@ msgstr ""
"أقدم من المثبتة:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2085,19 +2220,19 @@ msgstr ""
"أقدم من المثبتة:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "استمرار على أي حال؟"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (ن/ل)"
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2106,7 +2241,7 @@ msgstr ""
"لا يمكن تثبيت بعض الحزم المطلوبة:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2115,7 +2250,7 @@ msgstr ""
"لا يمكن تثبيت بعض الحزم المطلوبة:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2126,7 +2261,7 @@ msgstr ""
"لكي تتم ترقية الحزم الأخرى:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2137,7 +2272,7 @@ msgstr ""
"لكي تتم ترقية الحزم الأخرى:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2146,7 +2281,7 @@ msgstr ""
"يجب حذف الحزم التالية لترقية الحزم الأخرى:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2155,12 +2290,17 @@ msgstr ""
"يجب حذف الحزم التالية لترقية الحزم الأخرى:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2169,12 +2309,12 @@ msgstr ""
"يجب أن تكون مستخدم جذر لكي تقوم بتثبيت الإعتمادات التالية:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2183,101 +2323,17 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: ../urpmi:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "اضغط Enter عند الاستعداد..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "إلغاء"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "الحزم التالية تحتوي على توقيعات فاسدة"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "الحزم التالية تحتوي على توقيعات فاسدة"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "هل تريد متابعة التثبيت؟"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "فشل التثبيت"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "جاري توزيع %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "جاري تثبيت %s من %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "جاري تثبيت %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "محاولة التثبيت دون التأكد من الاعتمادات؟ (y[نعم]/N[لا])"
-
-#: ../urpmi:776
-#, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "حاول التثبيت بشكل أقوى (--force)؟ (y[نعم]/N[لا])."
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "فشل معاملات تثبيت %d"
-msgstr[1] "فشل معاملات تثبيت %d"
-msgstr[2] "فشل معاملات تثبيت %d"
-msgstr[3] "فشل معاملات تثبيت %d"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "التثبيت ممكن"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "كل شئ مثبت مسبقا"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "كل شئ مثبت مسبقا"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "كل شئ مثبت مسبقا"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "كل شئ مثبت مسبقا"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "إعادة تشغيل urpmi"
@@ -2406,49 +2462,49 @@ msgstr " -v - وضع تفصيلي.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "لم يمكن تحديث الوسيط \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "يسمح للمستخدم الجذر فقط بإضافة الوسائط"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "سوف ينشئ ملف التهيئة [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "لا يمكن إنشاء ملف التهيئة [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "لا داعي لإعطاء <المسار النّسبي لـhdlist> مع --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<المسار المُرتبط لـhdlist> مفقود\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "لم يمكن عمل الوسيط \"%s\"\n"
@@ -2610,17 +2666,17 @@ msgstr " -a - استخدم كل الوسائط.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - مطابقة تقريبية على أسماء الوسائط.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "يسمح للمستخدم الجذر فقط بحذف الوسائط"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "لا شء للإزالة (استخدم urpmi.addmedia لإضافة وسيط)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2676,17 +2732,17 @@ msgstr " -a - اختر كلّ الوسائط الغير قابلة
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - أجبر توليد ملفات hdlist.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "يسمح للمستخدم الجذر فقط بتحديث الوسائط"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "لا شئ للتحديث (استخدم urpmi.addmedia لإضافة وسيط)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2695,22 +2751,22 @@ msgstr ""
"المدخل المطلوب تحديثه غير موجود\n"
"(واحد من %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "تجاهل الوسط %s"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "تمكين الوسط %s"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2726,7 +2782,7 @@ msgstr ""
"\n"
"الاستعمال:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2735,60 +2791,60 @@ msgstr ""
" --searchmedia - استخدم فقط الوسط المُعطى للبحث عن الحزم المطلوبة (أو "
"المُحدّثة).\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - افرض البحث التقريبي (مثل -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - اسرد الحزم المتوفّرة.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - اسرد الوسائط المتوفّرة.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - اسرد الوسائط المتوفّرة وعناوينها.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr " --list-nodes - اسرد النقاط المتوفّرة عند استخدام --parallel.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - إصنع قائمة للأسماء المستعارة الموازية.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr " --dump-config - أكتب الإعداد على شكل متغيّر لـ urpmi.addmedia.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr " --src - الحزمة التالية هي حزمة مصدريّة (مثل -s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr ""
" --sources - أعط كل الحزم المصدريّة قبل تنزيلها (المستخدم root فقط).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --url - اطبع الصّفة عنوان url: عنوان url.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2797,22 +2853,22 @@ msgstr ""
" --use-distrib - أعدّ urpmi بشكل سريع من شجرة التوزيعة.\n"
" يسمح هذا بالاستعلام من توزيعة.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - اطبع سجلّ التغيير.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - عرض التلخيص.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - اعكس البحث لما يتطلّب هذه الحزمة.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2821,103 +2877,103 @@ msgstr ""
" --whatrequires-recursive\n"
" - البحث العكسي الموسّع (يشمل الحزم الوهمية).\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -p - إبحث في المعطيات لإيجاد حزمة.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - مخرجات تامّة مع الحزمة الواجب حذفها.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - وسّع الاستعلام ليشتمل المعتمدات.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - تطبع المجموعات أيضا مع الأسماء أيضاً.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - اطبع معلومات مفيدة بشكل مقروء للإنسان.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - اسرد الملفّات في الحزمة.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - وضع هادئ.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - تطبع الإصدار و رقمه أيضا مع الإسم أيضاً.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - الحزمة التالية هي حزمة مصدرية (مثل --src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
msgstr " -u - أزل الحزمة إن كان هناك إصدارة أحدث منها مثبّتة.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - افرض البحث التّقريبيّ (مثل --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - مثل -y، و لكن بحصر المطابقة دون التّقيّد بشكل الحروف.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " الأسماء أو ملفات rpm المعطاة على سطر الأوامر يتم الاستعلام عنها.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes يمكن استخدامه فقط مع --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
"ملاحظة: بما أنّه لا يوجد وسيط من الوسائط المبحوث فيها يستعمل hdlist، فإنّ "
"urpmf لم يستطع إرجاع أيّة نتيجة\n"
-#: ../urpmq:363
+#: ../urpmq:360
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"ملاحظة: بما أنّه لا يوجد وسيط من الوسائط المبحوث فيها يستعمل hdlist، فإنّ "
"urpmf لم يستطع إرجاع أيّة نتيجة\n"
-#: ../urpmq:366
+#: ../urpmq:363
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
"ملاحظة: بما أنّه لا يوجد وسيط من الوسائط المبحوث فيها يستعمل hdlist، فإنّ "
"urpmf لم يستطع إرجاع أيّة نتيجة\n"
-#: ../urpmq:367
+#: ../urpmq:364
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2925,11 +2981,22 @@ msgstr ""
"ملاحظة: بما أنّه لا يوجد وسيط من الوسائط المبحوث فيها يستعمل hdlist، فإنّ "
"urpmf لم يستطع إرجاع أيّة نتيجة\n"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "لم يُعثر على سجلّ تغييرات\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "الحزم التالية لها توقيعات سيئة:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "هل تريد متابعة التثبيت؟"
+
#, fuzzy
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "يجب أن تكون المستخدم الجذري لتشغيل هذا الأمر ! \n"
diff --git a/po/az.po b/po/az.po
index c1591474..c875a49c 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+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"
@@ -22,7 +22,7 @@ msgstr ""
"X-Generator: KBabel 1.3.1\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, fuzzy, c-format
msgid "RPM installation"
msgstr "Sistem qurulumu"
@@ -32,7 +32,7 @@ msgstr "Sistem qurulumu"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Oldu"
@@ -100,7 +100,7 @@ msgstr "_Qur"
msgid "_Save"
msgstr "_Qeyd Et"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Ləğv Et"
@@ -122,17 +122,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Əmr tə'yin edilməyib"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Xahiş edirik gözləyin..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, fuzzy, c-format
msgid "Must be root"
msgstr "Siçan Qapısı"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -142,42 +142,42 @@ msgstr ""
"Bəzi istənən paketlər qurula bilmir:\n"
"%s"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Xəbərdarlıq"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Oldu"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "Yeniləmə"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, fuzzy, c-format
msgid " (to install)"
msgstr "Qurulumun sonu"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Aşağıdakı paketlərin bir dənəsinə ehtiyac var:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Ləğv Et"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -187,61 +187,62 @@ msgstr ""
"Paketlərin yenilənməsi üçün aşağıdakı paketlərin çıxardılması lazımdır:\n"
"%s"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, 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:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, 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:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d paket, %d MB)"
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Paket qurulumu..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "qaynaq paketi alına bilmir, çıxılır"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Hazırlanır..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "`%s' paketi qurulur (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Lütfən \"%s\" medyasını [%s] avadanlığına yerləşdirin"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "`%s' paketi endirilir..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Aşağıdakı paketlər hökmsüz imzalara sahibdir:\n"
-"\n"
-"%s\n"
-"\n"
-"Yenə də qurulumu davam etdirmək istəyirsiniz?"
+msgid "_Done"
+msgstr "Qurtardı"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -252,41 +253,27 @@ msgstr ""
"%s\n"
"Sizə, urpmi databeyzinizi yeniləməyi məsləhət görürük."
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "%s silinir"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Hazırlanır..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "`%s' paketi qurulur (%s/%s)..."
-
-#: ../gurpmi2:334
-#, fuzzy, c-format
-msgid "_Done"
-msgstr "Qurtardı"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Qurulum iflas etdi"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "hər şey onsuzda quruludur"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Qurulum bitdi"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "%s silinir"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -319,7 +306,7 @@ msgstr " -g - adla birlikdə qrupları da göstər.\n"
msgid " defaults to %s.\n"
msgstr " ön qurğulusu %s-dir.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Paketləri qurma icazəsi ancaq ali istifadəçi verilib"
@@ -329,98 +316,98 @@ msgstr "Paketləri qurma icazəsi ancaq ali istifadəçi verilib"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "rpmb açıla bilmir"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "hökmsüz rpm fayı adı [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "[%s] rpm faylı alınır ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...alınma bitdi"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...alış bacarılmadı: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "rpm faylı [%s] çatıla bilmir"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "[%s] faylındakı \"%s\" oxuna bilmədi"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "rpm faylı qeydiyyatdan keçirilə bilmədi"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "yerli paket qeydiyyat xətası"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, 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:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: \"%s\" rpm faylı oxuna bilmir\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "\"%s\" medyası hdlist sintezi inşa edilid"
@@ -609,7 +596,12 @@ msgstr "%s paketi tapılmadı."
msgid "malformed URL: [%s]"
msgstr "xətalı giriş: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "\"%s\" mediyumundan rpm faylları alınır..."
@@ -619,43 +611,48 @@ msgstr "\"%s\" mediyumundan rpm faylları alınır..."
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, 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:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "keçiş yaradıla bilmir"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "%s paketi çıxardıla bilmədi"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "%s paketi əlavə edilir (id=%d, eid=%d, yeniləmə=%d, fayl=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "%s paketi qurula bilmədi"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "%s peketi silinir"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "%s peketi silinir"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "%s qurulur"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "%s peketi haqqında daha çox məlumat"
@@ -685,11 +682,102 @@ msgstr "Əmr tə'yin edilməyib"
msgid "Cannot connect to ldap uri:"
msgstr "Vericiyə bağlana bilmir"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "urpmi databeyzi qıfıllıdır"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Xəbərdarlıq"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "urpmi databeyzi qıfıllıdır"
+#: ../urpm/main_loop.pm:99
+#, 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:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Aşağıdakı paketlər hökmsüz imzaya sahibdir"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Quruluma davam etmək istəyirsiniz ?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Qurulum iflas etdi"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "%s paylanır"
+
+#: ../urpm/main_loop.pm:148
+#, fuzzy, c-format
+msgid "installing %s from %s"
+msgstr "%s qurulur"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "%s qurulur"
+
+#: ../urpm/main_loop.pm:187
+#, 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:205
+#, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "Quruluşu zorlayaraq sınayım (--force)? (b/X)"
+
+#: ../urpm/main_loop.pm:247
+#, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d qurulum daşınmaları bacarılmadı"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Qurulum mümkündür"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "hər şey onsuzda quruludur"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "hər şey onsuzda quruludur"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "hər şey onsuzda quruludur"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "hər şey onsuzda quruludur"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -739,7 +827,7 @@ msgstr "mövcud olmayan \"%s\" medyumu seçilməyə çalışılır"
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "\"%s\" medyası hdlist sintezi inşa edilid"
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "\"%s\" medyası hdlist faylına çatıla bilmir, medya rədd edildi"
@@ -832,7 +920,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Qurulu yazı növlərini axtar"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "asıllılıqlar hesablanmaq üçün ikinci dəfə sınanır\n"
@@ -898,145 +986,150 @@ 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:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "mövcud olmayan \"%s\" medyumu seçilməyə çalışılır"
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "birdən çox medya seçilir: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "\"%s\" medyumu çıxardılır"
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "\"%s\" mediyumundan rpm faylları alınır..."
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...yenidən quraşdırma bacarılmadı"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "yenidən quraşdırma tamamlandı"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "\"%s\" medyası seçili deyil"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "[%s] hdlist faylı yoxlanır"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "[%s] synthesis faylı sınanır "
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "[%s] hdlist faylı inşa edilir"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "\"%s\" medyasının hdlist ya da synthesis faylı oxuna bilmədi"
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "\"%s\" medyası üçün siyahı faylı yazılır"
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...köçütrmə bacarılmadı"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "\"%s\" faylının izahat faylı köçürdülür..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...köçürtmə bitdi"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, 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:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr ""
"köçürdülmüş mənbə hdlist (ya da synthesis) faylının md5sum'ları hesablanır"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "[%s] köçürülmə əməliyyatı bacarılmadı (md5sum uyğunsuzluğu)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "alınan mənbə hdlist (ya da synthesis) faylının md5sum'ları hesablanır"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...alış bacarılmadı: md5sum uyğunsuzluğu"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "[%s] üstündə rpm fayı tapıla bilmədi"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "rpm faylları [%s] üstündən oxunur"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "[%s]'dan rpm faylı oxuna bilmir: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1046,74 +1139,74 @@ msgstr ""
"\"%s\" mediyumuna yetişilə bilmədi,\n"
"bu, mediyum yaradarkən cərgəni əl ilə bağlayanda baş göstərə bilər."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "\"%s\" medyası hdlist faylı tapılmadı"
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "\"%s\"in mənbə hdlist (ya da synthesis) faylı alınır..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "%s adında sınanmış hdlist (ya da synthesis) tapıldı"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "\"%s\" medyası hdlist faylı tapılmadı"
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "\"%s\" faylının pubkey'si yoxlanır..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, 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:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "\"%s\" faylının pubkey'si idxal edilə bilmədi"
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "\"%s\" medyası üçün siyahı faylı yazılır"
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "%s medyası əlavə edildi"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "\"%s\" hdlist faylı alına bilmir"
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "\"%s\" medyasının synthesis faylı oxuna bilmədi"
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "\"%s\" medyasından üst mə'lumatlar oxunur"
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "XxJjNn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "YyBb"
@@ -1173,47 +1266,52 @@ msgstr "\"%s\" inkeherent medyası söküləbilən deyə bildirilib, amma deyil"
msgid "unable to access medium \"%s\""
msgstr "\"%s\" medyasına çatıla bilmir"
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, fuzzy, c-format
msgid "No package named %s"
msgstr "%s adlı paket yoxdur"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Aşağıdakı paketlər %s daxıl edir: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "%s əksik olduğuna görə"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "hər şey onsuzda quruludur"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "razı qalmayan %s olduğuna görə"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "%s irəliləndirməyə çalışılır"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "%s'ı saxlamaq üçün"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "%s paket(lər)ini qurmaq üçün"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "%s ilə yaranan toqquşma səbəbiylə"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "tələb edilməmiş"
@@ -1233,6 +1331,16 @@ msgstr "Hökmsüz Qiymət ID (%s)"
msgid "Missing signature (%s)"
msgstr "Əksik imza (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "[%s] quraşdırma faylı yazıla bilmir"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Köçütrmə bacarılmadı"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1250,8 +1358,8 @@ msgstr ""
"\n"
"istifadə qaydası:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1266,18 +1374,18 @@ msgstr " --auto - seçililər arasında paketi avtomatik seç.\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - qurulumun düzgün edilə biləcəyini yoxla.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr " --force - bəzi paketlər mövcud olmasa belə istəməyə zorla.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - alias sistemləri arasında paylaşılmış urpmi.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - taq paketləyicisini göstərr: paketləyici.\n"
@@ -1287,8 +1395,8 @@ msgstr " --packager - taq paketləyicisini göstərr: paketləyici.\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - rpm qurulumu üçün başqa root işlət.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - rpm qurulumu üçün başqa root işlət.\n"
@@ -1305,17 +1413,17 @@ 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:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - synthesis faylını tapıb işlətməyə çalış.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - hdlist faylını tapıb işlətməyə çalış.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - təfsilatlı mod.\n"
@@ -1325,37 +1433,37 @@ msgstr " --verbose - təfsilatlı mod.\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - qaydaya uyğun gələn bütün paketləri seç.\n"
-#: ../urpme:76
+#: ../urpme:73
#, fuzzy, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Medianı silmə icazəsi ancaq ali istifadəçiyə verilib"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "namə'lum paketlər"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "na'məlum paket "
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "%s paketini silmək sisteminizi pozacaq"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Silinəcək heç bir şey yoxdur"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Aşağıdakı paketlər silinmək üçün yoxlanır"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1363,23 +1471,23 @@ msgid_plural ""
msgstr[0] ""
"Asılıqları ortadan qaldırmaq üçün, aşağıdakı paketlər silinəcəkdir (%d MB)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr " (%d MB)"
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "%s peketi silinir"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (b/X) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Çıxartma bacarılmadı"
@@ -1406,12 +1514,12 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - Buraxılıs mə'lumatını gösta,rər və çıxar\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr " --env - xüsusi mühit işlət (əsasən bir xəta raportu).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr " --excludemedia - vergüllə ayrılmış verilən mediya(lar)nı işlətmə.\n"
@@ -1422,13 +1530,13 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../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"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1440,7 +1548,7 @@ msgstr ""
msgid " --use-distrib - use the given path to access media\n"
msgstr " --synthesis - urpmi db yerinə verilən synthesis'i işlət.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - urpmi db yerinə verilən synthesis'i işlət.\n"
@@ -1450,7 +1558,7 @@ msgstr " --synthesis - urpmi db yerinə verilən synthesis'i işlət.\n"
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - identik sətirləri göstərmə.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - təkcə güncəl medyanı işlət.\n"
@@ -1586,88 +1694,98 @@ msgstr " --group - taq qrupunu göstər: qrup.\n"
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr " --name - sadəcə paket adlarını göstər.\n"
#: ../urpmf:73
#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr " --name - sadəcə paket adlarını göstər.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - taq mütləqlərini göstər: bütün mütləqlər.\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr " --packager - taq paketləyicisini göstərr: paketləyici.\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, fuzzy, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - taq gətirənini göstər: bütün gətirənlər.\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, fuzzy, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - taq lazımlılarını göstər: bütün lazımlılar.\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --size - taq böyüklüyünü göstər: böyüklük.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, fuzzy, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - taq sourcerpm'ini göstər: source rpm.\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - taq mütləqlərini göstər: bütün mütləqlər.\n"
+
+#: ../urpmf:81
#, fuzzy, c-format
msgid " --summary - summary\n"
msgstr " --summary - taq icmalını göstər: icmal.\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr " --url - taq url'sini göstər: url.\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr " --verbose - təfsilatlı mod.\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -l - paketdəki faylları göstər.\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - adla birlikdə buraxılış, yayını və arch'ı da çap et.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "%s üstündə xüsusi mühit istifadə edilir\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1684,54 +1802,54 @@ msgstr ""
"\n"
"istifadə qaydası:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
" --media - ancaq vergüllə ayrılmış verilən mediya(lar)nı işlət.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr " --auto-select - sistemi yeniləmək üçün paketləri avtomatik seç.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr " --auto-select - sistemi yeniləmək üçün paketləri avtomatik seç.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, fuzzy, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - MD5SUM fayl yoxlamasını qeyri fəallaşdır.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, fuzzy, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - gpg açarını yeniləməyə məcbur et.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
"installation.\n"
msgstr " --no-uninstall - paket silməyi qətiyyən soruşma, qurulumu bitir.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, fuzzy, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --install-src - ancaq mənbə paketini qur (ikililəri yox).\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1741,7 +1859,7 @@ msgstr ""
"paketlərin\n"
" silinməsini məcbur qılan paketləri rədd et.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1752,37 +1870,43 @@ msgstr ""
" daha qısa keçişlərə böl,\n"
" əsas qiymət: %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - kiçik keçiş uzunluqu, əsasən %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, fuzzy, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy - fuzzy axtarmanı qəbul et ( -y ilə eyni).\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, fuzzy, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src - növbəti paket mənbə paketidir (-s ilə eyni).\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr " --install-src - ancaq mənbə paketini qur (ikililəri yox).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - hərşeydən əvvəl ara yaddaşdan rpm'i sil.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, fuzzy, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - rpm'ləri ara yaddaşda işlətmə.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1791,7 +1915,7 @@ msgstr ""
" --allow-nodeps - istifadəçiyə paketi asıllılıqları diqqətə almadan\n"
" qurma sualı verməyə icazə ver.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1800,59 +1924,59 @@ msgstr ""
" --allow-force - istifadəçiyə paketi asıllılıqları və uyğunluq\n"
" yoxlanmadan qurma sualı verməyə icazə ver.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - rpm qurulumu üçün başqa root işlət.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
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-ni birbaşa distrib ağacından quraşdır.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - wget'i uzaqdakı faylları almaq üçün işlədin.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - uzaqdakı faylları almaq üçün curl işlət.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, fuzzy, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --curl - uzaqdakı faylları almaq üçün curl işlət.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - endirmə sür'ətinə sərhəd qoy .\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1862,7 +1986,7 @@ msgstr ""
" (--no-resume bunu qeyri-fəallaşdırır, əsasən qeyri-"
"fəaldır).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1873,7 +1997,7 @@ msgstr ""
" 1080 qəbul edilir (istifadə qaydası: <vəkilqovşaq[:qapı]"
">).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1883,7 +2007,7 @@ msgstr ""
" istifadəçi adı və şifrə (istifadə qaydası: <istifadəçi:"
"şifrə>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1892,7 +2016,7 @@ msgstr ""
" --bug - bir sonrakı verilən arqumentlə verilmiş cərgəyə\n"
" xəta raportunu yaz.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, fuzzy, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1902,105 +2026,110 @@ msgstr ""
" (--no-verify-rpm bunu qeyri-fəallaşdırır, əsasən "
"fəaldır).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, fuzzy, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr " --test - qurulumun düzgün edilə biləcəyini yoxla.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - vergüllə ayrılmış daxil etməmə çığırı.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - sənəd fayllarını ixrac et.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, fuzzy, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr " --no-uninstall - paket silməyi qətiyyən soruşma, qurulumu bitir.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --url - taq url'sini göstər: url.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - taq izahatını göstər: izahat.\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - qurulması keçilə bilən paketlər\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - qurulması keçilə bilən paketlər\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:150
+#: ../urpmi:148
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - rpm'ləri ara yaddaşda işlətmə.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, 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:153
+#: ../urpmi:151
#, 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"
-#: ../urpmi:154
+#: ../urpmi:152
#, 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"
-#: ../urpmi:155
+#: ../urpmi:153
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - səssiz mod.\n"
-#: ../urpmi:157
+#: ../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:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, 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:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2009,7 +2138,7 @@ msgstr ""
"[%s] qovluğu onsuz da mövcuddur, xahiş edirik xəta raportu üçün başqa qovluq "
"işlədin"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Xəta raportu üçün [%s] cərgəsi yaradıla bilmədi"
@@ -2019,41 +2148,43 @@ msgstr "Xəta raportu üçün [%s] cərgəsi yaradıla bilmədi"
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "Yeniləmə"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "Yeniləmə"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "Qurulumun sonu"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "Qurulumun sonu"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2061,12 +2192,12 @@ msgid ""
msgstr ""
"Asılıqları ortadan qaldırmaq üçün, aşağıdakı paketlər silinəcəkdir (%d MB)"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Seçiminiz? (1-%d)"
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2074,7 +2205,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2082,19 +2213,19 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Davam edilsin?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (B/x) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2103,7 +2234,7 @@ msgstr ""
"Bəzi istənən paketlər qurula bilmir:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2112,7 +2243,7 @@ msgstr ""
"Bəzi istənən paketlər qurula bilmir:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2123,7 +2254,7 @@ msgstr ""
"aşağıdakı paketlərin çıxardılması lazımdır:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2134,7 +2265,7 @@ msgstr ""
"aşağıdakı paketlərin çıxardılması lazımdır:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2143,7 +2274,7 @@ msgstr ""
"Paketlərin yenilənməsi üçün aşağıdakı paketlərin çıxardılması lazımdır:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2152,12 +2283,17 @@ msgstr ""
"Paketlərin yenilənməsi üçün aşağıdakı paketlərin çıxardılması lazımdır:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2166,109 +2302,28 @@ msgstr ""
"Aşağıdakı asıllılıqları qurmaq üçün ali istifadəçi olmalısınız:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
-#: ../urpmi:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Hazır olanda Enter düyməsinə basın..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Ləğv et"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "Aşağıdakı paketlər hökmsüz imzaya sahibdir"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Aşağıdakı paketlər hökmsüz imzaya sahibdir"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Quruluma davam etmək istəyirsiniz ?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Qurulum iflas etdi"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "%s paylanır"
-
-#: ../urpmi:726
-#, fuzzy, c-format
-msgid "installing %s from %s"
-msgstr "%s qurulur"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "%s qurulur"
-
-#: ../urpmi:759
-#, 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) "
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Quruluşu zorlayaraq sınayım (--force)? (b/X)"
-
-#: ../urpmi:815
-#, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d qurulum daşınmaları bacarılmadı"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Qurulum mümkündür"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "hər şey onsuzda quruludur"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "hər şey onsuzda quruludur"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "hər şey onsuzda quruludur"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "hər şey onsuzda quruludur"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "urpmi yenidən başladılır"
@@ -2397,49 +2452,49 @@ msgstr " -v - təfsilatlı mod.\n"
msgid "unable to update medium \"%s\"\n"
msgstr " \"%s\" medyası güncəllənə bilmir\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Media əlavə etmə icazəsi ancaq ali istifadəçiyə verilib"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "[%s] quraşdırma faylı yazılır"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, fuzzy, c-format
msgid "Can't create config file [%s]"
msgstr "[%s] quraşdırma faylı yazılır"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "<hdlist'in nisbi yolu>nu --distrib ilə verməyə ehtiyac yoxdur"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<hdlistin nisbi yolu> mövcud deyildir\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr " \"%s\" medyası yaradıla bilmir\n"
@@ -2599,18 +2654,18 @@ msgstr " -a - medya seç.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -a - əmr sətirindəki bütün uyğun gələnləri seç.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Medianı silmə icazəsi ancaq ali istifadəçiyə verilib"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr ""
"silinəcək bir şey yoxdur (medya əlavə etmək üçün urpmi.addmedia işlədin)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2666,18 +2721,18 @@ msgstr " -a - çıxardıla bilməyən medya seç.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - hdlist fayllarının yaradılmasını məcbur et.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Medianı yeniləmə icazəsi ancaq ali istifadəçiyə verilib"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
"yenilənəcək bir şey yoxdur (medya əlavə etmək üçün urpmi.addmedia işlədin)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2686,22 +2741,22 @@ msgstr ""
"güncəllənəcək giriş mövcud deyildir\n"
"(%s dan (dən) biri)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "ignoring media %s"
msgstr "\"%s\" mediyumu dəyişdirilir:"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "enabling media %s"
msgstr "\"%s\" medyumu çıxardılır"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2718,7 +2773,7 @@ msgstr ""
"\n"
"istifadə qaydası:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2726,49 +2781,49 @@ msgid ""
msgstr ""
" --media - ancaq vergüllə ayrılmış verilən mediya(lar)nı işlət.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - fuzzy axtarmanı qəbul et ( -y ilə eyni).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - mövcud paketləri göstər.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - mövcud medyanı göstər.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - mövcud medyanı və onların URL-lərini göstər.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr " --list-nodes - mövcud düyümləri --paralel işlədərkən göstər.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - mövcud paralel aliasları sırala.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
" --dump-config - qurğuları urpmi.addmedia arqumenti formasında göstər.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr " --src - növbəti paket mənbə paketidir (-s ilə eyni).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
@@ -2776,41 +2831,41 @@ msgstr ""
" --sources - endirmədən əvvəl bütün mənbə paketini ver (təkcə ali "
"istifadəçi).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --url - taq url'sini göstər: url.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
" This permit to querying a distro.\n"
msgstr " --use-distrib - urpmi-ni birbaşa distrib ağacından quraşdır.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - dəyişmə qeydi faylını göstər.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - taq icmalını göstər: icmal.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - paketin nəyə ehtiyacı olduğunu tərsdən axtar.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, fuzzy, c-format
msgid ""
" --whatrequires-recursive\n"
" - extended reverse search (includes virtual packages).\n"
msgstr " -R - paketin nəyə ehtiyacı olduğunu tərsdən axtar.\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
@@ -2819,102 +2874,115 @@ msgstr ""
" -p - paketi tapmaq üçün verilənlər arasında axtarmaya icazə "
"ver.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - silinəcək paketlə çıxışı başa çatdır.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - sorğunu paketin asıllılıqlarına qədər uzat.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - adla birlikdə qrupları da göstər.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - insanın oxuya biləcəyi şəkildə faydalı mə'lumatları "
"göstər.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - paketdəki faylları göstər.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - səssiz mod.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - adla birlikdə buraxılış və yayını da göstər.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - növbəti paket mənbə paketidir (--src ilə eyni).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
msgstr " -u - daha yeni buraxılış qurulu isə paketi çıxart/sil.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - fuzzy axtarmanı qəbul et ( --fuzzy ilə eyni).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, fuzzy, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -a - əmr sətirindəki bütün uyğun gələnləri seç.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " əmr sətirində verilən adlar ya da rpm faylları sorğulanacaq.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes ancaq --parallel ilə bərabər istifadə edilə bilər"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:425
#, fuzzy, c-format
msgid "No changelog found\n"
msgstr "Rəsm tapıla bilmədi"
#, fuzzy
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Aşağıdakı paketlər hökmsüz imzalara sahibdir:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Yenə də qurulumu davam etdirmək istəyirsiniz?"
+
+#, fuzzy
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Bu əmri işlətmək üçün ali istifadəçi olmalısan ! \n"
@@ -3223,10 +3291,6 @@ msgstr "Rəsm tapıla bilmədi"
#~ "paketlərin\n"
#~ " silinməsini məcbur qılan paketləri rədd et.\n"
-#, fuzzy
-#~ msgid "unable to write file [%s]"
-#~ msgstr "[%s] quraşdırma faylı yazıla bilmir"
-
#~ msgid ""
#~ " --distrib-XXX - automatically create a medium for XXX part of a\n"
#~ " distribution, XXX may be main, contrib, updates or\n"
diff --git a/po/bg.po b/po/bg.po
index 583cc9dc..295683c0 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+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"
@@ -21,7 +21,7 @@ msgstr ""
"X-Generator: KBabel 1.0.2\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "RPM Инсталация"
@@ -31,7 +31,7 @@ msgstr "RPM Инсталация"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Добре"
@@ -97,7 +97,7 @@ msgstr "_Инсталиране"
msgid "_Save"
msgstr "_Запазване"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr " Отказ"
@@ -117,17 +117,17 @@ msgstr "Неизвестен хост %1"
msgid "No packages specified"
msgstr "Не е въведена команда"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Моля, изчакайте..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "Трябва да бъдете root/админ"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -138,42 +138,42 @@ msgstr ""
"%s\n"
"Продължение?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Предупреждение"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Добре"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr "(за обновяване)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr "(към инсталация)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Необходим е един от следните пакети:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Прекъсване"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -185,14 +185,14 @@ msgstr ""
"%s\n"
"Продължение"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
"За да се запазят зависимостите,тези пакети ще бъдат деинсталирани (%d МБ)"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -201,47 +201,49 @@ msgstr ""
"бъдат инсталирани:\n"
"%s\n"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, fuzzy, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "%d пакета"
msgstr[1] "%d пакета"
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Инсталиране на пакети..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "не мога да получа сорс пакетите, прекратявам"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Подготовка..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Инсталиране на пакет `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Моля, поставете източник с име \"%s\" в устройство [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Сваляне на пакет `%s'..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Следните пакети са с невалидни подписи:\n"
-"%s\n"
-"\n"
-"Искате ли да продължите въпреки това ?"
+msgid "_Done"
+msgstr "_Готово"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -252,41 +254,27 @@ msgstr ""
"%s\n"
"Вие вероятно трябва да обновите вашата urpmi база данни."
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "изтриване на %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Подготовка..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Инсталиране на пакет `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Готово"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Инсталацията провалена"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Пакета(тите) вече са инсталирани"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Инсталацията приключи"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "изтриване на %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -322,7 +310,7 @@ msgstr " -g - отпечатай също групите с име
msgid " defaults to %s.\n"
msgstr " по подразбиране е %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, fuzzy, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Появи се грешка при инсталиране на пакетите:"
@@ -332,98 +320,98 @@ msgstr "Появи се грешка при инсталиране на паке
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "не мога да отворя rpmdb"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "грешно rpm име на файла [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "получавам rpm файла [%s] ... "
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...получаването завършено"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...грешка при получаване: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "rpm файлът [%s] е недостъпен"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "невъзможно да се обработи/парсва \"%s\" в файл [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "невъзможно регистрирането на rpm файл"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "грешка при регистрация на локалните пакети"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "грешна прокси декларация на командния ред\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: не може да се прочете rpm файл \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "създаден е hdlist синтезис файл за източник \"%s\""
@@ -610,7 +598,12 @@ msgstr "пакет %s не е намерен."
msgid "malformed URL: [%s]"
msgstr "грешно въвеждане: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, fuzzy, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "получаване на rpm файлове от източник \"%s\"... "
@@ -620,7 +613,7 @@ msgstr "получаване на rpm файлове от източник \"%s\
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -628,37 +621,42 @@ msgstr ""
"създадена е транзакция за инсталиране върху %s (премахни=%d, инсталирай=%d, "
"обнови=%d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, fuzzy, c-format
msgid "unable to create transaction"
msgstr "не може да се създаде/започне транзакция"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "невъзможно е премахването на пакет %s "
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "добавяне на пакет %s (id=%d, eid=%d, обнови=%d, файл=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "невъзможно инсталирането на пакет %s "
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "изтриване на пакет %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "изтриване на пакет %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "инсталиране %s\n"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, fuzzy, c-format
msgid "More information on package %s"
msgstr "Повече информация от пакет..."
@@ -688,11 +686,103 @@ msgstr "Не е въведена команда"
msgid "Cannot connect to ldap uri:"
msgstr "Грешка при свързване със сървъра"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "базата данни на urpmi е заключена"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Предупреждение"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "базата данни на urpmi е заключена"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "Следните пакети ще трябва да се инсталират:\n"
+
+#: ../urpm/main_loop.pm:100
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
+msgstr "Следните пакети ще трябва да се инсталират:\n"
+
+#: ../urpm/main_loop.pm:101
+#, fuzzy, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Искате ли да цъкнете на този бутон?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Инсталацията провалена"
+
+#: ../urpm/main_loop.pm:133
+#, fuzzy, c-format
+msgid "distributing %s"
+msgstr "Стартирам %s:"
+
+#: ../urpm/main_loop.pm:148
+#, fuzzy, c-format
+msgid "installing %s from %s"
+msgstr "инсталиране %s\n"
+
+#: ../urpm/main_loop.pm:150
+#, fuzzy, c-format
+msgid "installing %s"
+msgstr "инсталиране %s\n"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Опит за инсталиране без проверка на зависимости? (д/Н) "
+
+#: ../urpm/main_loop.pm:205
+#, fuzzy, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "Опит за инсталиране даже по-силно (--force)? (д/Н) "
+
+#: ../urpm/main_loop.pm:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d инсталационните транзакции не можаха да се осъществят"
+msgstr[1] "%d инсталационните транзакции не можаха да се осъществят"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Инсталацията е възможна"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "Пакета(тите) вече са инсталирани"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Пакета(тите) вече са инсталирани"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "Пакета(тите) вече са инсталирани"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Пакета(тите) вече са инсталирани"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -745,7 +835,7 @@ msgstr "опит за избор на несъществуващ източни
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "създаден е hdlist синтезис файл за източник \"%s\""
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "невъзможен достъп до hdlist файла за \"%s\", източника е игнориран"
@@ -844,7 +934,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Търсенето започнато: %s край: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "извършвам втори опит за определяне на зависимостите\n"
@@ -914,71 +1004,76 @@ msgstr ""
"невъзможен достъпа до източника за първоначална инсталация (не е намерен "
"файла hdlists)"
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%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/media.pm:832
+#: ../urpm/media.pm:839
#, 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:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "избор на множество източници: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "премахване на източник \"%s\":"
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "пренастройка на urpmi за източник \"%s\"..."
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "...пренастройката неуспешна"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "пренастройката завършена"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "източникът \"%s\" не е избран"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "проверка на hdlists файла [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, fuzzy, c-format
msgid "examining synthesis file [%s]"
msgstr "проверявам синтезис файл [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "прави се hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -987,77 +1082,77 @@ msgstr ""
"Не може да се създаде синтезис файл от изтчоник \"%s\". Вашия hdlist файл "
"може би е повреден."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "грешка при четенето на hdlist или synthesis файла от източника \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "записване на лист файл за източник \"%s\""
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...неуспешно копиране"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "копиране на описателен файл за \"%s\"..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...копирането завършено"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "грешка при копиране на [%s] (файла е подозрително малък)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "изчисляване на md5 сумата на копирания hdlist (или synthesis)"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "грешко копие на [%s] (грешна md5sum)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "изчисляване на md5 сумата на копирания hdlist (или synthesis)"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, fuzzy, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...грешка при получаване: %s"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, fuzzy, c-format
msgid "no rpm files found from [%s]"
msgstr "не са намерени rpm файлове от [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "четене на rpm файлове от [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "невъзможно четенето на rpm файлове от [%s] : %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "няма прочетени rpm файлове"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1068,74 +1163,74 @@ msgstr ""
"това може да стане ако ръчно сте монтирали директорията когато есъздаден "
"източника."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "не е намерен hdlist файл за източник \"%s\""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, fuzzy, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "четене на source hdlist (или synthesis) от \"%s\""
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, fuzzy, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "намерен тестван hdlist (или synthesis) като %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, fuzzy, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "не е намерен hdlist файл за източник \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "проверявам публичен ключ от \"%s\"..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, fuzzy, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...импортиран ключ %s от файл с публични ключове за \"%s\""
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, fuzzy, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "невъзможен импорт на файл с публични ключове от \"%s\""
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "записване на лист файл за източник \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "добавен източник %s"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "невъзможно да се обработи hdlist файла за \"%s\""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "проблем при четенето на синтез файл за източник \"%s\""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, fuzzy, c-format
msgid "reading headers from medium \"%s\""
msgstr "четене на headers от източник \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "НнNn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "ДдDdYy"
@@ -1196,47 +1291,52 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "невъзможен достъп до източник \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "няма пакет наречен %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Следните пакети съдържат %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "поради липсващ %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Пакета(тите) вече са инсталирани"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "поради неопределен %s"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, fuzzy, c-format
msgid "trying to promote %s"
msgstr "опит за избор на %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, fuzzy, c-format
msgid "in order to keep %s"
msgstr "за да се запази %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "за да се инсталира %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "поради конфликт с %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, fuzzy, c-format
msgid "unrequested"
msgstr "незаявен"
@@ -1256,6 +1356,18 @@ msgstr "Невалиден идентификатор на ключ (%s)"
msgid "Missing signature (%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/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "невъзможно е да се запише файл [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Неуспешно влизане"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1273,8 +1385,8 @@ msgstr ""
"\n"
"начин на ползване:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - показва това помощно съобщение.\n"
@@ -1290,18 +1402,18 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - проверка дали изтриването може да се извърши коректно.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr " --force - продължи дори ако някои пакети не съществуват.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --summary - отпечатва резюме за тага: summary.\n"
@@ -1311,8 +1423,8 @@ msgstr " --summary - отпечатва резюме за тага: summa
msgid " --root - use another root for rpm removal.\n"
msgstr " --size - отпечатва размера на тага: size."
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --size - отпечатва размера на тага: size."
@@ -1331,19 +1443,19 @@ msgstr ""
" --use-distrib - автоматична конфигурация на urpmi от дървото, полезна\n"
" за (де)инсталация на chroot при --root опция.\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr ""
" -h - опитай да намериш и ползваш синтез or hdlist файл.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr ""
" -h - опитай да намериш и ползваш синтез or hdlist файл.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - показва всички съобщения\n"
@@ -1353,39 +1465,39 @@ msgstr " --verbose, -v - показва всички съобщения\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - избиране на всички съвпадащи пакети.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Само superuser-а има право да премахва пакети"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "неизвестни пакети"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "неизвестен пакет"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, fuzzy, c-format
msgid "removing package %s will break your system"
msgstr ""
"Премахването на тези пакети би разбило системата ви, съжалявам:\n"
"\n"
-#: ../urpme:121
+#: ../urpme:118
#, fuzzy, c-format
msgid "Nothing to remove"
msgstr "Няма маркер за изтриване!"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Проверка за премахване на следните пакети"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1395,24 +1507,24 @@ msgstr[0] ""
msgstr[1] ""
"За да се запазят зависимостите,тези пакети ще бъдат деинсталирани (%d МБ)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr " (%d МБ)"
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "изтриване на пакет %s"
msgstr[1] "изтриване на пакет %s"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (Д/н) "
-#: ../urpme:160
+#: ../urpme:157
#, fuzzy, c-format
msgid "Removal failed"
msgstr "Неуспешно влизане"
@@ -1439,14 +1551,14 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - показва версията и излиза\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
# Another meaning of the word is in the sense "The iron is good medium for the eletricity"
# in this case must be "проводник"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, fuzzy, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr " --update - създаване на ъпдейт посредник.\n"
@@ -1457,14 +1569,14 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, fuzzy, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --update - обновява само източници на обновяване.\n"
# Another meaning of the word is in the sense "The iron is good medium for the eletricity"
# in this case must be "проводник"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, fuzzy, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1477,7 +1589,7 @@ msgstr " --update - създаване на ъпдейт посредни
msgid " --use-distrib - use the given path to access media\n"
msgstr " --update - създаване на ъпдейт посредник.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1487,7 +1599,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --url - отпечатва url тага: url.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, fuzzy, c-format
msgid " --update - use only update media.\n"
msgstr " --update - обновява само източници на обновяване.\n"
@@ -1624,89 +1736,101 @@ msgstr " --url - отпечатва url тага: url.\n"
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr " --all - отпечатва всички тагове.\n"
#: ../urpmf:73
#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr " --all - отпечатва всички тагове.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr ""
" --conflicts - отпечатва конфликтите на тага: всички конфликти "
"(множество редове)."
-#: ../urpmf:74
+#: ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr " --summary - отпечатва резюме за тага: summary.\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, fuzzy, c-format
msgid " --provides - provides tags\n"
msgstr " --url - отпечатва url тага: url.\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, fuzzy, c-format
msgid " --requires - requires tags\n"
msgstr " --url - отпечатва url тага: url.\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --url - отпечатва url тага: url.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, fuzzy, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --summary - отпечатва резюме за тага: summary.\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr ""
+" --conflicts - отпечатва конфликтите на тага: всички конфликти "
+"(множество редове)."
+
+#: ../urpmf:81
#, fuzzy, c-format
msgid " --summary - summary\n"
msgstr " --summary - отпечатва резюме за тага: summary.\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr " --url - отпечатва url тага: url.\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr " -v - показва всички съобщения\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -l - извежда файловете в пакет.\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, fuzzy, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -r - отпечатай версия и също така реализация с име.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1725,62 +1849,62 @@ msgstr ""
# Another meaning of the word is in the sense "The iron is good medium for the eletricity"
# in this case must be "проводник"
-#: ../urpmi:88
+#: ../urpmi:84
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
msgstr " --update - създаване на ъпдейт посредник.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr ""
" --auto-select - автоматично избира пакети за ъпгрейд на системата.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
" --auto-select - автоматично избира пакети за ъпгрейд на системата.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, fuzzy, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - изключва MD5SUM проверка на файловете.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, fuzzy, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - активирай обновяване на gpg ключ.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
"installation.\n"
msgstr ""
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr ""
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
" packages that lead to removals.\n"
msgstr ""
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1788,138 +1912,144 @@ msgid ""
" default is %d.\n"
msgstr ""
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr ""
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr ""
-#: ../urpmi:105
+#: ../urpmi:101
#, fuzzy, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --list - отпечатва всички налични пакети.\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr ""
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr ""
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
" dependencies checking.\n"
msgstr ""
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
" dependencies checking and integrity.\n"
msgstr ""
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, fuzzy, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --size - отпечатва размера на тага: size."
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
" to install a chroot with --root option.\n"
msgstr ""
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr ""
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr ""
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr ""
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr ""
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
" (--no-resume disables it, default is disabled).\n"
msgstr ""
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../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 ""
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
" authentication (format is <user:password>).\n"
msgstr ""
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
" next arg.\n"
msgstr ""
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
" (--no-verify-rpm disables it, default is enabled).\n"
msgstr ""
-#: ../urpmi:140
+#: ../urpmi:137
#, fuzzy, c-format
msgid ""
" --test - only verify if the installation can be achieved "
@@ -1927,103 +2057,108 @@ msgid ""
msgstr ""
" --test - проверка дали изтриването може да се извърши коректно.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr ""
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr ""
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --url - отпечатва url тага: url.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - отпечатва описание на тага: description."
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
-#: ../urpmi:148
+#: ../urpmi:145
+#, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr ""
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:150
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr ""
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - избиране на всички съвпадения на командния ред.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, fuzzy, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -a - избиране на всички съвпадения на командния ред.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, fuzzy, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -r - отпечатай версия и също така реализация с име.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -v - показва всички съобщения\n"
-#: ../urpmi:157
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
-#: ../urpmi:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi:243
+#: ../urpmi:241
#, fuzzy, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr "Групата вече съществува,моля изберете друго име"
-#: ../urpmi:244
+#: ../urpmi:242
#, fuzzy, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Грешка при създаване на директория %s"
@@ -2033,41 +2168,43 @@ msgstr "Грешка при създаване на директория %s"
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "(за обновяване)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "(за обновяване)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "(към инсталация)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "(към инсталация)"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2075,12 +2212,12 @@ msgid ""
msgstr ""
"За да се запазят зависимостите,тези пакети ще бъдат деинсталирани (%d МБ)"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Какъв е вашият избор? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2088,7 +2225,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2096,19 +2233,19 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Продължение въпреки всичко ?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (Д/н) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2118,7 +2255,7 @@ msgstr ""
"%s\n"
"Продължение?"
-#: ../urpmi:504
+#: ../urpmi:521
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2128,7 +2265,7 @@ msgstr ""
"%s\n"
"Продължение?"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2139,7 +2276,7 @@ msgstr ""
"трябва да бъдат премахнати за да бъдат обновени други\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2150,7 +2287,7 @@ msgstr ""
"трябва да бъдат премахнати за да бъдат обновени други\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2160,7 +2297,7 @@ msgstr ""
"обновени:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2170,123 +2307,46 @@ msgstr ""
"обновени:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, fuzzy, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
"%s\n"
msgstr "Трябва да сте root за да ползвате тази команда ! \n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, 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:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Натиснете Enter,когато сте готови..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Отказ"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "Следните пакети ще трябва да се инсталират:\n"
-
-#: ../urpmi:672
-#, fuzzy, c-format
-msgid "The following packages have bad signatures"
-msgstr "Следните пакети ще трябва да се инсталират:\n"
-
-#: ../urpmi:673
-#, fuzzy, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Искате ли да цъкнете на този бутон?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Инсталацията провалена"
-
-#: ../urpmi:711
-#, fuzzy, c-format
-msgid "distributing %s"
-msgstr "Стартирам %s:"
-
-#: ../urpmi:726
-#, fuzzy, c-format
-msgid "installing %s from %s"
-msgstr "инсталиране %s\n"
-
-#: ../urpmi:728
-#, fuzzy, c-format
-msgid "installing %s"
-msgstr "инсталиране %s\n"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Опит за инсталиране без проверка на зависимости? (д/Н) "
-
-#: ../urpmi:776
-#, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Опит за инсталиране даже по-силно (--force)? (д/Н) "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d инсталационните транзакции не можаха да се осъществят"
-msgstr[1] "%d инсталационните транзакции не можаха да се осъществят"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Инсталацията е възможна"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Пакета(тите) вече са инсталирани"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Пакета(тите) вече са инсталирани"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "Пакета(тите) вече са инсталирани"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "Пакета(тите) вече са инсталирани"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, fuzzy, c-format
msgid "restarting urpmi"
msgstr "Стартира slurpd: "
@@ -2406,49 +2466,49 @@ msgstr " -v - показва всички съобщения\n"
msgid "unable to update medium \"%s\"\n"
msgstr "невъзможност за обновяване на източник \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Само superuser-а има правото да инсталира източници"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "ще се създаде конфигурационен файл [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "невъзможно да се създаде конфигурационен файл [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "не се въвежда <относителен път до hdlist> при --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, fuzzy, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "Липсва относителен път до hdlist\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, fuzzy, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "Невъзможност за създаване на източник."
@@ -2609,17 +2669,17 @@ msgstr " -a - избиране на всички източници
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - избиране на всички съвпадения на командния ред.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, fuzzy, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Само superuser-а има правото да инсталира източници"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "нищо за премахване (ползвай urpmi.addmedia за добавяне на източник)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2674,17 +2734,17 @@ msgstr " -a - избиране на всички твърди ди
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -v - активира създаване на hdlist файлове.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, fuzzy, c-format
msgid "Only superuser is allowed to update media"
msgstr "Само superuser-а има правото да обновява източниците"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "нищо за ъпгрейд (ползвай urpmi.addmedia за добавяне на източник)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2693,24 +2753,24 @@ msgstr ""
"липсва опцията за обновяване\n"
"(една от %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %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 "проводник"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "активиране на източник %s"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2729,45 +2789,45 @@ msgstr ""
# Another meaning of the word is in the sense "The iron is good medium for the eletricity"
# in this case must be "проводник"
-#: ../urpmq:51
+#: ../urpmq:48
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
"packages.\n"
msgstr " --update - създаване на ъпдейт посредник.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr ""
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - отпечатва наличните пакети.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - показва наличните източници.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - показва наличните източници и техните url.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
" --list-nodes - показва наличните възли когато се ползва --parallel.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, fuzzy, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - показва наличните паралелни синоними.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
@@ -2775,24 +2835,24 @@ msgstr ""
" --dump-config - съхранява конфигурацията под формата на urpmi.addmedia "
"аргумент.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, fuzzy, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr " --list - отпечатва всички налични пакети.\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr ""
" --sources - връща всички сорс пакети преди даунлоуд (само root).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --url - отпечатва url тага: url.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2801,76 +2861,76 @@ msgstr ""
" --use-distrib - конфигурирай urpmi автоматично от дървото.\n"
" Това позволява да се извършват запитвания.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - отпечатва списък с промените.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - отпечатва резюме за тага: summary.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " -R - обратно търсене за това кой изисква пакета.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, fuzzy, c-format
msgid ""
" --whatrequires-recursive\n"
" - extended reverse search (includes virtual packages).\n"
msgstr " -R - обратно търсене за това кой изисква пакета.\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -p - търсене в provides за да се намери пакет.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, fuzzy, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - пълен отчет с пакета който ще бъде изтрит.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, fuzzy, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - разшири запитването и към пакетните зависимости.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - отпечатай също групите с имена.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - отпечатай полезна информация за четене от човек.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - извежда файловете в пакет.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -v - показва всички съобщения\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - отпечатай версия и номер а също и име.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, fuzzy, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -r - отпечатай версия и също така реализация с име.\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2878,52 +2938,63 @@ msgid ""
msgstr ""
" -u - премахни пакета ако вече е инсталирана по-нова версия.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -Y - като -y, но не се отчитат главни-малки букви.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr "имена или rpm файлове от командния ред се обработват.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, fuzzy, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes може да се използва само с --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Не е намерен changelog\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Следните пакети са с невалидни подписи:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Искате ли да продължите въпреки това ?"
+
#, fuzzy
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Трябва да сте root за да ползвате тази команда ! \n"
@@ -3175,11 +3246,6 @@ msgstr "Не е намерен changelog\n"
#~ "%s"
#~ msgstr "Някои пакети не могат да бъдат инсталирани"
-# Another meaning of the word is in the sense "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#~ msgid "unable to write file [%s]"
-#~ msgstr "невъзможно е да се запише файл [%s]"
-
#~ msgid "found version %s and arch %s ..."
#~ msgstr "намерена версия %s и архитектура %s ..."
diff --git a/po/bn.po b/po/bn.po
index 921d5b0b..c801de22 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+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"
@@ -34,7 +34,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "আরপিএম ইনস্টলেশন"
@@ -44,7 +44,7 @@ msgstr "আরপিএম ইনস্টলেশন"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "ঠিক আছে (_ঠ)"
@@ -110,7 +110,7 @@ msgstr "_ইনস্টল"
msgid "_Save"
msgstr "_সংরক্ষণ"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "বাতিল (_ত)"
@@ -132,17 +132,17 @@ msgstr ""
msgid "No packages specified"
msgstr "কোন নির্দেশ পাওয়া যায় নি"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "অনুগ্রহ করে অপেক্ষা করুন..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "অবশ্যই root হতে হবে"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -153,42 +153,42 @@ msgstr ""
"%s\n"
"এগিয়ে যাবো?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "নোটিশ"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "ঠিক আছে"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (আপগ্রেডের জন্য)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (ইনস্টলের জন্য)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "নিম্নলিখিত প্যাকেজসমুহের মধ্যে একটির প্রয়োজন আছে:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_বাতিল"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -199,14 +199,14 @@ msgstr ""
"%s\n"
"এগিয়ে যাবো?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
"নিম্নলিখিত প্যাকেজগুলি ইনস্টল হতে যাচ্ছে, ডিপেন্ডেন্সিদের সন্তুষ্ট করতে (%d এমবি)"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -214,47 +214,49 @@ msgstr ""
"ডিপেন্ডেন্সি সন্তুষ্ট করতে নিম্নলিখিত %d প্যাকেজগুলো ইনস্টল হতে যাচ্ছে:\n"
"%s\n"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, fuzzy, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "%d প্যাকেজ সমূহ"
msgstr[1] "%d প্যাকেজ সমূহ"
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "প্যাকেজ ইনস্টলেশন..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "সোর্স প্যাকেজ গুলি পাওয়া যায়নি, থামানো হচ্ছে"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "প্রস্তুত করা হচ্ছে..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "`%s' প্যাকেজ ইনস্টল করা হচ্ছে (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "অনুগ্রহ করে \"%s\" নামের মাধ্যম [%s] নামের ডিভাইসে প্রবেশ করান"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "`%s' প্যাকেজ ডাউনলোড করা হচ্ছে..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"নিম্নোক্ত প্যাকেজগুলোতে ত্রুটিপূর্ণ স্বাক্ষর রয়েছে:\n"
-"%s\n"
-"\n"
-"আপনি কি ইনস্টলেশন প্রক্রিয়া চালিয়ে যেতে ইচ্ছুক ?"
+msgid "_Done"
+msgstr "_সম্পন্ন"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -265,41 +267,27 @@ msgstr ""
"%s\n"
"আপনি হয়তো আপনার urpmi ডাটাবেস আপডেট করতে চাইবেন"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "%s সরানো হচ্ছে"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "প্রস্তুত করা হচ্ছে..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "`%s' প্যাকেজ ইনস্টল করা হচ্ছে (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_সম্পন্ন"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "ইনস্টলেশন ব্যর্থ"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "সবকিছু আগে থেকেই ইনস্টল করা আছে"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "ইনস্টলেশন প্রক্রিয়া সম্পূর্ণ হয়েছে"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "%s সরানো হচ্ছে"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -334,7 +322,7 @@ msgstr " -g - নাম সহ গ্রুপ প্রিন্
msgid " defaults to %s.\n"
msgstr " %s ডিফল্ট।\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "শুধুমাত্র superuser-এর প্যাকেজ ইনস্টল করার ক্ষমতা আছে"
@@ -344,98 +332,98 @@ msgstr "শুধুমাত্র superuser-এর প্যাকেজ ই
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "rpmdb খুলতে অক্ষম"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "অবৈধ rpm ফাইল নাম [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "rpm ফাইল [%s] আনা হচ্ছে..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...আনা হয়ে গেছে"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...আনতে ব্যর্থ হয়েছি: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "rpm ফাইল [%s] ব্যবহার করা যাচ্ছে না"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "\"%s\"-এর পরিচয় [%s] ফাইলে দেয়া সম্ভব হয়নি"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "আরপিএম ফাইল রেজিস্টার করতে অক্ষম"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "স্থানীয় প্যাকেজসমূহ রেজিস্টার করতে সমস্যা হয়েছে"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "কমান্ড লাইনের ওপর বাজে প্রক্সি ঘোষণা\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: \"%s\" rpm ফাইল পড়া যাচ্ছেনা\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "\"%s\" মাধ্যমের জন্য hdlist synthesis ফাইল তৈরি করা হচ্ছে"
@@ -624,7 +612,12 @@ msgstr "প্যাকেজ %s পাওয়া যায়নি।"
msgid "malformed URL: [%s]"
msgstr "ত্রুটিপূর্ণ ইনপুট: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "rpm ফাইল আনা হচ্ছে \"%s\" মাধ্যম থেকে..."
@@ -634,44 +627,49 @@ msgstr "rpm ফাইল আনা হচ্ছে \"%s\" মাধ্যম থ
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
"%s-এ ইনস্টল করার জন্য লেনদেন প্রস্তুত করা হচ্ছে (সরাও=%d, ইনস্টল=%d, আপগ্রেড=%d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "লেনদেন তৈরিতে অক্ষম"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "%s প্যাকেজ সরানো গেলনা"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "%s যোগ করছি (id=%d, eid=%d, আপডেট=%d, ফাইল=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "%s প্যাকেজ ইনস্টল করা যায়নি"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "%s প্যকেজ সরানো হচ্ছে"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "%s প্যকেজ সরানো হচ্ছে"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "%s ইনস্টল করা হচ্ছে %s থেকে"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "%s প্যাকেজের আরও তথ্য"
@@ -701,11 +699,103 @@ msgstr "কোন নির্দেশ পাওয়া যায় নি"
msgid "Cannot connect to ldap uri:"
msgstr "colormap এন্ট্রি বরাদ্দ করতে ব্যর্থ"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "urpmi ডাটাবেস লক করা আছে"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "নোটিশ"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "urpmi ডাটাবেস লক করা আছে"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "নিম্নের প্যাকেজগুলিতে বাজে স্বাক্ষর রয়েছে"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "নিম্নের প্যাকেজগুলিতে বাজে স্বাক্ষর রয়েছে"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "আপনি কি ইনস্টলেশন চলিয়ে যেতে চাচ্ছেন ?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "ইনস্টলেশন ব্যর্থ"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "বিতরণ করা হচ্ছে %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "%s ইনস্টল করা হচ্ছে %s থেকে"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "%s ইনস্টল করা হচ্ছে"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "ডিপেন্ডেন্সিসমুহ পরীক্ষা না করে ইনস্টলেশনের চেষ্টা করবো? (y/N)"
+
+#: ../urpm/main_loop.pm:205
+#, fuzzy, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "আরও জোরালোভাবে ইনস্টলের চেষ্টার করবো (--force)? (y/N)"
+
+#: ../urpm/main_loop.pm:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d ইনস্টলেশনের লেনদেন ব্যর্থ হয়েছে"
+msgstr[1] "%d ইনস্টলেশনের লেনদেন ব্যর্থ হয়েছে"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "ইনস্টলেশন সম্ভব"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "সবকিছু আগে থেকেই ইনস্টল করা আছে"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "সবকিছু আগে থেকেই ইনস্টল করা আছে"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "সবকিছু আগে থেকেই ইনস্টল করা আছে"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "সবকিছু আগে থেকেই ইনস্টল করা আছে"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -756,7 +846,7 @@ msgstr "অনুপস্হিত মাধ্যম \"%s\" নির্বা
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "\"%s\" মাধ্যমের জন্য hdlist synthesis ফাইল তৈরি করা হচ্ছে"
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "\"%s\"-এর hdlist ফাইল ব্যবহার করা যায়নি, মাধ্যম অগ্রহ্য করা হয়েছে"
@@ -851,7 +941,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "খোঁজো শুরু: %s শেষ: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "ডিপেন্ডেন্সিসমূহ হিসাব করার জন্য দ্বিতীয় পাস সম্পাদন করা হচ্ছে\n"
@@ -917,67 +1007,72 @@ msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"প্রথম ইনস্টলেশন মাধ্যম ব্যবহার করা যাচ্ছে নাহ্ (কোন hdlists ফাইল পাওয়া যায়নি)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "অনুপস্হিত মাধ্যম \"%s\" নির্বাচন করার চেষ্টা করছি"
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "একাধিক মিডিয়া নির্বাচন করা হচ্ছে: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "\"%s\" মাধ্যম সরানো হচ্ছে"
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "\"%s\" মাধ্যমকে urpmi এর জন্য পুনরায় কনফিগার করা হচ্ছে"
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...পুনরায় কনফিগারেশন করতে ব্যর্থ"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "পুনরায় কনফিগারেশন সমপন্ন"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "মাধ্যম \"%s\" নির্বাচিত হয়নি"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "hdlist ফাইল [%s] পরীক্ষা করা হচ্ছে"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "synthesis ফাইল [%s] পরীক্ষা করা হচ্ছে"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "hdlist প্রস্তুত করা হচ্ছে [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -986,77 +1081,77 @@ msgstr ""
"\"%s\" মাধ্যমের জন্য সিনথিসিস ফাইল তৈরী করা যাচ্ছে না। আপনার hdlist ফাইলটি মনে "
"হয় ত্রুটিপূর্ণ।"
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "মাধ্যম \"%s\"-এর hdlist বা synthesis ফাইল পড়তে সমস্যা হচ্ছে"
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "\"%s\"-এর তালিকা ফাইল লিখছি..."
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...কপি করতে ব্যর্থ"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "\"%s\"-এর বিবরণ ফাইল কপি করা হচ্ছে..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...কপি করা সম্পন্ন"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "[%s]-এর কপি ব্যর্থ হয়েছে (ফাইলটি অস্বাভাবিক ছোট)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "কপিকৃত সোর্স hdlist (অথবা synthesis)-এর md5sum হিসেব করা হচ্ছে"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "[%s]-এর কপি ব্যর্থ হয়েছে (md5sum মেলেনি)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "উদ্ধারকৃত সোর্স hdlist (অথবা synthesis)-এর md5sum হিসেব করা হচ্ছে"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...আনতে ব্যর্থ হয়েছি: md5sum মিলেনি"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "[%s] থেকে কোন rpm ফাইল পাওয়া যায়নি"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "[%s] থেকে আর-পি-এম ফাইল পড়া হচ্ছে"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "rpm ফাইল পড়া যাচ্ছেনা [%s] থেকে: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "কোন আরপিএম পড়ছে না"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1066,74 +1161,74 @@ msgstr ""
"\"%s\" মাধ্যম ব্যবহার করা যায়নি,\n"
"মাধ্যম তৈরীর সময় আপনি নিজ হাতে ডিরেক্টরী তৈরী করার কারনে এরকম হতে পারে।"
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "\"%s\" মাধ্যমের জন্য কোন hdlist ফাইল পাওয়া যায়নি"
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "\"%s\"-এর hdlist (বা synthesis) সোর্স আনা হচ্ছে..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "আরম্ভ করা hdlist (বা synthesis) %s রূপে পাওয়া গিয়েছে"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "\"%s\" মাধ্যমের জন্য কোন hdlist ফাইল পাওয়া যায়নি"
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "\"%s\"-এর pubkey পরীক্ষা করছি..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...\"%s\"-এর pubkey থেকে %s কী ইমপোর্ট করা হয়েছে"
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "\"%s\"-এর pubkey ইমপোর্ট করা যায়নি"
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "\"%s\"-এর তালিকা ফাইল লিখছি..."
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "মাধ্যম %s যোগ করা হয়েছে"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "\"%s\" এর hdlist ফাইল পার্স করা যায়নি"
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "\"%s\" মাধ্যমের synthesis ফাইল পড়তে সমস্যা হয়েছে"
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "\"%s\" মাধ্যম থেকে হেডার পড়া হচ্ছে"
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nnন"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "Yyহ"
@@ -1194,47 +1289,52 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "\"%s\" মাধ্যম ব্যবহার করা যায়নি"
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "%s নামের কোন প্যাকেজ নেই"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "এই প্যাকেজগুলিতে রয়েছে %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "%s অনুপস্থিতির কারনে"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "সবকিছু আগে থেকেই ইনস্টল করা আছে"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "%s অসন্তুষ্টির কারনে"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "%s প্রোমট করার চেষ্টা করছি"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "%s রাখার জন্য"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "%s ইনস্টলের জন্য"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "%s-এর সাথে সংঘাতের কারনে"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "অ-অনুরোধকৃত"
@@ -1254,6 +1354,16 @@ msgstr "অবৈধ কী পরিচয় (%s)"
msgid "Missing signature (%s)"
msgstr "(%s) স্বাক্ষর পাওয়া যাচ্ছে না"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "ফাইল [%s]-এ লেখা সম্ভব হয়নি"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "কপি করতে ব্যর্থ"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1270,8 +1380,8 @@ msgstr ""
"\n"
"ব্যবহার:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - এই সাহায্যকারী বার্তাটি ছাপাও।\n"
@@ -1286,18 +1396,18 @@ msgstr " --auto - পছন্দসমূহ থেকে সয়ংক
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - সরানোটি সঠিকভাবে সম্পন্ন করা যাবে কি-না যাচাই করো।\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr " --force - প্যাকেজ না থাকলেও জোড় করে আমন্ত্রন করো।\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - এলিয়াসের মেশিনসমূহের মধ্যে বিতরণকৃত urpmi\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - packager: packager ট্যাগ ছাপাও।\n"
@@ -1307,8 +1417,8 @@ msgstr " --packager - packager: packager ট্যাগ ছাপাও।
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - rpm সরানোর জন্য আরেকটি root ব্যবহার করো।\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - rpm ইনস্টলেশনের জন্য অন্য রুট ব্যবহার করো।\n"
@@ -1327,17 +1437,17 @@ msgstr ""
" --use-distrib - distrib ট্রি থেকে চলন্ত অবস্থায় urpmi কনফিগার করো, --root\n"
" অপশনের সাথে croot (আন)ইনস্টলে কার্যকর।\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - একটি synthesis ফাইল খুঁজে ব্যবহারের চেষ্টা করো।\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - একটি hdlist ফাইল খুঁজে ব্যবহারের চেষ্টা করো।\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - verbose মোড।\n"
@@ -1347,37 +1457,37 @@ msgstr " --verbose, -v - verbose মোড।\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - expression মিলিয়ে সমস্ত প্যাকেজ নির্বাচন করো।\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "শুধুমাত্র superuser-এর প্যাকেজ সরাবার অনুমতি আছে"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "অজানা প্যাকেজসমুহ"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "অজানা প্যাকেজ"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "%s প্যাকেজ সরালে আপনার সিস্টেমের সমস্যা হবে"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "সরানোর মতো কিছুই নেই"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "নিম্নলিখিত প্যাকেজসমূহ সরানোর জন্য পরীক্ষা করা হচ্ছে"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1385,24 +1495,24 @@ msgid_plural ""
msgstr[0] "ডিপেন্ডেন্সি সন্তুষ্ট করতে, নিম্নলিখিত %d প্যাকেজগুলো সরানো হবে (%d এমবি)"
msgstr[1] "ডিপেন্ডেন্সি সন্তুষ্ট করতে, নিম্নলিখিত %d প্যাকেজগুলো সরানো হবে (%d এমবি)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr " (%d এমবি)"
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "%s প্যকেজ সরানো হচ্ছে"
msgstr[1] "%s প্যকেজ সরানো হচ্ছে"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr "(y/N) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "সরাতে ব্যর্থ"
@@ -1428,13 +1538,13 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --help - এই সাহায্যকারী বার্তাটি ছাপাও।\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - সুনির্দিষ্ট পরিবেশ ব্যবহার করো (বিশেষত একটি ত্রুটি রিপোর্ট।)\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr " --excludemedia - প্রদত্ত মাধ্যম ব্যবহার করবেনা, কমা দিয়ে ভাগ করা।\n"
@@ -1445,12 +1555,12 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - শুধুমাত্র প্রদত্ত মাধ্যম ব্যবহার করো, কমা দিয়ে ভাগ করা।\n"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1461,7 +1571,7 @@ msgstr " --sortmedia - কমা দ্বারা বিচ্ছিন্
msgid " --use-distrib - use the given path to access media\n"
msgstr " --synthesis - urpmi db'র পরিবর্তে প্রদত্ত synthesis ব্যবহার করো।\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - urpmi db'র পরিবর্তে প্রদত্ত synthesis ব্যবহার করো।\n"
@@ -1471,7 +1581,7 @@ msgstr " --synthesis - urpmi db'র পরিবর্তে প্রদত
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - identical লাইনসমূহহ ছাপাবে না।\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - শুধু আপডেট মিডিয়া ব্যবহার করো।\n"
@@ -1605,75 +1715,85 @@ msgstr " --group - group: group ট্যাগ ছাপাও।\n"
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr " --name - শুধুমাত্র প্যাকেজ নাম সমুহ ছাপাও।\n"
#: ../urpmf:73
#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr " --name - শুধুমাত্র প্যাকেজ নাম সমুহ ছাপাও।\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - all obsoletes: obsoletes ট্যাগ ছাপাও।\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr " --packager - packager: packager ট্যাগ ছাপাও।\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, fuzzy, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - all provides: provides ট্যাগ ছাপাও।\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, fuzzy, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - all requires: requires ট্যাগ ছাপাও।\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --size - size: size ট্যাগ ছাপাও।\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, fuzzy, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - source rpm: sourcerpm ট্যাগ ছাপাও।\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - all obsoletes: obsoletes ট্যাগ ছাপাও।\n"
+
+#: ../urpmf:81
#, fuzzy, c-format
msgid " --summary - summary\n"
msgstr " --epoch - summary: summary ট্যাগ ছাপাও।\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr " --url - url: url ট্যাগ ছাপাও।\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr " --verbose - verbose মোড।\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -l - প্যাকেজে ফাইলের তালিকা\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - ভার্সন, প্রকাশ এবং আর্ক এর সঙ্গে নাম ছাপাও।\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "%s-এর ওপর সুনির্দিষ্ট পরিবেশ ব্যবহার করো\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1682,12 +1802,12 @@ msgstr ""
"নোট: যেহেতু কোনো মাধ্যম hdlists ব্যবহার করে সন্ধান করে নি, urpmf কোনো ফলাফল দিতে "
"পারে নি\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "প্যাকেজ নাম সমুহ খোঁজার জন্য আপনি --name ব্যবহার করতে পারেন।\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1703,7 +1823,7 @@ msgstr ""
"\n"
"ব্যবহার:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1711,37 +1831,37 @@ msgstr ""
" --searchmedia - অনুরোধকৃত (অথবা আপডেটকৃত) প্যাকেজসমুহ খোঁজার জন্য শুধুমাত্র প্রদত্ত "
"মাধ্যম ব্যবহার করো।\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr ""
" --auto-select - সিস্টেমটি আপগ্রেড করার জন্য সয়ংক্রিয়ভাবে প্যাকেজ নির্বাচন করো।\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
" --auto-select - সিস্টেমটি আপগ্রেড করার জন্য সয়ংক্রিয়ভাবে প্যাকেজ নির্বাচন করো।\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, fuzzy, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - MD5SUM ফাইল পরীক্ষা নিষ্ক্রিয় করো।\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, fuzzy, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - gpg কী আপডেটের জন্য জোর দাও।\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1750,13 +1870,13 @@ msgstr ""
" --no-uninstall - প্যাকেজ আন-ইনস্টলেশন করতে কখনো জিজ্ঞাসা করো না, ইনস্টলেশন "
"বাতিল করো।\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, fuzzy, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr ""
" --install-src - শুধুমাত্র সোর্স প্যাকেজ সমুহ ইনস্টল করো (বাইনারি সমুহ নয়)।\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1765,7 +1885,7 @@ msgstr ""
" --keep - বিদ্যমান প্যাকেজসুমহকে সম্ভব হলে রাখো, আবেদনকৃত প্যাকেজসমুহ\n"
" যেগুলো সরানো হবে তা নাকচ করো ।\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1776,38 +1896,44 @@ msgstr ""
" লেনদেন ছোট খন্ড করে নাও,\n"
" স্বাভাবিক হলো %d\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - ছোট লেনদেনের দৈর্ঘ্য, স্বাভাবিক হচ্ছে %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, fuzzy, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy - fuzzy খোঁজ চালাও (অনুরূপ -y)।\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, fuzzy, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src - পরবর্তি প্যাকেজটি একটি সোর্স প্যাকেজ (অনুরূপ --s)।\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
" --install-src - শুধুমাত্র সোর্স প্যাকেজ সমুহ ইনস্টল করো (বাইনারি সমুহ নয়)।\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - কিছু করার পুর্বে ক্যাশ থেকে আর-পি-এম পরিষ্কার করো।\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, fuzzy, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - ক্যাশ এ ব্যবহৃত নয় এমন আর-পি-এম রাখো।\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1816,7 +1942,7 @@ msgstr ""
" --allow-nodeps - ডিপেন্ডন্সি পরীক্ষা ছাড়া প্যাকেজ ইনস্টল করতে\n"
" ব্যবহারকারী কে জিজ্ঞাসার জন্য অনুমতি দাও।\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1825,12 +1951,12 @@ msgstr ""
" --allow-force - ডিপেন্ডন্সি এবং অখন্ডতা পরীক্ষা ছাড়া প্যাকেজ ইনস্টল করতে\n"
" ব্যবহারকারী কে জিজ্ঞাসার জন্য অনুমতি দাও।\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - rpm ইনস্টলেশনের জন্য অন্য রুট ব্যবহার করো।\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1839,47 +1965,47 @@ msgstr ""
" --use-distrib - distrib ট্রি থেকে চলন্ত অবস্থায় urpmi কনফিগার করো, --root\n"
" অপশনের সাথে chroot ইনস্টলে কার্যকর।\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - দুরবর্তী ফাইল আনার জন্য wget ব্যবহার করো।\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - দুরবর্তী ফাইল আনার জন্য curl ব্যবহার করো।\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, fuzzy, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --curl - দুরবর্তী ফাইল আনার জন্য curl ব্যবহার করো।\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - ডাউনলোড গতির সীমা নির্ধারণ।\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1888,7 +2014,7 @@ msgstr ""
" --resume - আংশিক-ডাউনলোডকৃত ফাইলসমুহ পুনরায় আরম্ভ করো\n"
" (--no-resume অকার্যকর করবে, স্বাভাবিকভাবে কার্যকর).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1897,7 +2023,7 @@ msgstr ""
" --proxy - উল্লেখিত HTTP প্রক্সি ব্যবহার করো, ডিফল্ট ভাবে পোর্ট নম্বরটি\n"
" ১০৮০ ধরা যায় (ফর্ম্যাট হচ্ছে <proxyhost[:port]>)।\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1906,7 +2032,7 @@ msgstr ""
" --proxy-user - প্রক্সির সত্যতা যাচাই এর জন্য ব্যবহারকারী এবং পাসওয়ার্ড\n"
" উল্লেখ করো (ফর্ম্যাট হচ্ছে <user:password>)।\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1915,7 +2041,7 @@ msgstr ""
" --bug - পরের আরগুমেন্টে উল্লেখিত ডিরেক্টরিতে একটি বাগ রিপোর্ট\n"
" তৈরী করো।\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, fuzzy, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1924,46 +2050,51 @@ msgstr ""
" --verify-rpm - ইনস্টলের আগে rpm স্বাক্ষর যাচাই করো\n"
" (--no-verify-rpm অকার্যকর করবে, স্বাভাবিকভাবে কার্যকর).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, fuzzy, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr " --test - ইনস্টলেশনটি সঠিকভাবে হবে কি-না যাচাই করো।\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - কমা দিয়ে ভাগকরা পাথ বাদ দাও।\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - ডকুমেন্ট ফাইল বাদে।\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, fuzzy, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --no-uninstall - প্যাকেজ আন-ইনস্টলেশন করতে কখনো জিজ্ঞাসা করো না, ইনস্টলেশন "
"বাতিল করো।\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --url - url: url ট্যাগ ছাপাও।\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --epoch - description: description ট্যাগ ছাপাও।\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - যেসব প্যাকেজসমুহ ইনস্টলেশনের বাদ দেয়া উচিত\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - যেসব প্যাকেজসমুহ ইনস্টলেশনের বাদ দেয়া উচিত\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1972,59 +2103,59 @@ msgstr ""
" --more-choices - যখন কয়েকটি প্যাকেজ পাওয়া যাবে, ডিফল্টের\n"
" অধিক প্রস্তাব করবে\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - ক্যাশ এ ব্যবহৃত নয় এমন আর-পি-এম রাখো।\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - শুধুমাত্র একই আরকিটেক্চারের প্যাকেজসমুহকে আপগ্রেড করো।\n"
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - কমান্ড লাইনের সমস্ত মিল নির্বাচন করো।\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - প্যাকেজ খোঁজ করতে অনুমতি দাও।\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - প্যাকেজ খোঁজার জন্য প্রদত্তের মধ্যে খোঁজ করবে না।\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - নির্বিকার ভাবে।\n"
-#: ../urpmi:157
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " ইনস্টলের জন্য কমান্ডলাইনে প্রদত্ত নাম অথবা আরপিএম।\n"
-#: ../urpmi:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "--install-src ব্যবহারের সময় বায়নারি rpm ফাইলগুলির সাথে কি করা যেতে পারে"
-#: ../urpmi:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2033,7 +2164,7 @@ msgstr ""
"ডিরেক্টরি [%s] আগে থেকেই উপস্থিত, ত্রুটি রিপোর্টের জন্য অনুগ্রহ করে অন্য ডিরেক্টরি "
"ব্যবহার করুন বা এটা মুছে ফেলুন"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "ত্রুটি রিপোর্টের জন্য [%s] ডিরেক্টরি তৈরি করতে অক্ষম"
@@ -2043,7 +2174,7 @@ msgstr "ত্রুটি রিপোর্টের জন্য [%s] ডি
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2052,46 +2183,48 @@ msgstr ""
"সমস্যা: %s শুধুমাত্র পড়ার জন্য মাউন্ট করা মনে হচ্ছে।\n"
"বলপুর্বক কাজের জন্য --allow-force ব্যবহার করুন।"
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (আপগ্রেডের জন্য)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (আপগ্রেডের জন্য)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (ইনস্টলের জন্য)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (ইনস্টলের জন্য)"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "ডিপেন্ডেন্সি সন্তুষ্ট করতে, নিম্নলিখিত %d প্যাকেজগুলো সরানো হবে (%d এমবি)"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "আপনার পছন্দ কি? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2102,7 +2235,7 @@ msgstr ""
"সংস্করণের উপর নির্ভরশীল যার নতুন সংস্করণ ইনস্টল করা আছে:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2113,19 +2246,19 @@ msgstr ""
"সংস্করণের উপর নির্ভরশীল যার নতুন সংস্করণ ইনস্টল করা আছে:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "অগ্রসর হবে?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr "(Y/n)"
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2134,7 +2267,7 @@ msgstr ""
"আবেদনকৃত কিছু প্যাকেজ ইনস্টল করা যায়নি:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2143,7 +2276,7 @@ msgstr ""
"আবেদনকৃত কিছু প্যাকেজ ইনস্টল করা যায়নি:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2154,7 +2287,7 @@ msgstr ""
"আপগ্রেড করার জন্য:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2165,7 +2298,7 @@ msgstr ""
"আপগ্রেড করার জন্য:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2174,7 +2307,7 @@ msgstr ""
"নিম্নলিখিত প্যাকেজগুলি অবশ্যই সরাতে হবে অন্যগুলি আপগ্রেড করার জন্য:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2183,12 +2316,17 @@ msgstr ""
"নিম্নলিখিত প্যাকেজগুলি অবশ্যই সরাতে হবে অন্যগুলি আপগ্রেড করার জন্য:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2197,111 +2335,29 @@ msgstr ""
"নিম্নলিখিত ডিপেন্ডেন্সিসমূহ ইনস্টল করার জন্য আপনাকে রুট হতে হবে:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, 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:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "প্রস্তুত হলে Enter চাপুন..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "বাতিল"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "নিম্নের প্যাকেজগুলিতে বাজে স্বাক্ষর রয়েছে"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "নিম্নের প্যাকেজগুলিতে বাজে স্বাক্ষর রয়েছে"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "আপনি কি ইনস্টলেশন চলিয়ে যেতে চাচ্ছেন ?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "ইনস্টলেশন ব্যর্থ"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "বিতরণ করা হচ্ছে %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "%s ইনস্টল করা হচ্ছে %s থেকে"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "%s ইনস্টল করা হচ্ছে"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "ডিপেন্ডেন্সিসমুহ পরীক্ষা না করে ইনস্টলেশনের চেষ্টা করবো? (y/N)"
-
-#: ../urpmi:776
-#, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "আরও জোরালোভাবে ইনস্টলের চেষ্টার করবো (--force)? (y/N)"
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d ইনস্টলেশনের লেনদেন ব্যর্থ হয়েছে"
-msgstr[1] "%d ইনস্টলেশনের লেনদেন ব্যর্থ হয়েছে"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "ইনস্টলেশন সম্ভব"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "সবকিছু আগে থেকেই ইনস্টল করা আছে"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "সবকিছু আগে থেকেই ইনস্টল করা আছে"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "সবকিছু আগে থেকেই ইনস্টল করা আছে"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "সবকিছু আগে থেকেই ইনস্টল করা আছে"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "urpmi আবার শুরু করা হচ্ছে"
@@ -2430,49 +2486,49 @@ msgstr " -v - verbose মোড।\n"
msgid "unable to update medium \"%s\"\n"
msgstr "\"%s\" মাধ্যম আপডেট করা যায়নি\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "মাধ্যম যোগ করার অনুমতি শুধুমাত্র superuser এর আছে"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "কনফিগ ফাইল [%s] তৈরী করবে"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "কনফিগ ফাইল [%s] তৈরী করা যাচ্ছ না"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "--distrib এর সাথে <relative path of hdlist> দেয়ার প্রয়োজন নেই"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<relative path of hdlist> পাওয়া যাচ্ছে না\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "\"%s\" মাধ্যম তৈরী করা যায়নি\n"
@@ -2632,17 +2688,17 @@ msgstr " -a - সমস্থ মাধ্যম নির্বা
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - fuzzy match on media names.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "শুধুমাত্র superuser-এর মাধ্যম সরাবার ক্ষমতা আছে"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "সরানোর জন্য কিছু নেই (মাধ্যম যোগ করার জন্য ব্যবহার করো)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2698,17 +2754,17 @@ msgstr " -a - স্থানান্তরযোগ্য অয
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - hdlist ফাইলসমূহ তৈরী করার জন্য জোর দাও।\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "শুধুমাত্র superuser-ই মাধ্যম আপডেট করতে পারবে"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "আপডেট করার কিছুই নাই (মাধ্যম যোগ করতে urpmi.addmedia ব্যবহার করো)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2717,22 +2773,22 @@ msgstr ""
"আপডেটের এন্ট্রি পাওয়া যাচ্ছে না\n"
"(%s-এর একটা)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "\"%s\" মাধ্যমটি অগ্রাহ্য করা হচ্ছে"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "\"%s\" মাধ্যমটি সক্রিয় করা হচ্ছে"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2748,7 +2804,7 @@ msgstr ""
"\n"
"ব্যবহারবিধি:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2757,61 +2813,61 @@ msgstr ""
" --searchmedia - অনুরোধকৃত (অথবা আপডেটকৃত) প্যাকেজসমুহ খোঁজার জন্য শুধুমাত্র প্রদত্ত "
"মাধ্যম ব্যবহার করো।\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - fuzzy খোঁজ চালাও (অনুরূপ -y)।\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - উপস্থিত প্যাকেজসমূহের তালিকাবদ্ধ করো।\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - উপস্থিত মাধ্যমের তালিকাবদ্ধ করো।\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - উপস্থিত মাধ্যম এবং তাঁদের url তালিকাবদ্ধ করো।\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
" --list-nodes - ব্যবহারের সময় উপস্থিত নোডগুলির তালিকা বরাদ্দ করো --parallel.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - সমান্তরাল alias সমূহের তালিকা দাও।\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr " --dump-config - urpmi.addmedia-এর মত কনফিগ ডাম্প করো।\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr " --src - পরবর্তি প্যাকেজটি একটি সোর্স প্যাকেজ (অনুরূপ --s)।\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr ""
" --sources - ডাউনলোড করার আগ সমস্থ সোর্স প্যাকেজের দাও (শুধুমাত্র রুটে)।\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --url - url: url ট্যাগ ছাপাও।\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2820,76 +2876,76 @@ msgstr ""
" --use-distrib - একটি distrib ট্রি থেকে চলন্ত অবস্থায় urpmi কনফিগার করো।\n"
" এটা distro নিরীক্ষনের অনুমতি দেবে।\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - প্রিন্টের changelog.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --epoch - summary: summary ট্যাগ ছাপাও।\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - প্যাকেজের কি প্রয়োজন তার জন্য উল্টা খোঁজ করো।\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, fuzzy, c-format
msgid ""
" --whatrequires-recursive\n"
" - extended reverse search (includes virtual packages).\n"
msgstr " -R - প্যাকেজের কি প্রয়োজন তার জন্য উল্টা খোঁজ করো।\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -p - পরিবেশকদের মধ্যে প্যাকেজের খোঁজ করো।\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - অপসারিত প্যাকেজের সম্পূর্ন ফলাফল।\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - প্যাকেজ নির্ভরতার প্রতি নিরীক্ষা প্রসারিত করো।\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - নাম সহ গ্রুপ প্রিন্ট করো।\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - মানুষের পড়ারমত প্রয়োজনীয় তথ্য প্রিন্ট করো।\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - প্যাকেজে ফাইলের তালিকা\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - নির্বিকার ভাবে।\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - নাম সহ ভার্সন এবং রিলিজ প্রিন্ট করো।\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - পরবর্তি প্যাকেজটি একটি সোর্স প্যাকেজ (অনুরূপ --src)।\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2897,45 +2953,45 @@ msgid ""
msgstr ""
" -u - যদি সাম্প্রতিক সংস্ককরন উপস্থিত থাকে তাহলে প্যাকেজ অপসরন করো।\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - fuzzy খোঁজ চালাও (অনুরূপ --fuzzy)।\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - -y এর মতই, কিন্তু case-insensitively মিলাতে বাধ্য করবে।\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " কমান্ডলাইনে প্রদত্ত নাম বা rmp ফাইলসমূহ নিরীক্ষণ করা হয়েছে।\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes শুধুমাত্র --parallel এর সাথে ব্যবহৃত হতে পারে"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"নোট: যেহেতু কোনো মাধ্যম hdlists ব্যবহার করে সন্ধান করে নি, urpmf কোনো ফলাফল দিতে "
"পারে নি\n"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2943,11 +2999,22 @@ msgstr ""
"নোট: যেহেতু কোনো মাধ্যম hdlists ব্যবহার করে সন্ধান করে নি, urpmf কোনো ফলাফল দিতে "
"পারে নি\n"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "changelog পাওয়া যায়নি\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "নিম্নোক্ত প্যাকেজগুলোতে ত্রুটিপূর্ণ স্বাক্ষর রয়েছে:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "আপনি কি ইনস্টলেশন প্রক্রিয়া চালিয়ে যেতে ইচ্ছুক ?"
+
#, fuzzy
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "ডিরেক্টরি শেয়ার করতে হলে আপনাকে অনুমোদিত ব্যবহারকারী হতে হবে"
@@ -3258,9 +3325,6 @@ msgstr "changelog পাওয়া যায়নি\n"
#~ " --keep - বিদ্যমান প্যাকেজসুমহকে সম্ভব হলে রাখো, আবেদনকৃত প্যাকেজসমুহ\n"
#~ " যেগুলো সরানো হবে তা নাকচ করো ।\n"
-#~ msgid "unable to write file [%s]"
-#~ msgstr "ফাইল [%s]-এ লেখা সম্ভব হয়নি"
-
#~ msgid ""
#~ " --distrib-XXX - automatically create a medium for XXX part of a\n"
#~ " distribution, XXX may be main, contrib, updates or\n"
diff --git a/po/br.po b/po/br.po
index 48faf0b9..8dc5710e 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2007-08-02 22:46+0200\n"
"Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n"
"Language-Team: Breton <LL@li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1;plural=0\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "Staliadur ar RPM"
@@ -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:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Ya"
@@ -83,7 +83,7 @@ msgstr "_Staliañ"
msgid "_Save"
msgstr "_Enrollañ"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Nullañ"
@@ -103,17 +103,17 @@ msgstr "Dianav eo an dibarzh %s"
msgid "No packages specified"
msgstr "N'eus pakad dibabet ebet"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Gortozit mar plij ..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "Red eo da bezañ root"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -124,42 +124,42 @@ msgstr ""
"%s\n"
"Kenderc'hel ar staliadur evelato ?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Diwallit"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Ya"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (da vremanaat)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (da staliañ)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "Choazh ar pakad"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Unan eus ar pakadoù a-heul a zo war-nes bezañ staliet :"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Dilaoskel"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -171,58 +171,61 @@ msgstr ""
"%s\n"
"Kenderc'hel evelato ?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, 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:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, 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ù :"
+msgstr ""
+"Ar pakadoù a-heul a zo war-nes bezañ staliet evit dalc'hen an ezhommoù :"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d pakad, %d Mo)"
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "O staliañ ar pakad ..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "n'hellan ket tigas ar pakadoù tarzh, emaon o terriñ"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "O prientiñ ..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "O staliañ ar pakad `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Enlakait ar medium a vez graet « %s » anezhañ war trobarzhell [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "O tigas ar pakad « %s » ..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Sinadur fall a zo gant ar pakadoù-mañ :\n"
-"%s\n"
-"\n"
-"Ha fellout a ra deoc'h da genderc'hel ar staliadur ?"
+msgid "_Done"
+msgstr "_Graet"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -230,41 +233,27 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "lemel %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "O prientiñ ..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "O staliañ ar pakad `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Graet"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, c-format
msgid "Installation failed:"
msgstr "Sac'het eo an staliadur :"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Staliet eo ar pakad(où) c'hoazh"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Echu eo ar staliadur"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "lemel %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -297,7 +286,7 @@ msgstr ""
msgid " defaults to %s.\n"
msgstr ""
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Nemet ez-euz moien da staliañ pakadoù gant ar gourarveriad"
@@ -307,98 +296,98 @@ msgstr "Nemet ez-euz moien da staliañ pakadoù gant ar gourarveriad"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "fazi en ur zigeriñ rpmdb"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "n'eo ket mat an ar restr rpm [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "o tigas ar restr rpm [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "... echu eo ar resev"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "... sac'het eo ar resev : %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "n'eo ket possubl da voned ar restr rpm [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "n'hellan ket bet lennet ar restr spec %s [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "n'hell ket bet enskrivet ar restr rpm"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "fazi en ur enskrivañ ar pakadoù lec'hel"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr ""
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr "n'eo ket endeo renkell ar chroot"
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq : n'hellan ket lenn ar restr rpm « %s »\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
+#, c-format
+msgid "chroot directory doesn't exist"
+msgstr "n'eo ket endeo renkell ar chroot"
+
+#: ../urpm/args.pm:424
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "savet eo bet ar restr synthesis hdlist evit ar vedium « %s »"
@@ -585,7 +574,12 @@ msgstr "ar pakad %s n'eo ket bet kavet."
msgid "malformed URL: [%s]"
msgstr "URL siek : [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "o tigas ar restroù rpm eus ar medium « %s » ..."
@@ -595,43 +589,48 @@ msgstr "o tigas ar restroù rpm eus ar medium « %s » ..."
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "n'hell ket bet krouet ur gra"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, 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:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "oc'h ouzhpennañ ar pakad %s (id=%d, eid=%d, update=%d, restr=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "n'hellan ket staliañ ar pakad %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "lemel pakad %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "lemel pakad %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "o lemel pakadoù staliet (%s) eus %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Titouroù muioc'h diwwar-benn ar pakad %s"
@@ -661,11 +660,102 @@ msgstr "N'eus pakad dibabet ebet"
msgid "Cannot connect to ldap uri:"
msgstr ""
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "krouilhet eo ar stlennvon %s"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Diwallit"
+
+#: ../urpm/lock.pm:65
#, c-format
msgid "%s database locked"
msgstr "krouilhet eo ar stlennvon %s"
+#: ../urpm/main_loop.pm:99
+#, c-format
+msgid "The following package has bad signature"
+msgstr "Bez eus sinadur fall gant ar pakadoù a-heul"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Bez eus sinadur fall gant ar pakadoù a-heul"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Fellout a ra deoc'h kenderc'hel staliañ ?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Sac'het eo an staliadur"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "o skignañ %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "o staliañ %s eus %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "o staliañ %s"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr ""
+
+#: ../urpm/main_loop.pm:205
+#, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr ""
+
+#: ../urpm/main_loop.pm:247
+#, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d gourc'hemenn staliañ zo bet sac'het"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Possubl eo an staliadur"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr "Bremañaet eo ar pakadoù"
+
+#: ../urpm/main_loop.pm:271
+#, c-format
+msgid "Package %s is already installed"
+msgstr "Staliet eo ar pakad %s c'hoazh"
+
+#: ../urpm/main_loop.pm:272
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Staliet eo ar pakadoù %s c'hoazh"
+
+#: ../urpm/main_loop.pm:275
+#, c-format
+msgid "Package %s can not be installed"
+msgstr "N'hell ket bet staliet ar pakad %s"
+
+#: ../urpm/main_loop.pm:276
+#, c-format
+msgid "Packages %s can not be installed"
+msgstr "N'hell ket bet staliet ar pakadoù %s"
+
#: ../urpm/md5sum.pm:23
#, c-format
msgid "examining %s file"
@@ -713,7 +803,7 @@ msgstr ""
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "savet eo bet ar restr synthesis hdlist evit ar vedium « %s »"
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, fuzzy, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "n'hellan ket kavout ar restr hdlist evit « %s », medium dibvrud"
@@ -800,7 +890,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr ""
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr ""
@@ -865,67 +955,72 @@ msgstr "n'hell ket bet lennet ar restr media.cfg"
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, fuzzy, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "o skrivañ restr ar roll evit ar medium « %s »"
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "o tibab meur a media : %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "o lemel ar medium « %s »"
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "oc'h adkefluniañ urpmi evit ar media « %s »"
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "... sac'het eo an adkefluniadur"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "graet eo an adkefluniadur"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, fuzzy, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Fazi en ur sevel anvioù restr : n'hell ket bet skrivet ar restr (%s)"
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr "Fazi en ur sevel anvioù restr : n'hell ket bet skrivet ar restr (%s)"
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "n'eo ket dibabet ar medium « %s »"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "o lenn ar restr hdlist [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "o lenn ar restr synthesis [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "o sevel an hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -934,77 +1029,77 @@ msgstr ""
"N'hell ket bet savet ar restr synthesis hdlist evit ar vedium « %s ». "
"Marteze eo sac'het ho restr hdlist."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, fuzzy, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "fazi en ur lenn restr synthesis ar vedium « %s »"
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "oc'h eilañ [%s] evit ar medium « %s » ..."
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "... sac'het eo ar staliadur "
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "oc'h eilañ restr deskrivadur eus « %s » ..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "... graet eo an eil"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, 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:1277
+#: ../urpm/media.pm:1284
#, fuzzy, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "oc'h eilañ hdlist (pe an synthesis) tizh « %s » ..."
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "sac'het eo eil [%s] (ne glot ket ar md5sum)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, fuzzy, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "sac'het eo resev an hdlist (pe synthesis) tizh"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "... sac'het eo ar resev : ne glot ket ar md5sum"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "n'eus restr rpm kavet eus [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "o lenn ar restroù rpm eus [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "n'hellan ket lenn ar restroù rpm eus [%s] : %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "n'eus ket rpm lennet ebet"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1012,74 +1107,74 @@ msgid ""
"medium."
msgstr ""
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "siek eo restr hdlist %s evit ar vedium « %s »"
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "o resev an hdlist (pe synthesis) tizh evit « %s » ..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, fuzzy, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "oc'h eilañ hdlist (pe an synthesis) tizh « %s » ..."
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "n'eus restr hdlist kavet ebet evit ar medium « %s »"
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "o lenn restr pubkey « %s » ..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, 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:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "n'hell ket bet enporzhet restr pubkey « %s »"
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "o skrivañ restr ar roll evit ar medium « %s »"
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "ouzhpennet eo ar medium %s"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "n'hell ket bet lennet restr hdlist « %s »"
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "fazi en ur lenn restr synthesis ar vedium « %s »"
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "o lenn reollinoù eus ar medium « %s »"
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "YyOo"
@@ -1139,47 +1234,52 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "n'eo ket possubl da voned ar vedia « %s »"
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "N'eus pakad ebet ket a vez graet %s anezhañ"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "%s zo er pakadoù a-heul : %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "peogwir %s zo manket"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Staliet eo ar pakad %s c'hoazh"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "peogwir %s zo manket"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, fuzzy, c-format
msgid "trying to promote %s"
msgstr "N'eus pakad da zilemel ebet"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "evit mirout %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "evit staliañ %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "peogwir %s zo manket"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "n'eo ket goulennet"
@@ -1199,6 +1299,16 @@ msgstr "N'eo ket mat ID an alc'hwezh (%s)"
msgid "Missing signature (%s)"
msgstr "Mankout a ra ar sinadur (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "n'hellan ket skrivañ ar restr [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Fazi en ur eilañ"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1216,8 +1326,8 @@ msgstr ""
"\n"
"arveriadur :\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr ""
@@ -1232,18 +1342,18 @@ msgstr ""
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr ""
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr ""
@@ -1253,8 +1363,8 @@ msgstr ""
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - implij ur gwrizienn all evit lemel pakadoù.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - implij ur gwrizienn all evit lemel pakadoù.\n"
@@ -1271,17 +1381,17 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr ""
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr ""
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr ""
@@ -1291,60 +1401,61 @@ msgstr ""
msgid " -a - select all packages matching expression.\n"
msgstr ""
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Ar gourarveriad hepken a c'hell lemel pakadoù"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "dianav eo ar pakadoù"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "pakad anavez"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "sac'het e vo ho reizhiad ma eo lemelet ar pakad %s"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "N'eus pakad da zilemel ebet"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr ""
-#: ../urpme:134
+#: ../urpme:131
#, 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] "Ar %d pakad a-heul a zo war-nes bezañ distaliet evit dalc'hen an ezhommoù :"
+msgstr[0] ""
+"Ar %d pakad a-heul a zo war-nes bezañ distaliet evit dalc'hen an ezhommoù :"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr " (%d Mo)"
-#: ../urpme:138
+#: ../urpme:135
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "Lemel %d pakad ?"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (y/N)"
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Fazi en ur lemel"
@@ -1371,12 +1482,12 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr ""
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1387,12 +1498,12 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1403,7 +1514,7 @@ msgstr ""
msgid " --use-distrib - use the given path to access media\n"
msgstr ""
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1413,7 +1524,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr ""
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr ""
@@ -1544,88 +1655,98 @@ msgid " --group - group\n"
msgstr " --group - strollad\n"
#: ../urpmf:72
+#, fuzzy, c-format
+msgid " --license - license\n"
+msgstr " --name - anv ar pakad\n"
+
+#: ../urpmf:73
#, c-format
msgid " --name - package name\n"
msgstr " --name - anv ar pakad\n"
-#: ../urpmf:73
+#: ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr ""
-#: ../urpmf:74
+#: ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr ""
-#: ../urpmf:75
+#: ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr ""
-#: ../urpmf:76
+#: ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr ""
-#: ../urpmf:77
+#: ../urpmf:78
#, c-format
msgid " --size - installed size\n"
msgstr " --size - ment pa 'vez staliet\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - anv ar rpm tizh\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, c-format
+msgid " --suggests - suggests tags\n"
+msgstr ""
+
+#: ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr " --summary - diverrañ\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, c-format
msgid " --url - url\n"
msgstr " --url - url\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, c-format
msgid " --vendor - vendor\n"
msgstr ""
-#: ../urpmf:82
+#: ../urpmf:84
#, c-format
msgid " -m - the media in which the package was found\n"
msgstr ""
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1642,60 +1763,60 @@ msgstr ""
"\n"
"arveriadur :\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr ""
-#: ../urpmi:93
+#: ../urpmi:89
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr ""
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr ""
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
"installation.\n"
msgstr ""
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr ""
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
" packages that lead to removals.\n"
msgstr ""
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1703,241 +1824,252 @@ msgid ""
" default is %d.\n"
msgstr ""
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr ""
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr ""
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr ""
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr ""
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr ""
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
" dependencies checking.\n"
msgstr ""
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
" dependencies checking and integrity.\n"
msgstr ""
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr ""
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
" to install a chroot with --root option.\n"
msgstr ""
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr ""
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr ""
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr ""
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr ""
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
" (--no-resume disables it, default is disabled).\n"
msgstr ""
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../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 ""
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
" authentication (format is <user:password>).\n"
msgstr ""
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
" next arg.\n"
msgstr ""
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
" (--no-verify-rpm disables it, default is enabled).\n"
msgstr ""
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr ""
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr ""
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr ""
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
-#: ../urpmi:144
+#: ../urpmi:141
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr ""
-#: ../urpmi:145
+#: ../urpmi:142
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr ""
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
-#: ../urpmi:148
+#: ../urpmi:145
+#, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr ""
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:150
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr ""
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
-#: ../urpmi:155
+#: ../urpmi:153
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --buildtime - amzer ar sevel\n"
-#: ../urpmi:157
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
-#: ../urpmi:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr ""
-#: ../urpmi:244
+#: ../urpmi:242
#, 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"
@@ -1947,53 +2079,55 @@ msgstr "N'hell ket bet krouer ar renkell [%s] evit reiñ da c'houzout ur gudenn"
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s : %s (evit bremanaat)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (evit bremanaat)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, c-format
msgid "%s: %s (to install)"
msgstr "%s : %s (evit staliañ)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, c-format
msgid "%s (to install)"
msgstr "%s (evit staliañ)"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "Ar %d pakad a-heul a zo war-nes bezañ staliet"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Petra eo ho choazh ? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2001,7 +2135,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2009,7 +2143,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, c-format
msgid ""
"\n"
@@ -2018,12 +2152,12 @@ msgstr ""
"\n"
"Kenderc'hel evelato ?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (Y/n)"
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2032,7 +2166,7 @@ msgstr ""
"Ne m'eus ket gallet staliañ un darn pakad goulennet :\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2041,7 +2175,7 @@ msgstr ""
"Ne m'eus ket gallet staliañ un darn pakad goulennet :\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2049,7 +2183,7 @@ msgid ""
"%s\n"
msgstr "Red eo da lemel ar pakadoù-mañ"
-#: ../urpmi:537
+#: ../urpmi:554
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2057,135 +2191,59 @@ msgid ""
"%s\n"
msgstr "Red eo da lemel ar pakadoù-mañ"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
msgstr "Red eo da lemel ar pakadoù-mañ"
-#: ../urpmi:545
+#: ../urpmi:562
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
"%s"
msgstr "Red eo da lemel ar pakadoù-mañ"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
"%s\n"
msgstr ""
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, 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:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Gwaskit « Mont » pa oc'h prest ..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Nullañ"
-#: ../urpmi:671
-#, c-format
-msgid "The following package has bad signature"
-msgstr "Bez eus sinadur fall gant ar pakadoù a-heul"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Bez eus sinadur fall gant ar pakadoù a-heul"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Fellout a ra deoc'h kenderc'hel staliañ ?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Sac'het eo an staliadur"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "o skignañ %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "o staliañ %s eus %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "o staliañ %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr ""
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr ""
-
-#: ../urpmi:815
-#, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d gourc'hemenn staliañ zo bet sac'het"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Possubl eo an staliadur"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr "Bremañaet eo ar pakadoù"
-
-#: ../urpmi:838
-#, c-format
-msgid "Package %s is already installed"
-msgstr "Staliet eo ar pakad %s c'hoazh"
-
-#: ../urpmi:839
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Staliet eo ar pakadoù %s c'hoazh"
-
-#: ../urpmi:842
-#, c-format
-msgid "Package %s can not be installed"
-msgstr "N'hell ket bet staliet ar pakad %s"
-
-#: ../urpmi:843
-#, c-format
-msgid "Packages %s can not be installed"
-msgstr "N'hell ket bet staliet ar pakadoù %s"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "oc'h adloc'hañ urpmi"
@@ -2297,49 +2355,49 @@ msgstr ""
msgid "unable to update medium \"%s\"\n"
msgstr "n'hell ket bet bremañaet ar medium « %s »\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Ar gourarveriad hepken a c'hell ouzhpennañ ur vedia"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, c-format
msgid "creating config file [%s]"
msgstr "o krouiñ ar restr kefluniadur [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "Ne 'meus ket ar restr kefluniadur [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr ""
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr ""
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "ne m'eus ket krouiñ ar mediom « %s »\n"
@@ -2497,18 +2555,18 @@ msgstr ""
msgid " -y - fuzzy match on media names.\n"
msgstr ""
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Ar gourarveriad hepken a c'hell lemel ur vedia"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr ""
"bez eus netra da lemel (implij urpmi.addmedia evit ouzhpennañ ur vedia)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2560,18 +2618,18 @@ msgstr ""
msgid " -f - force updating synthesis/hdlist\n"
msgstr ""
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Ar gourarveriad hepken a c'hell bremañaat ar media"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
"bez eus netra da vremañaat (implij urpmi.addmedia evit ouzhpennañ ur vedia)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2580,22 +2638,22 @@ msgstr ""
"mankout a ra ar vouetadur da vremañaat\n"
"(unan eus %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "« %s »"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr ""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "o bevaat ar media %s"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2612,194 +2670,205 @@ msgstr ""
"\n"
"arveriadur :\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
"packages.\n"
msgstr ""
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr ""
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr ""
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr ""
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr ""
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr ""
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr ""
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr ""
-#: ../urpmq:68
+#: ../urpmq:65
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr ""
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
" This permit to querying a distro.\n"
msgstr ""
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr ""
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - diskouez an diverrañ.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr ""
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
" - extended reverse search (includes virtual packages).\n"
msgstr ""
-#: ../urpmq:90
+#: ../urpmq:87
#, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr ""
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr ""
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr ""
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr ""
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr ""
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " --url - url\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr ""
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
msgstr ""
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr ""
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Changelog kavet ebet\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Sinadur fall a zo gant ar pakadoù-mañ :\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Ha fellout a ra deoc'h da genderc'hel ar staliadur ?"
+
#~ msgid "unable to remove package %s"
#~ msgstr "n'hellan ket lemel ar pakad %s"
@@ -2878,6 +2947,3 @@ msgstr "Changelog kavet ebet\n"
#~ msgstr ""
#~ "Ne m'eus ket gallet staliañ un darn pakad goulennet :\n"
#~ "%s"
-
-#~ msgid "unable to write file [%s]"
-#~ msgstr "n'hellan ket skrivañ ar restr [%s]"
diff --git a/po/bs.po b/po/bs.po
index e3d6b8f4..a67c9e9a 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+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"
@@ -22,7 +22,7 @@ msgstr ""
"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:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "RPM instalacija"
@@ -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:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_U redu"
@@ -98,7 +98,7 @@ msgstr "_Instaliraj"
msgid "_Save"
msgstr "_Snimi"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Odustani"
@@ -118,17 +118,17 @@ msgstr "Nepoznata opcija '%s'"
msgid "No packages specified"
msgstr "Nije naveden paket"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Molim sačekajte..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "Morate biti root"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -139,42 +139,42 @@ msgstr ""
"%s\n"
"Da nastavim?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Upozorenje"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "U redu"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (za ažuriranje)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (za instalaciju)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "Izbor paketa"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Jedan od sljedećih paketa je potreban:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Prekini"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -185,19 +185,19 @@ msgstr ""
"%s\n"
"Da nastavim?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, 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:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, 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:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, fuzzy, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
@@ -205,40 +205,42 @@ msgstr[0] "(%d paketa, %d MB)"
msgstr[1] "(%d paketa, %d MB)"
msgstr[2] "(%d paketa, %d MB)"
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Instalacija paketa..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "ne mogu dobiti izvorne pakete, prekidam"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Pripremam..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instaliram paket `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Molim ubacite medij sa imenom \"%s\" u uređaj [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Downloadujem paket `%s'..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Sljedeći paketi imaju neispravne potpise:\n"
-"%s\n"
-"\n"
-"Želite li nastaviti instalaciju?"
+msgid "_Done"
+msgstr "_Gotovo"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -249,41 +251,27 @@ msgstr ""
"%s\n"
"Možda ćete trebati osvježiti vašu urpmi bazu podataka"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "uklanjam %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Pripremam..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instaliram paket `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Gotovo"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, c-format
msgid "Installation failed:"
msgstr "Instalacija nije uspjela:"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "sve je već instalirano"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Instalacija završena"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "uklanjam %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -318,7 +306,7 @@ msgstr " -g - ispiši grupe sa imenom.\n"
msgid " defaults to %s.\n"
msgstr " podrazumijeva se %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Samo administrator (root) može instalirati pakete"
@@ -328,98 +316,98 @@ 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:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "ne mogu otvoriti rpmdb"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "neispravno ime rpm datoteke [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "dobavljam rpm datoteku [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...download završen"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...dobavljanje nije uspjelo: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "ne mogu pristupiti rpm datoteci [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "ne mogu obraditi spec datoteku %s [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "ne mogu registrovati rpm datoteku"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Nekompatibilna arhitektura za paket [%s]"
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "greška pri registrovanju lokalnih paketa"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, 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:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "pogrešna deklaracija proxy-ja na komandnoj liniji\n"
-#: ../urpm/args.pm:135
-#, fuzzy, c-format
-msgid "chroot directory doesn't exist"
-msgstr "Direktorij okruženja %s ne postoji"
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: ne mogu pročitati rpm datoteku \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
+#, fuzzy, c-format
+msgid "chroot directory doesn't exist"
+msgstr "Direktorij okruženja %s ne postoji"
+
+#: ../urpm/args.pm:424
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr "Previše argumenata\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "izgrađena hdlist synthesis datoteka za medij \"%s\""
@@ -608,7 +596,12 @@ msgstr "paket %s nije pronađen"
msgid "malformed URL: [%s]"
msgstr "neispravan URL: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "dobavljam rpm datoteke za medij \"%s\"..."
@@ -618,7 +611,7 @@ msgstr "dobavljam rpm datoteke za medij \"%s\"..."
msgid "[repackaging]"
msgstr "[prepakujem]"
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -626,37 +619,42 @@ msgstr ""
"napravio transakciju za instaliranje na %s (ukloni=%d, instaliraj=%d, "
"unaprijedi=%d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "ne mogu napraviti transakciju"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, 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:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "dodajem paket %s (id=%d, eid=%d, update=%d, file=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "ne mogu instalirati paket %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "uklanjam paket %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "uklanjam paket %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "instaliram %s iz %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Više informacija o paketu %s"
@@ -686,11 +684,104 @@ msgstr "Nije naveden paket"
msgid "Cannot connect to ldap uri:"
msgstr ""
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "urpmi baza podataka je zaključana"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Upozorenje"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "urpmi baza podataka je zaključana"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "Sljedeći paketi imaju neispravne potpise"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Sljedeći paketi imaju neispravne potpise"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Želite li nastaviti instalaciju ?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Instalacija nije uspjela"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "distribuiram %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "instaliram %s iz %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "instaliram %s"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Da pokušam instalaciju bez provjere ovisnosti? (d/N) "
+
+#: ../urpm/main_loop.pm:205
+#, 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:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d instalacionih transakcija nije uspjelo"
+msgstr[1] "%d instalacionih transakcija nije uspjelo"
+msgstr[2] "%d instalacionih transakcija nije uspjelo"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Instalacija nije moguća"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "sve je već instalirano"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "sve je već instalirano"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "sve je već instalirano"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "sve je već instalirano"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -740,7 +831,7 @@ msgstr "ne mogu izabrati nepostojeći medij \"%s\""
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "izgrađena hdlist synthesis datoteka za medij \"%s\""
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "ne mogu pristupiti hdlist datoteci za \"%s\", ignorišem medij"
@@ -832,7 +923,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Početak pretrage: %s kraj: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "izvršavam drugi prolaz izračunavanja ovisnosti\n"
@@ -899,67 +990,72 @@ msgstr ""
"ne mogu pristupiti prvom instalacionom mediju (nije pronađena hdlist "
"datoteka)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "ne mogu izabrati nepostojeći medij \"%s\""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "biram više medija: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "uklanjam medij \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "rekonfigurišem uprmi za medij \"%s\""
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...rekonfiguracija nije uspjela"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "rekonfiguracija završena"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Greška pri pravljenju names datoteke: zavisnost %d nedostaje"
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr "Greška pri pravljenju names datoteke: Ne mogu pisati u datoteku (%s)"
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "medij \"%s\" nije izabran"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "ispitujem hdlist datoteku [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "ispitujem synthesis datoteku [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "pravim hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -968,77 +1064,77 @@ msgstr ""
"Ne mogu napraviti synthesis datoteku za medij \"%s\". Vaša hdlist datoteka "
"je možda neispravna."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problem u čitanju hdlist ili synthesis datoteke za medij \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "ispisujem list datoteku za medij \"%s\""
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...kopiranje nije uspjelo"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopiram opisnu datoteku za \"%s\"..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...kopiranje završeno"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopiranje [%s] nije uspjelo (datoteka je sumnjivo mala)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "izračunavam md5sumu kopirane hdlist (ili synthesis) datoteke"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "kopiranje [%s] nije uspjelo (md5sum se ne poklapa)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "izračunavam md5sum za dobavljeni hdlist (ili synthesis)"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...dobavljanje nije uspjelo: md5sum ne odgovara"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "nisam našao RPM datoteke sa [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "čitam RPM datoteke iz [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "ne mogu čitati RPM datoteke iz [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "nijedan RPM nije pročitan"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1049,74 +1145,74 @@ msgstr ""
"ovo se moglo desiti ako ste ručno montirali direktorij prilikom pravljenja "
"medija."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "dobavljam hdlist (ili synthesis) za \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "pronašao traženi hdlist (ili synthesis) kao %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "istražujem pubkey datoteku za \"%s\"..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...uveo sam ključ %s iz pubkey datoteke \"%s\"-a"
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "ne mogu uvesti pubkey datoteku za \"%s\""
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "ispisujem list datoteku za medij \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "dodao medij %s"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "ne mogu obraditi hdlist datoteku za \"%s\""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problem pri čitanju synthesis datoteke za medij \"%s\""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "dobavljam zaglavlja sa medija \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "DdYy"
@@ -1176,47 +1272,52 @@ msgstr "nekoherentan medij \"%s\" je označen kao izmjenljiv, mada nije ustvari"
msgid "unable to access medium \"%s\""
msgstr "ne mogu pristupiti mediju \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Nema paketa pod imenom %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Sljedeći paketi sadrže %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "zbog nedostajućeg %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "sve je već instalirano"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "zbog nezadovoljenih %s"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "pokušavam promovirati %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "kako bi zadržao %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "da bih instalirao %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "zbog konflikta sa %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "nije tražen"
@@ -1236,6 +1337,16 @@ msgstr "Neispravan ID ključa (%s)"
msgid "Missing signature (%s)"
msgstr "Nedostaje potpis (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Ne mogu napraviti konf. datoteku [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Kopiranje nije uspjelo"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1252,8 +1363,8 @@ msgstr ""
"\n"
"upotreba:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1269,19 +1380,19 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - provjeri da li se uklanjanje može ispravno izvršiti.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr ""
" --force - prisili pozivanje čak i ako neki paketi ne postoje.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - distribuirani urpmi preko mašina sa aliasom.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Prepakuj datoteke prije brisanja\n"
@@ -1291,8 +1402,8 @@ msgstr " --repackage - Prepakuj datoteke prije brisanja\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - koristi drugi korijen za uklanjanje RPM-a.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - koristi drugi dir. za rpm instalaciju.\n"
@@ -1311,17 +1422,17 @@ msgstr ""
" --use-distrib - podesi urpme u letu iz distrib stabla, korisno za\n"
" chroot de-instalacije uz korištenje --root opcije.\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - pokušaj naći i koristiti synthesis datoteku.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - pokušaj pronaći i koristiti hdlist datoteku.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - rječiti mod.\n"
@@ -1331,37 +1442,37 @@ msgstr " --verbose, -v - rječiti mod.\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - izaberi sve pakete koji odgovaraju izrazu.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Samo administrator (superkorisnik) može uklanjati pakete"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "nepoznati paket"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "nepoznat paket"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "uklanjanje paketa %s će pokvariti vaš sistem"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Nema ništa za uklanjanje"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Provjeravam uklanjanje sljedećih paketa"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1370,12 +1481,12 @@ 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)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr " (%d MB)"
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
@@ -1383,12 +1494,12 @@ msgstr[0] "Da uklonim %d paketa?"
msgstr[1] "Da uklonim %d paketa?"
msgstr[2] "Da uklonim %d paketa?"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (d/N) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Uklanjanje nije uspjelo"
@@ -1414,13 +1525,13 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - ispisuje broj verzije ovog alata.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - koristi navedenu okolinu (tipično izvještaj o bugu).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr " --excludemedia - ne koristi navedene medije, razdvojene zarezom.\n"
@@ -1433,12 +1544,12 @@ msgstr ""
" --literal, -l - bez prepoznavanja uzorka, koristi argument kao doslovan "
"tekst.\n"
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - koristi samo navedene medije, razdvojene zarezom.\n"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1451,7 +1562,7 @@ msgstr ""
msgid " --use-distrib - use the given path to access media\n"
msgstr " --synthesis - koristi zadani synthesis umjesto urpmi baze.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - koristi zadani synthesis umjesto urpmi baze.\n"
@@ -1461,7 +1572,7 @@ msgstr " --synthesis - koristi zadani synthesis umjesto urpmi baze.\n"
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - ne ispisuj identične linije.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - koristi samo medije za unaprjeđenje.\n"
@@ -1594,76 +1705,86 @@ msgid " --group - group\n"
msgstr " --group - grupa\n"
#: ../urpmf:72
+#, fuzzy, c-format
+msgid " --license - license\n"
+msgstr " --name - ime paketa\n"
+
+#: ../urpmf:73
#, c-format
msgid " --name - package name\n"
msgstr " --name - ime paketa\n"
-#: ../urpmf:73
+#: ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - tag 'prevaziđeno'\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr " --packager - autor paketa\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - tag 'pruža'\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - tag 'zahtijeva'\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, c-format
msgid " --size - installed size\n"
msgstr " --size - veličina nakon instalacije\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - naziv izvornog rpm-a\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - tag 'prevaziđeno'\n"
+
+#: ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr " --summary - sažetak.\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, c-format
msgid " --url - url\n"
msgstr " --url - URL\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, c-format
msgid " --vendor - vendor\n"
msgstr " --vendor - izdavač\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -m - medij na kojem je paket pronađen\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - štampa verziju, izdanje i arhitekturu sa imenom.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Neispravan format: možete koristiti samo jedan viševrijednosni tag"
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "koristim navedenu okolinu na %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1672,12 +1793,12 @@ msgstr ""
"Napomena: pošto nijedan od pretraženih medija ne koristi hdliste, urpmf nije "
"mogao vratiti rezultate\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Možda želite koristiti --name da biste tražili imena paketa.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1693,13 +1814,13 @@ msgstr ""
"\n"
"upotreba:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
msgstr " --searchmedia - koristi samo navedene medije za pretragu paketa.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
@@ -1708,30 +1829,30 @@ msgstr ""
" --auto - ne-interaktivni režim, koristi ponuđene odgovore na sva "
"pitanja.\n"
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr ""
" --auto-select - automatski izaberi pakete za unaprijeđenje sistema.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
" --auto-select - automatski izaberi pakete za unaprijeđenje sistema.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, fuzzy, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - isključi provjeru MD5SUM datoteke.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, fuzzy, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - prinudi update gpg ključa.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1740,12 +1861,12 @@ msgstr ""
" --no-uninstall - nikad ne pitaj za deinstalaciju paketa, prekini "
"instalaciju.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - nemoj instalirati pakete (samo ih preuzmi)\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1754,7 +1875,7 @@ msgstr ""
" --keep - čuvaj postojeće pakete ako je moguće, odbaci tražene\n"
" pakete koji vode uklanjanju.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1765,37 +1886,43 @@ msgstr ""
" paketi biti instalirani ili unaprijeđeni,\n"
" podrazumijeva se %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - mala dužina transakcije, podrazumijeva se %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy, -y - nametni fuzzy pretragu.\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src, -s - sljedeći paket je source paket.\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr " --install-src - instaliraj samo izvorne pakete (bez binarnih).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - ukloni rpm iz spremnika prije svega ostalog.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - čuvaj neiskorištene rpm-ove u spremniku.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1804,7 +1931,7 @@ msgstr ""
" --allow-nodeps - dozvoli pitanje korisniku da instalira pakete\n"
" bez provjere ovisnosti.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1813,12 +1940,12 @@ msgstr ""
" --allow-force - dozvoli pitanje korisniku da instalira pakete bez\n"
" provjere ovisnosti i integriteta.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - koristi drugi dir. za rpm instalaciju.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1827,47 +1954,47 @@ msgstr ""
" --use-distrib - podesi urpmi u letu iz distrib stabla, korisno za\n"
" chroot instalacije uz korištenje --root opcije.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - koristi wget za download datoteka.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - koristi curl za download datoteka.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, fuzzy, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --curl - koristi curl za download datoteka.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr " --curl-options - dodatne opcije za curl\n"
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr " --rsync-options- dodatne opcije za rsync\n"
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr " --wget-options - dodatne opcije za wget\n"
-#: ../urpmi:127
+#: ../urpmi:124
#, fuzzy, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr " --curl-options - dodatne opcije za curl\n"
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - ograniči brzinu downloada.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1876,7 +2003,7 @@ msgstr ""
" --resume - nastavi prijenos djelomično prenesenih datoteka\n"
" (--no-resume isključuje, što je i podrazumijevano).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1885,7 +2012,7 @@ msgstr ""
" --proxy - koristi navedeni HTTP proxy, broj porta se pretpostavlja\n"
" da je 1080 (format je <proxyhost[:port]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1894,7 +2021,7 @@ msgstr ""
" --proxy-user - navedi korisnika i šifru potrebne za proxy\n"
" autentifikaciju (format je <user:password>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1903,7 +2030,7 @@ msgstr ""
" --bug - ispiši izvještaj o bugu u direktorij naveden u\n"
" idućem argumentu.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1912,7 +2039,7 @@ msgstr ""
" --verify-rpm - provjeri potpis rpm-a prije instalacije\n"
" (--no-verify-rpm isključuje, normalno je uključeno).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
@@ -1920,37 +2047,42 @@ msgid ""
msgstr ""
" --test - provjeri da li se instalacija može ispravno izvršiti.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - isključi puteve razdvojene zarezom.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - isključi docs datoteke.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr " --ignoresize - ne provjeravaj slobodan prostor na disku.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --ignorearch - dozvoli instalaciju RPMova za druge arhitekture.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - ne izvršavaj skripte u paketu\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - paketi čija instalacija treba biti preskočena\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - paketi čija instalacija treba biti preskočena\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1959,49 +2091,49 @@ msgstr ""
" --more-choices - ako je pronađeno više paketa, ponudi više izbora\n"
" nego što je uobičajeno.\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - ne zaključavaj RPM bazu.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, 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:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - izaberi sve pogotke na komandnoj liniji.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - uključi pretragu 'provides' taga radi nalaženja paketa.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - ne pretražuj 'provides' pri traženju paketa.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - tihi mod.\n"
-#: ../urpmi:157
+#: ../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:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2010,12 +2142,12 @@ msgstr ""
"Greška: Da biste generisali prijavu buga, navedite uobičajene argumente i\n"
"dodajte --bug.\n"
-#: ../urpmi:220
+#: ../urpmi:218
#, 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:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2024,7 +2156,7 @@ msgstr ""
"Direktorij [%s] već postoji, molim koristite neki drugi direktorij za "
"prijavu buga ili ga obrišite"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Ne mogu napraviti direktorij [%s] za prijavu buga"
@@ -2034,7 +2166,7 @@ msgstr "Ne mogu napraviti direktorij [%s] za prijavu buga"
msgid "Environment directory %s does not exist"
msgstr "Direktorij okruženja %s ne postoji"
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2043,46 +2175,48 @@ msgstr ""
"Greška: izgleda da je %s montiran samo za čitanje.\n"
"Koristite opciju --allow-force za prinudnu operaciju."
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr "Ažuriram medije...\n"
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (za ažuriranje)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (za ažuriranje)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (za instalaciju)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (za instalaciju)"
-#: ../urpmi:447
+#: ../urpmi:454
#, 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:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Vaš izbor je? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2093,7 +2227,7 @@ msgstr ""
"koji su stariji od instaliranih:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2104,7 +2238,7 @@ msgstr ""
"koji su stariji od instaliranih:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, c-format
msgid ""
"\n"
@@ -2113,12 +2247,12 @@ msgstr ""
"\n"
"Svejedno nastavljate instalaciju?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (D/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2127,7 +2261,7 @@ msgstr ""
"Neki od traženih paketa se ne mogu instalirati:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2136,7 +2270,7 @@ msgstr ""
"Neki od traženih paketa se ne mogu instalirati:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2147,7 +2281,7 @@ msgstr ""
"uklonjeni da bi drugi mogli biti nadograđeni:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2158,7 +2292,7 @@ msgstr ""
"uklonjeni da bi drugi mogli biti nadograđeni:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2167,7 +2301,7 @@ msgstr ""
"Sljedeći paketi trebaju biti uklonjeni da bi drugi mogli biti nadograđeni:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2176,12 +2310,17 @@ msgstr ""
"Sljedeći paketi trebaju biti uklonjeni da bi drugi mogli biti nadograđeni:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(samo testiraj, uklanjanje neće biti izvršeno)"
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2190,12 +2329,12 @@ msgstr ""
"Morate biti root da biste instalirali sljedeće ovisnosti:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(samo testiraj, instalacija neće biti izvršena)"
-#: ../urpmi:597
+#: ../urpmi:617
#, fuzzy, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2203,100 +2342,17 @@ 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:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Pritisnite Enter kada budete spremni..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Odustani"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "Sljedeći paketi imaju neispravne potpise"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Sljedeći paketi imaju neispravne potpise"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Želite li nastaviti instalaciju ?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Instalacija nije uspjela"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "distribuiram %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "instaliram %s iz %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "instaliram %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Da pokušam instalaciju bez provjere ovisnosti? (d/N) "
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Pokušaj instalaciju još jače (--force opcija)? (d/N) "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d instalacionih transakcija nije uspjelo"
-msgstr[1] "%d instalacionih transakcija nije uspjelo"
-msgstr[2] "%d instalacionih transakcija nije uspjelo"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Instalacija nije moguća"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "sve je već instalirano"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "sve je već instalirano"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "sve je već instalirano"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "sve je već instalirano"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "restartujem urpmi"
@@ -2425,32 +2481,32 @@ msgstr " -v - rječiti mod.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "ne mogu update-irati medij \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Samo administrator (superkorisnik) može dodavati medije"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "Napraviću konf. datoteku [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "Ne mogu napraviti konf. datoteku [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "nema potrebe da navodite <relativnu putanju do hdlist> sa --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
@@ -2459,17 +2515,17 @@ msgstr ""
"\n"
"Želite li dodati medij '%s'"
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<relativni put do datoteke hdlist> nedostaje\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "ne mogu napraviti medij \"%s\"\n"
@@ -2634,17 +2690,17 @@ msgstr " -a - izaberi sve medije.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - fuzzy izbor imena medija.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Samo administrator (superkorisnik) može uklanjati medije"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "ništa za uklanjanje (koristite urpmi.addmedia da dodate medij)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2700,17 +2756,17 @@ msgstr " -a - izaberi ne-izmjenjive medije.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - prisili pravljenje hdlist datoteka.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Samo administrator (superkorisnik) može ažurirati medije"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "ništa za update (koristite urpmi.addmedia da dodate medij)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2719,22 +2775,22 @@ msgstr ""
"stavka za update nedostaje\n"
"(jedan od %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "ignorišem medij %s"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "uključujem medij %s"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2750,7 +2806,7 @@ msgstr ""
"\n"
"upotreba:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2759,38 +2815,38 @@ msgstr ""
" --searchmedia - koristi samo navedene medije za pretragu (ili ažuriranje) "
"paketa.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - nametni fuzzy pretragu (isto što i -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - lista dostupnih paketa.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - izlistaj dostupne medije.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - izlistaj dostupne medije i njihove URLove.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
" --list-nodes - izlistaj dostupne nodove kod korištenja --parallel.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - izlistaj dostupne paralelne aliase.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
@@ -2798,24 +2854,24 @@ msgstr ""
" --dump-config - ispiši konfiguraciju u obliku argumenata za urpmi."
"addmedia.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr " --src - sljedeći paket je source paket (isto što i -s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr ""
" --sources - daj sve source pakete prije downloada (samo root).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --ignorearch - dozvoli upite na RPMove za druge arhitekture.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2824,22 +2880,22 @@ msgstr ""
" --use-distrib - podesi urpmi u letu iz distrib stabla.\n"
" Ovo omogućuje ispitivanje distribucije.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - ispiši dnevnik izmjena.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - ispiši sažetak.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - obrnuta pretraga za ono što zahtijeva paket.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2849,55 +2905,55 @@ msgstr ""
" - proširena obrnuta pretraga (uključuje virtuelne "
"pakete).\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -p - uključi pretragu 'provides' taga radi nalaženja.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - kompletan izlaz sa paketom za uklanjanje.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - proširi upit na ovisnosti paketa.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - ispiši grupe sa imenom.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - ispiši korisne informacije u čitljivom obliku.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - lista datoteka u paketu.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - tihi mod.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - ispiši verziju i izdanje sa imenom.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - sljedeći paket je source paket (isto što i --src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2905,45 +2961,45 @@ msgid ""
msgstr ""
" -u - ukloni paket ako je već instalirana novija verzija.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - nametni fuzzy pretragu (isto što i --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - kao -y, ali pretraga ne razlikuje mala i velika slova.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " imena ili rpm datoteke dati na komandnoj liniji će biti ispitani.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes se može koristiti samo sa --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"Napomena: pošto nijedan od pretraženih medija ne koristi hdliste, urpmf nije "
"mogao vratiti rezultate\n"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2951,11 +3007,22 @@ msgstr ""
"Napomena: pošto nijedan od pretraženih medija ne koristi hdliste, urpmf nije "
"mogao vratiti rezultate\n"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Nije pronađen changelog\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Sljedeći paketi imaju neispravne potpise:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Želite li nastaviti instalaciju?"
+
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Morate biti root kako biste koristili --use-distrib"
diff --git a/po/ca.po b/po/ca.po
index 41ab2024..0a6bd51c 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+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"
@@ -20,7 +20,7 @@ msgstr ""
"X-Generator: KBabel 1.9.1\n"
"Plural-Forms: nplurals=2; plural=n!=1;\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "Instal·lació de RPM"
@@ -30,7 +30,7 @@ msgstr "Instal·lació de RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_D'acord"
@@ -98,7 +98,7 @@ msgstr "_Instal·lació"
msgid "_Save"
msgstr "_Desa"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Cancel·la"
@@ -118,17 +118,17 @@ msgstr "Opcions desconegudes %s"
msgid "No packages specified"
msgstr "No s'ha especificat cap paquet"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Si us plau, espereu..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "S'ha de ser root"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -139,42 +139,42 @@ msgstr ""
"%s\n"
"Voleu continuar igualment?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Advertència"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "D'acord"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (a actualitzar)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (a instal·lar)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Cal un dels paquets següents:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Avorta"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -185,59 +185,61 @@ msgstr ""
"%s\n"
"Voleu continuar igualment?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, 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:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, 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:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, 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:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Instal·lació de paquets..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "no es poden recuperar els paquets font. S'està interrompent"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "S'està preparant..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "S'està instal·lant el paquet `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Si us plau, inseriu la font anomenada \"%s\" al dispositiu [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "S'està descarregant el paquet `%s'..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Els següents paquets tenen signatures dolentes:\n"
-"%s\n"
-"\n"
-"Voleu continuar amb la instal·lació?"
+msgid "_Done"
+msgstr "_Fet"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -249,41 +251,27 @@ msgstr ""
"%s\n"
"Potser voleu actualitzar la base de dades urpmi"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "s'està eliminant %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "S'està preparant..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "S'està instal·lant el paquet `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Fet"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, c-format
msgid "Installation failed:"
msgstr "La instal·lació ha fallat:"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Ja està tot instal·lat"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Instal·lació finalitzada"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "s'està eliminant %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -318,7 +306,7 @@ msgstr " -g - imprimeix grups amb el nom.\n"
msgid " defaults to %s.\n"
msgstr " el valor per defecte és %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "El superusuari és l'únic autoritzat per a instal·lar paquets"
@@ -328,98 +316,98 @@ msgstr "El superusuari és l'únic autoritzat per a instal·lar paquets"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "no s'ha pogut obrir rpmdb"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "el nom del fitxer rpm és incorrecte [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "s'està recuperant els fitxer rpm [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...recuperació feta"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...ha fallat la recuperació: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "no s'ha pogut accedir al fitxer rpm [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "no es pot analitzar \"%s\" en el fitxer [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "no s'ha pogut registrar el fitxer rpm"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "error registrant els paquets locals"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, 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:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, 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:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "s'ha construït el fitxer de síntesi hdlist per a la font \"%s\""
@@ -612,7 +600,12 @@ msgstr "no s'ha trobat el paquet %s."
msgid "malformed URL: [%s]"
msgstr "entrada mal formada: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "s'està recuperant els fitxers rpm de la font \"%s\"..."
@@ -622,7 +615,7 @@ msgstr "s'està recuperant els fitxers rpm de la font \"%s\"..."
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -630,37 +623,42 @@ msgstr ""
"s'ha creat una transacció per instal·lar a %s (elimina=%d, instal·la=%d, "
"actualitza=%d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "no s'ha pogut crear la transacció"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, 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:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "s'està afegint el paquet %s (id=%d, eid=%d, actualitza=%d, fitxer=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "no s'ha pogut instal·lar el paquet %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "s'està eliminant el paquet %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "s'està eliminant el paquet %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "s'està instal·lant %s des de %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Més informació en quant el paquet %s"
@@ -690,11 +688,104 @@ msgstr "No s'ha especificat cap paquet"
msgid "Cannot connect to ldap uri:"
msgstr "No s'ha pogut connectar al servidor"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "la base de dades de l'urpmi està bloquejada"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Advertència"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "la base de dades de l'urpmi està bloquejada"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "Els paquets següents tenen signatures incorrectes"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Els paquets següents tenen signatures incorrectes"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Voleu continuar la instal·lació ?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "La instal·lació ha fallat"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "s'està distribuint %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "s'està instal·lant %s des de %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "s'està instal·lant %s"
+
+#: ../urpm/main_loop.pm:187
+#, 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:205
+#, 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:247
+#, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "ha fallat %d transacció d'instal·lació"
+msgstr[1] "han fallat %d transaccions d'instal·lació"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "La instal·lació és possible"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "Ja està tot instal·lat"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Ja està tot instal·lat"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "Ja està tot instal·lat"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Ja està tot instal·lat"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -744,7 +835,7 @@ msgstr "s'ha intentant seleccionar una font inexistent \"%s\""
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "s'ha construït el fitxer de síntesi hdlist per a la font \"%s\""
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "no es pot accedir al fitxer hdlist de \"%s\", font ignorada"
@@ -834,7 +925,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr ""
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "s'està fent segona passada per a computar dependències\n"
@@ -901,67 +992,72 @@ msgstr ""
"no s'ha pogut accedir la primera font d'instal·lació (no s'ha trobat fitxer "
"hdlists)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "s'ha intentant seleccionar una font inexistent \"%s\""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "s'està seleccionant múltiples fonts: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "s'està esborrant la font \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "s'està reconfigurant l'urpmi per la font \"%s\""
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "..la reconfiguració ha fallat"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "reconfiguració acabada"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "la font \"%s\" no ha estat seleccionada"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "s'està examinant el fitxer hdlist [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "s'està examinant el fitxer de síntesi [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "s'està construint l'hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -970,79 +1066,79 @@ msgstr ""
"No s'ha pogut construir el fitxer de síntesi per la font \"%s\". El vostre "
"fitxer hdlist pot estar corrupte."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr ""
"s'ha trobat un problema llegint el fitxer hdlist o de síntesi de la font \"%s"
"\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "s'està escrivint el fitxer list per la font \"%s\""
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "..la còpia ha fallat"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "s'està copiant el fitxer de descripció de \"%s\"..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...còpia feta"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, 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:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "s'està computant el md5sum de la font hdlist (o síntesi)"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "la còpia de [%s] ha fallat (el md5sum no concorda)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "s'està computant el md5sum de la font hdlist (o síntesi) recuperada"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...ha fallat la recuperació: el md5sum no concorda"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "no s'han trobat fitxers rpm des de [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "s'està llegint els fitxers rpm des de [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "no s'ha pogut llegir els fitxers rpm des de [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "no s'ha llegit cap rpm"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1052,74 +1148,74 @@ msgstr ""
"no s'ha pogut accedir a la font \"%s\",\n"
"pot passar si havies muntat manualment el directori al crear la font."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, 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:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "s'està recuperant el hdlist font (o la síntesi) de \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "s'ha trobat l'hdlist (o síntesi) buscat a %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "no s'ha trobat el fitxer hdlist per a la font \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "s'està examinant el fitxer de clau pública de \"%s\"..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, 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:1553
+#: ../urpm/media.pm:1560
#, 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:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "s'està escrivint el fitxer list per la font \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "s'ha afegit la font %s"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "no es pot analitzar el fitxer hdlist de \"%s\""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, 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:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "s'estan llegint les capçaleres de la font \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "SsYy"
@@ -1180,47 +1276,52 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "no s'ha pogut accedir a al font \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "No hi cap paquet anomenat %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Els paquets següents contenen %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "degut a que falten %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Ja està tot instal·lat"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "degut a %s no satisfetes"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, fuzzy, c-format
msgid "trying to promote %s"
msgstr "Res a eliminar"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "per tal de mantenir %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "per tal d'instal·lar %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "degut a conflictes amb %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "no demanat"
@@ -1240,6 +1341,16 @@ msgstr "ID de clau no vàlid (%s)"
msgid "Missing signature (%s)"
msgstr "Falta la signatura (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "no s'ha pogut escriure el fitxer [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "La còpia ha fallat"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1257,8 +1368,8 @@ msgstr ""
"\n"
"sintaxi:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1274,7 +1385,7 @@ msgstr ""
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - verifica si l'eliminació pot ser duta a terme.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
@@ -1282,12 +1393,12 @@ msgstr ""
" --force - força l'execució tot i que hi hagi paquets que no "
"existeixen.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - urpmi distribuït pels ordinadors de l'àlias.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - mostra l'etiqueta packager: empaquetador.\n"
@@ -1297,8 +1408,8 @@ msgstr " --packager - mostra l'etiqueta packager: empaquetador.\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - usa una altre arrel per l'eliminació de rpm.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - usa una altre arrel per la instal·lació de rpm.\n"
@@ -1315,17 +1426,17 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - usa el fitxer de síntesi.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - usa el fitxer hdlist.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - mode detallat.\n"
@@ -1337,37 +1448,37 @@ msgstr ""
" -a - selecciona tots els paquets que coincideixen amb "
"l'expressió.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "El superusuari és l'únic autoritzat per a eliminar paquets"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "paquets desconeguts"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "paquet desconegut"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "eliminar el paquet %s trencarà el vostre sistema"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Res a eliminar"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr ""
-#: ../urpme:134
+#: ../urpme:131
#, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1376,24 +1487,24 @@ 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"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr " (%d MB)"
-#: ../urpme:138
+#: ../urpme:135
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "Elimina %d paquet?"
msgstr[1] "Elimina %d paquets?"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (s/N) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "L'eliminació ha fallat"
@@ -1420,14 +1531,14 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --help - mostra la informació de la versió.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - utilitza un entorn concret (normalment un\n"
" informe d'errors).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr " --excludemedia - no usis les fonts donades, separades per comes.\n"
@@ -1438,14 +1549,14 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../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"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1459,7 +1570,7 @@ msgid " --use-distrib - use the given path to access media\n"
msgstr ""
" --synthesis - utilitza la síntesi donada en comptes de la bd de urpmi.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1470,7 +1581,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - no imprimeix línies idèntiques.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - utilitza només les fonts d'actualització.\n"
@@ -1606,92 +1717,104 @@ msgstr " --group - mostra el grup del paquet.\n"
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr " --name - imprimeix només els noms dels paquets.\n"
#: ../urpmf:73
+#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr " --name - imprimeix només els noms dels paquets.\n"
+
+#: ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr ""
" --obsoletes - mostra l'etiqueta obsoletes: tots els paquets que deixa "
"obsolets.\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr " --packager - empaquetador.\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr ""
" --provides - mostra l'etiqueta provides: tots allò que proporciona.\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr ""
" --requires - mostra l'etiqueta requires: tots allò que necessita.\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --size - mostra l'etiqueta size: mida.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, fuzzy, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - mostra l'etiqueta sourcerpm: rpm de codi font.\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr ""
+" --obsoletes - mostra l'etiqueta obsoletes: tots els paquets que deixa "
+"obsolets.\n"
+
+#: ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr " --summary - imprimeix el resum.\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr " --url - mostra l'etiqueta url: url.\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr " -verbose - mode detallat.\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -l - llista els fitxers del paquet.\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - mostra la versió, llançament i arquitectura amb el nom.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1708,7 +1831,7 @@ msgstr ""
"\n"
"sintaxi:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1716,14 +1839,14 @@ msgstr ""
" --searchmedia - utilitza només les fonts donades per cercar "
"paquets.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
@@ -1731,24 +1854,24 @@ msgstr ""
" --auto-select - selecciona automàticament els paquets per actualitzar el "
"sistema.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
" --auto-select - selecciona automàticament els paquets per actualitzar el "
"sistema.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - deshabilita la comprovació MD5SUM.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - força l'actualització de la clau gpg.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1757,13 +1880,13 @@ msgstr ""
" --no-uninstall - mai demana desinstal·lar un paquet, avorta la "
"instal·lació.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, fuzzy, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr ""
" --install-src - instal·la només paquets de codi font (cap binari).\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1773,7 +1896,7 @@ msgstr ""
"paquets demanats\n"
" que porten a la eliminació d'altres paquets.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1781,40 +1904,46 @@ msgid ""
" default is %d.\n"
msgstr ""
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr ""
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy, -y - utilitza cerca difusa.\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src,- s - el paquet següent és un paquet font.\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
" --install-src - instal·la només paquets de codi font (cap binari).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr ""
" --clean - esborra els rpm de la memòria cau abans de res més.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, fuzzy, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr ""
" --noclean - conserva els rpm que no s'utilitzen a la memòria cau.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1824,7 +1953,7 @@ msgstr ""
"sense\n"
" comprovar les dependències.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1834,66 +1963,66 @@ msgstr ""
"sense\n"
" comprovar les dependències i la integritat.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - usa una altre arrel per la instal·lació de rpm.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
" to install a chroot with --root option.\n"
msgstr ""
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - usa wget per a recuperar fitxers llunyans.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - usa curl per a recuperar fitxers llunyans.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --prozilla - usa prozilla per a recuperar fitxers llunyans.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - limita la velocitat de descàrrega.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
" (--no-resume disables it, default is disabled).\n"
msgstr ""
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1904,7 +2033,7 @@ msgstr ""
" que és el 1080 per defecte (el format és "
"<ordinadorcentralproxy[:port]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1914,7 +2043,7 @@ msgstr ""
"autenticació\n"
" del proxy (el format és <usuari:contrasenya>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1923,7 +2052,7 @@ msgstr ""
" --bug - crea un informe d'errors en el directori\n"
" que s'indica en l'argument següent.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1933,111 +2062,116 @@ msgstr ""
" (--no-verify-rpm la deshabilita, per defecte està "
"habilitat)\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, fuzzy, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr " --test - verifica si la instal·lació pot ser duta a terme.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr ""
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - exclou els fitxers de documentació.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, fuzzy, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --no-uninstall - mai demana desinstal·lar un paquet, avorta la "
"instal·lació.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --url - mostra l'etiqueta url: url.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - mostra l'etiqueta description: descripció.\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - paquets que han de saltase en la instal·lació\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - paquets que han de saltase en la instal·lació\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:150
+#: ../urpmi:148
#, 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:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, 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:153
+#: ../urpmi:151
#, 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"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - no busquis en 'provides' per a trobar paquets.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - mode silenciós.\n"
-#: ../urpmi:157
+#: ../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:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2046,7 +2180,7 @@ msgstr ""
"El directori [%s] ja existeix, si us plau usa un altre directori per "
"l'informe d'error o esborra'l"
-#: ../urpmi:244
+#: ../urpmi:242
#, 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"
@@ -2056,53 +2190,55 @@ msgstr "No s'ha pogut crear el directori [%s] per a l'informe d'errors"
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (a actualitzar)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (a actualitzar)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (a instal·lar)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, c-format
msgid "%s (to install)"
msgstr "%s (a instal·lar)"
-#: ../urpmi:447
+#: ../urpmi:454
#, 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:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Quina és la vostra elecció? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2110,7 +2246,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2118,19 +2254,19 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Voleu continuar igualment?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (S/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2139,7 +2275,7 @@ msgstr ""
"Alguns dels paquets demanats no es poden instal·lar:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2148,7 +2284,7 @@ msgstr ""
"Alguns dels paquets demanats no es poden instal·lar:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2159,7 +2295,7 @@ msgstr ""
"s'ha d'eliminar per poder actualitzar uns altres:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2170,7 +2306,7 @@ msgstr ""
"s'han d'eliminar per poder actualitzar uns altres:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2179,7 +2315,7 @@ msgstr ""
"El paquets següent s'ha d'eliminar per poder actualitzar uns altres:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2188,12 +2324,17 @@ msgstr ""
"Els paquets següents s'han d'eliminar per poder actualitzar uns altres:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2202,112 +2343,29 @@ msgstr ""
"Es necessita ser 'root' per a instal·lar les següents dependències:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, 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:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Premeu Intro quan estigui fet..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Cancel·la"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "Els paquets següents tenen signatures incorrectes"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Els paquets següents tenen signatures incorrectes"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Voleu continuar la instal·lació ?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "La instal·lació ha fallat"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "s'està distribuint %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "s'està instal·lant %s des de %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "s'està instal·lant %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr ""
-"Voleu intentar la instal·lació sense comprovar les dependències? (s/N) "
-
-#: ../urpmi:776
-#, 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) "
-
-#: ../urpmi:815
-#, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "ha fallat %d transacció d'instal·lació"
-msgstr[1] "han fallat %d transaccions d'instal·lació"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "La instal·lació és possible"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Ja està tot instal·lat"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Ja està tot instal·lat"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "Ja està tot instal·lat"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "Ja està tot instal·lat"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "s'esta reiniciant urpmi"
@@ -2432,49 +2490,49 @@ msgstr " -v - mode detallat.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "no es pot actualitzar la font \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "El superusuari és l'únic autoritzat per a afegir fonts"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "Crearà el fitxer de configuració [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "No s'ha pogut crear el fitxer de configuració [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "no fa falta proporcionar el <camí relatiu de l'hdlist> amb --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "falta el <camí relatiu de l'hdlist>\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "no es pot crear la font \"%s\"\n"
@@ -2636,18 +2694,18 @@ msgstr " -a - selecciona totes les fonts.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr ""
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "El superusuari és l'únic autoritzat per a eliminar fonts"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr ""
"no hi ha res per eliminar (utilitzeu urpmi.addmedia per afegir una font)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2704,18 +2762,18 @@ msgid " -f - force updating synthesis/hdlist\n"
msgstr ""
" -f - força l'actualització dels fitxers synthesis/hdlist\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "El superusuari és l'únic autoritzat per a actualitzar fonts"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
"no hi ha res per actualitzar (utilitzeu urpmi.addmedia per afegir una font)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2724,22 +2782,22 @@ msgstr ""
"falta l'entrada per actualitzar\n"
"(una de %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "s'està ignorant la font %s"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "s'està habilitant la font %s"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2756,7 +2814,7 @@ msgstr ""
"\n"
"sintaxi:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2765,50 +2823,50 @@ msgstr ""
" --searchmedia - utilitza només les fonts donades per cercar (o "
"actualitzar) paquets.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - utilitza cerca difusa (igual que -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - llista els paquets disponibles.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - llista les fonts disponibles.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - llista les fonts disponibles i la seva url.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
" --list-nodes - llista els nodes disponibles quan s'utilitza --parallel.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - llista els àlias paral·lels disponibles.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr ""
" --src - el paquet següent és un paquet font (igual que -s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
@@ -2816,34 +2874,34 @@ msgstr ""
" --sources - dóna tots els paquets font abans de la baixada (només "
"'root').\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --url - mostra l'etiqueta url: url.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
" This permit to querying a distro.\n"
msgstr ""
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - mostra els canvis.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - imprimeix el resum.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - cerca inversa a que necessita el paquet.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2852,57 +2910,57 @@ msgstr ""
" --whatrequires-recursive\n"
" - cerca inversa a que necessita el paquet.\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -p - busca en 'provides' per a trobar paquets.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr ""
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - amplia la cerca a les dependències dels paquets.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - imprimeix grups amb el nom.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - mostra informació útil en un forma llegible pels humans.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - llista els fitxers del paquet.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - mode silenciós.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr ""
" -r - mostra la versió i llançament juntament amb el nom.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - el següent paquet és un paquet font (igual que --src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2911,53 +2969,64 @@ msgstr ""
" -u - elimina el paquet si hi ha instal·lada una versió més "
"nova.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - força una cerca difusa (igual que --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
" noms o fitxers rpm subministrats en la línia d'ordres seran demanats.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes només es pot usar amb --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "No s'ha trobat la llista de canvis\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Els següents paquets tenen signatures dolentes:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Voleu continuar amb la instal·lació?"
+
#, fuzzy
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Necessiteu ser el superusuari per usar aquesta ordre! \n"
@@ -3231,9 +3300,6 @@ msgstr "No s'ha trobat la llista de canvis\n"
#~ "Alguns dels paquets demanats no es poden instal·lar:\n"
#~ "%s"
-#~ msgid "unable to write file [%s]"
-#~ msgstr "no s'ha pogut escriure el fitxer [%s]"
-
#~ msgid "found version %s and arch %s ..."
#~ msgstr "s'ha trobat la versió %s i arquitectura %s ..."
diff --git a/po/cs.po b/po/cs.po
index 35e5fdbb..e7cb1f13 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2007-03-26 15:25+0200\n"
"Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
@@ -24,7 +24,7 @@ msgstr ""
"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:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "Instalace RPM"
@@ -34,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:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -101,7 +101,7 @@ msgstr "_Instalovat"
msgid "_Save"
msgstr "_Uložit"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Přerušit"
@@ -121,17 +121,17 @@ msgstr "Neznámá volba %s"
msgid "No packages specified"
msgstr "Nebyly zadány žádné balíčky"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Čekejte prosím..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "Nutný root"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -142,42 +142,42 @@ msgstr ""
"%s\n"
"Pokračovat i přesto v instalaci?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Varování"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "OK"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (k aktualizaci)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (k instalaci)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "Výběr balíčků"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Je zapotřebí jeden z následujících balíčků:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Přerušit"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -188,19 +188,19 @@ msgstr ""
"%s\n"
"Pokračovat i přesto v instalaci?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, c-format
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:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, c-format
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:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
@@ -208,40 +208,42 @@ msgstr[0] "(%d balíček, %d MB)"
msgstr[1] "(%d balíčky, %d MB)"
msgstr[2] "(%d balíčků, %d MB)"
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Instalace balíčku..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "nelze získat zdrojový balíček, končím"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Připravuji..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instaluji balíček `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Prosím vložte médium nazvané \"%s\" do zařízení [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Stahuje se balíček `%s'..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Následující balíčky mají chybné podpisy:\n"
-"%s\n"
-"\n"
-"Chcete pokračovat v instalaci?"
+msgid "_Done"
+msgstr "_Hotovo"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -252,41 +254,27 @@ msgstr ""
"%s\n"
"Možná potřebujete aktualizovat vaši databázi urpmi"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "odstraňuje se %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Připravuji..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instaluji balíček `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Hotovo"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, c-format
msgid "Installation failed:"
msgstr "Instalace selhala:"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "vše je již nainstalováno"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Instalace dokončena"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "odstraňuje se %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -321,7 +309,7 @@ msgstr " -f - vypíše plný název balíčku rpm (NVRA)\n"
msgid " defaults to %s.\n"
msgstr " výchozí je %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Instalovat balíčky může pouze uživatel root"
@@ -331,100 +319,100 @@ 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:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "nelze otevřít databázi rpmdb"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
"nalezeno %d hlaviček rpm ve vyrovnávací paměti, odstraňuji %d zastaralých "
"hlaviček"
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "neplatný název rpm souboru [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "načítám rpm soubor [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...načítání ukončeno"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...načítání selhalo: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "nelze zpřístupnit rpm soubor [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "nelze zpracovat soubor SPEC %s [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "nelze registrovat rpm soubor"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Nekompatibilní architektura pro rpm [%s]"
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "chyba při registraci lokálních balíčků"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, 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:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "špatně zadaná proxy na příkazové řádce\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr "adresář chroot neexistuje"
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: nemohu přečíst rpm soubor \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
+#, c-format
+msgid "chroot directory doesn't exist"
+msgstr "adresář chroot neexistuje"
+
+#: ../urpm/args.pm:424
#, c-format
msgid "Can't use %s without %s"
msgstr "Nelze použít %s bez %s"
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
#, c-format
msgid "Can't use %s with %s"
msgstr "Nelze použít %s zároveň s %s"
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr "Příliš mnoho parametrů\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "vytvářím syntézu pro hdlist pro zdroj \"%s\""
@@ -613,7 +601,12 @@ msgstr "balíček %s nenalezen."
msgid "malformed URL: [%s]"
msgstr "zkreslené URL: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "načítám rpm soubory ze zdroje \"%s\"..."
@@ -623,7 +616,7 @@ msgstr "načítám rpm soubory ze zdroje \"%s\"..."
msgid "[repackaging]"
msgstr "[přebaluje se]"
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -631,37 +624,42 @@ msgstr ""
"vytvořena transakce pro instalaci na %s (odstranění=%d, instalace=%d, "
"aktualizace=%d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "nelze vytvořit transakci"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, 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:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "přidávám balíček %s (id=%d, eid=%d, aktualizace=%d, soubor=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "nelze nainstalovat balíček %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "odstraňuje se balíček %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "odstraňuje se balíček %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "odstraňují se instalované balíčky rpm (%s) z %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Více informací o balíčku %s"
@@ -691,11 +689,104 @@ msgstr "Nebyl zadán žádný základ"
msgid "Cannot connect to ldap uri:"
msgstr "Nelze se připojit k URI LDAP:"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "databáze %s je zamknutá"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Varování"
+
+#: ../urpm/lock.pm:65
#, c-format
msgid "%s database locked"
msgstr "databáze %s je zamknutá"
+#: ../urpm/main_loop.pm:99
+#, c-format
+msgid "The following package has bad signature"
+msgstr "Následující balíček má špatnou signaturu"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Následující balíčky mají špatné signatury"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Chcete pokračovat v instalaci?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Chyba při instalaci"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "distribuuji %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "instaluji %s z %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "instaluji %s"
+
+#: ../urpm/main_loop.pm:187
+#, 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:205
+#, 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:247
+#, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "Selhala %d instalační transakce"
+msgstr[1] "Selhaly %d instalační transakce"
+msgstr[2] "Selhalo %d instalačních transakcí"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Instalace je možná"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr "Balíčky jsou aktuální"
+
+#: ../urpm/main_loop.pm:271
+#, c-format
+msgid "Package %s is already installed"
+msgstr "Balíček %s je již nainstalován"
+
+#: ../urpm/main_loop.pm:272
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Balíčky %s jsou již nainstalovány"
+
+#: ../urpm/main_loop.pm:275
+#, c-format
+msgid "Package %s can not be installed"
+msgstr "Balíček %s nelze nainstalovat"
+
+#: ../urpm/main_loop.pm:276
+#, c-format
+msgid "Packages %s can not be installed"
+msgstr "Balíčky %s nelze nainstalovat"
+
#: ../urpm/md5sum.pm:23
#, c-format
msgid "examining %s file"
@@ -747,7 +838,7 @@ msgstr "\"synthesis\" by nemělo být nastaveno (zdroj \"%s\")"
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "\"synthesis\" by mělo být nastaveno (zdroj \"%s\")"
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr ""
@@ -840,7 +931,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Hledání začátek: %s konec: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "počítám závislosti v druhém průchodu\n"
@@ -905,67 +996,72 @@ msgstr "nelze zpracovat media.cfg"
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:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "pokouším se vybrat neexistující zdroj \"%s\""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "vybírám více zdrojů: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "odebírám zdroj \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "přenastavuji urpmi pro zdroj \"%s\""
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...přenastavení selhalo"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "přenastaveno"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Chyba při generování jmen souboru: závislost %d nenalezena"
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr "Chyba při generování jmen souboru: nemožné zapisovat do souboru (%s)"
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "zdroj \"%s\" je aktuální"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "zpracovávám soubor hdlist [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "zpracovávám soubor syntézy [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "vytvářím hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -974,81 +1070,81 @@ msgstr ""
"Nelze sestavit soubor se syntézou pro zdroj \"%s\". Váš soubor hdlist může "
"být poškozen."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problém při čtení souboru se syntézou nebo hdlist zdroje \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "kopíruji [%s] pro zdroj \"%s\"..."
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...kopírování selhalo"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopíruji soubor s popisy pro \"%s\"..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...kopírování ukončeno"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, 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:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr ""
"počítám sumu md5 zkopírovaného zdrojového souboru hdlist (nebo soubor se "
"syntézou)"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "kopírování [%s] selhalo (chyba v kontrolním součtu md5sum)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr ""
"počítám součet md5 získaného zdrojového souboru hdlist (nebo souboru se "
"syntézou)"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...načítání selhalo: nerovnají se součty md5"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "nebyl nalezen žádný soubor RPM na [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "načítám soubory RPM z [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "nelze číst soubory RPM z [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "nelze číst soubory RPM"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1058,74 +1154,74 @@ msgstr ""
"nelze přistupovat ke zdroji \"%s\",\n"
"což se může stát, pokud jste ručně připojili adresář při vytváření zdroje."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "neplatný soubor hdlist %s pro zdroj \"%s\""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "načítám zdrojový hdlist (nebo soubor se syntézou) pro \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "nalezen zdrojový hdlist (nebo soubor se syntézou) jako %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "nebyl nalezen soubor hdlist pro zdroj \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "zkoumá se soubor s veřejnými klíči \"%s\"..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, 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:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "nelze importovat soubor s veřejnými klíči \"%s\""
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "zapisuji seznam souborů pro zdroj \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, c-format
msgid "updated medium \"%s\""
msgstr "aktualizován zdroj \"%s\""
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "nelze zpracovat soubor hdlist pro zdroj \"%s\""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, 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:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "načítám hlavičky ze zdroje \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "AaYy"
@@ -1185,47 +1281,52 @@ msgstr "nesouvislé médium \"%s\" je označeno jako vyjímatelné, ale není"
msgid "unable to access medium \"%s\""
msgstr "nelze přistoupit na zdroj \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Žádný balíček s názvem %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Následující balíčky obsahují: %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "z důvodu chybějícího %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Balíček %s je již nainstalován"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "z důvodu nesplněného %s"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "pokouším se postoupit %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "aby bylo možné zachovat %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "pro instalaci %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "z důvodu konfliktů s %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "nevyžádán"
@@ -1245,6 +1346,16 @@ msgstr "Neplatné ID klíče (%s)"
msgid "Missing signature (%s)"
msgstr "Chybí podpis (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Nelze vytvořit soubor s nastavením [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Kopírování selhalo"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1262,8 +1373,8 @@ msgstr ""
"\n"
"použití:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1279,20 +1390,20 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - zkontrolovat, zda lze dokončit odstranění správně.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, 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"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, 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"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Před smazáním znovu zabalí soubory\n"
@@ -1303,8 +1414,8 @@ msgid " --root - use another root for rpm removal.\n"
msgstr ""
" --root - použít pro odebrání balíčků jiný kořenový adresář.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
@@ -1325,17 +1436,17 @@ msgstr ""
" --use-distrib - nastavit urpme za provozu ze stromu distribuce, užitečné\n"
" při (od)instalaci chroot s volbou --root.\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - použije soubor se syntézou.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - použije soubor hdlist.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - užvaněný režim.\n"
@@ -1345,37 +1456,37 @@ msgstr " --verbose, -v - užvaněný režim.\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - vybere všechny balíčky vyhovující výrazu.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Odstranit balíčky může pouze uživatel root"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "neznámé balíčky"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "neznámý balíček"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "odebrání balíčku %s naruší funkčnost vašeho systému"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Není co odebrat"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Kontrola odebrání následujících balíčků"
-#: ../urpme:134
+#: ../urpme:131
#, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1384,12 +1495,12 @@ 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ů"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr " (%d MB)"
-#: ../urpme:138
+#: ../urpme:135
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
@@ -1397,12 +1508,12 @@ msgstr[0] "Odstranit %d balíček?"
msgstr[1] "Odstranit %d balíčky?"
msgstr[2] "Odstranit %d balíčků?"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (a/N) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Odebírání selhalo"
@@ -1429,13 +1540,13 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - vypíše číslo verze tohoto nástroje.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../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"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr " --excludemedia - nepoužít zadané zdroje, oddělené čárkami.\n"
@@ -1448,12 +1559,12 @@ msgstr ""
" --literal, -l - neporovnávat vzory, použije se parametr jako prostý "
"řetězec.\n"
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../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"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1466,7 +1577,7 @@ msgid " --use-distrib - use the given path to access media\n"
msgstr ""
" --synthesis - použít daný soubor se syntézou místo databáze urpmi.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1477,7 +1588,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - nevytiskne stejné řádky.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - použít pouze aktualizaci zdroje.\n"
@@ -1612,77 +1723,87 @@ msgid " --group - group\n"
msgstr " --group - skupina\n"
#: ../urpmf:72
+#, fuzzy, c-format
+msgid " --license - license\n"
+msgstr " --name - název balíčku\n"
+
+#: ../urpmf:73
#, c-format
msgid " --name - package name\n"
msgstr " --name - název balíčku\n"
-#: ../urpmf:73
+#: ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - co se nahrazuje (dělá zastaralým)\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr " --packager - kdo vytvořil balíček\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - co se poskytuje\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - co se požaduje\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, c-format
msgid " --size - installed size\n"
msgstr " --size - instalovaná velikost\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - název zdrojového balíčku rpm\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - co se nahrazuje (dělá zastaralým)\n"
+
+#: ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr " --summary - shrnutí\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, c-format
msgid " --url - url\n"
msgstr " --url - URL\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, c-format
msgid " --vendor - vendor\n"
msgstr " --vendor - dodavatel\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -m - zdroj, ve kterém byl balíček nalezen\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, 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"
-#: ../urpmf:140
+#: ../urpmf:142
#, 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"
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "používá se specifické prostředí na %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1691,12 +1812,12 @@ msgstr ""
"Poznámka: urpmf nemohl vrátit žádné výsledky, neboť žádný z prohledávaných "
"zdrojů nepoužívá soubor hdlist\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Chcete-li hledat názvy balíčků, můžete chtít použít přepínač --name.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1713,7 +1834,7 @@ msgstr ""
"\n"
"použití:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1721,7 +1842,7 @@ msgstr ""
" --searchmedia - použít pouze zadané zdroje pro vyhledávání požadovaných "
"balíčků.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
@@ -1730,30 +1851,30 @@ msgstr ""
" --auto - neinteraktivní mód, použije implicitní odpovědi k "
"otázkám.\n"
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../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"
-#: ../urpmi:93
+#: ../urpmi:89
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
" --auto-update - provede aktualizaci zdrojů a poté aktualizaci systému.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - vypnout kontrolu souborů MD5SUM.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - přinutí k aktualizaci klíče gpg.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1762,12 +1883,12 @@ msgstr ""
" --no-uninstall - nikdy se neptat na odstranění balíčku, přerušit "
"instalaci.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - neinstalovat balíčky (pouze stáhnout)\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1777,7 +1898,7 @@ msgstr ""
"požadovaných\n"
" balíčků, které vyžadují odstranění jiných.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1789,40 +1910,46 @@ msgstr ""
" aktualizovat více balíčků než zadaná hodnota,\n"
" výchozí hodnota je %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - malé velikost transakce, výchozí je %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy, -y - vynutit přibližné vyhledávání.\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src, -s - další balíček je zdrojový.\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
" --install-src - instalovat pouze balíček se zdroji (bez binárních "
"souborů).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, 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"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - neodstraňovat rpm balíčky z vyrovnávací paměti.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1831,7 +1958,7 @@ msgstr ""
" --allow-nodeps - povolí žádost na uživatele, aby instaloval balíčky bez\n"
" kontroly závislostí.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1840,13 +1967,13 @@ msgstr ""
" --allow-force - povolí žádost na uživatele, aby instaloval balíčky bez\n"
" kontroly závislostí a integrity.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr ""
" --root - použít pro instalaci balíčků jiný kořenový adresář.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1855,47 +1982,47 @@ msgstr ""
" --use-distrib - nastavit urpmi za provozu ze stromu distribuce, užitečné\n"
" při instalaci chroot s volbou --root.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - použije program wget pro načtení souborů.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - použije program curl pro načtení souborů.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --prozilla - použije program prozilla pro načtení souborů.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr " --curl-options - další volby k programu curl\n"
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr " --rsync-options- další volby k programu rsync\n"
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr " --wget-options - další volby k programu wget\n"
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr " --prozilla-options - další volby k programu prozilla\n"
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - omezení rychlosti stahování.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1904,7 +2031,7 @@ msgstr ""
" --resume - obnoví stahování částečně stažených souborů\n"
" (--no-resume obnovení zakáže, implicitně je zakázáno).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1913,7 +2040,7 @@ msgstr ""
" --proxy - použij zadanou HTTP proxy, číslo portu se předpokládá\n"
" 1080, jako výchozí (formát je <proxyhost[:port]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1922,7 +2049,7 @@ msgstr ""
" --proxy-user - uživatel a heslo, které se má použít u ověření\n"
" proxy (formát je <uživatel:heslo>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1931,7 +2058,7 @@ msgstr ""
" --bug - vygeneruje hlášení o chybě do adresáře \n"
" zadaného následujícím parametrem.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1940,7 +2067,7 @@ msgstr ""
" --verify-rpm - zkontroluje před instalací podpis balíčku RPM\n"
" (volba --no-verify-rpm toto vypne, jinak povoleno).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
@@ -1948,37 +2075,42 @@ msgid ""
msgstr ""
" --test - pouze zkontrolovat, zda lze provést instalacisprávně.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - nebrat v úvahu cestu oddělenou čárkami.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - vynechá soubory s dokumentací.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr " --ignoresize - před instalací nekontrolovat prostor na disku.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --ignorearch - dovolí instalovat balíčky z jiných architektur.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - nespustí skript(y) balíčku\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, 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:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - balíčky, jejichž instalace by měla být přeskočena\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1987,49 +2119,49 @@ msgstr ""
" --more-choices - pokud je nalezeno více balíčků, bude se nabízet "
"více voleb než implicitně.\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - nezamkne se databáze balíčků RPM.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
" --strict-arch - aktualizovat pouze balíčky se shodnou architekturou.\n"
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - vybere všechny vyhovující z příkazové řádky.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, 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"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - nehledá balíček v položkách provides.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - režim bez výpisů.\n"
-#: ../urpmi:157
+#: ../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"
-#: ../urpmi:186
+#: ../urpmi:184
#, 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:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2038,12 +2170,12 @@ 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:220
+#: ../urpmi:218
#, 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:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2052,7 +2184,7 @@ msgstr ""
"Adresář [%s] již existuje, použijte prosím pro hlášení o chybě jiný adresář "
"nebo jej odstraňte"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Nelze vytvořit adresář [%s] pro uložení hlášení o chybě"
@@ -2062,7 +2194,7 @@ msgstr "Nelze vytvořit adresář [%s] pro uložení hlášení o chybě"
msgid "Environment directory %s does not exist"
msgstr "složka prostředí %s neexistuje"
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2071,46 +2203,48 @@ msgstr ""
"Chyba: %s vypadá, že je připojen pouze ke čtení.\n"
"Použijte --allow-force, chcete-li operaci provést."
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr "Obnovuji media...\n"
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (k aktualizaci)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (k aktualizaci)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (k instalaci)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, c-format
msgid "%s (to install)"
msgstr "%s (k instalaci)"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "Aby byly splněny závislosti, bude odebrán %d balíček"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Jaká je vaše volba? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2121,7 +2255,7 @@ msgstr ""
"které jsou starší než instalovaná verze:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2132,7 +2266,7 @@ msgstr ""
"které jsou starší než instalovaná verze:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, c-format
msgid ""
"\n"
@@ -2141,12 +2275,12 @@ msgstr ""
"\n"
"Přesto pokračovat v instalaci?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (A/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2155,7 +2289,7 @@ msgstr ""
"Požadovaný balíček nelze nainstalovat:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2164,7 +2298,7 @@ msgstr ""
"Některé požadované balíčky nebylo možné nainstalovat:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2175,7 +2309,7 @@ msgstr ""
"být odstraněn, aby bylo možné jiné aktualizovat:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2186,7 +2320,7 @@ msgstr ""
"být odstraněny, aby bylo možné jiné aktualizovat:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2195,7 +2329,7 @@ msgstr ""
"Následující balíček musí být odstraněn, aby bylo možné jiné aktualizovat:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2204,12 +2338,17 @@ msgstr ""
"Následující balíčky musí být odstraněny, aby bylo možné jiné aktualizovat:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(pouze test, k odstranění ve skutečnosti nedojde)"
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2218,12 +2357,12 @@ msgstr ""
"Pro instalaci následujících závislostí potřebujete mít právo root:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(pouze test, k instalaci ve skutečnosti nedojde)"
-#: ../urpmi:597
+#: ../urpmi:617
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2231,100 +2370,17 @@ 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:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Stiskněte klávesu Enter až budete připraveni..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Zrušit"
-#: ../urpmi:671
-#, c-format
-msgid "The following package has bad signature"
-msgstr "Následující balíček má špatnou signaturu"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Následující balíčky mají špatné signatury"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Chcete pokračovat v instalaci?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Chyba při instalaci"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "distribuuji %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "instaluji %s z %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "instaluji %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Mám zkusit instalaci bez kontroly závislostí? (a/N) "
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Mám zkusit instalaci ještě razantněji (--force)? (a/N) "
-
-#: ../urpmi:815
-#, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "Selhala %d instalační transakce"
-msgstr[1] "Selhaly %d instalační transakce"
-msgstr[2] "Selhalo %d instalačních transakcí"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Instalace je možná"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr "Balíčky jsou aktuální"
-
-#: ../urpmi:838
-#, c-format
-msgid "Package %s is already installed"
-msgstr "Balíček %s je již nainstalován"
-
-#: ../urpmi:839
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Balíčky %s jsou již nainstalovány"
-
-#: ../urpmi:842
-#, c-format
-msgid "Package %s can not be installed"
-msgstr "Balíček %s nelze nainstalovat"
-
-#: ../urpmi:843
-#, c-format
-msgid "Packages %s can not be installed"
-msgstr "Balíčky %s nelze nainstalovat"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "restartuji urpmi"
@@ -2455,32 +2511,32 @@ msgstr " -v - režim s výpisy.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "nelze aktualizovat zdroj \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, fuzzy, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr "chybné <url> (pro lokální adresář musí být cesta absolutní)\n"
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Přidat zdroj může pouze uživatel root"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, c-format
msgid "creating config file [%s]"
msgstr "vytvářím soubor s nastavením [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "Nelze vytvořit soubor s nastavením [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "s volbou --distrib není třeba zadávat <relativní cesta k hdlistu>"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
@@ -2489,17 +2545,17 @@ msgstr ""
"\n"
"Chcete přidat zdroje '%s'"
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<relativní cesta k hdlistu> chybí\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr "Nelze použít %s se vzdáleným zdrojem"
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "nelze vytvořit zdroj \"%s\"\n"
@@ -2663,17 +2719,17 @@ msgstr " -a - vybere všechna média.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - přibližná shoda v názvu zdroje.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Odstranit zdroj může pouze uživatel root"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "nic k odebrání (použijte urpmi.addmedia pro přidání zdroje)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2729,17 +2785,17 @@ msgstr " -a - vybere všechna nevyjímatelná média.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - vynutí aktualizaci souborů syntézy/hdlist\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Aktualizovat zdroj může pouze uživatel root"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "nic k aktualizaci (použijte urpmi.addmedia pro přidání zdroje)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2748,22 +2804,22 @@ msgstr ""
"záznam pro update chybí\n"
"(jeden z %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "ignoruji zdroj %s"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "zapínám zdroj %s"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2780,7 +2836,7 @@ msgstr ""
"\n"
"použití:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2789,51 +2845,51 @@ msgstr ""
" --searchmedia - použít pouze zadané zdroje pro vyhledávání požadovaných "
"(nebo aktualizaovaných) balíčků.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - vnutit fuzzy vyhledávání. (stejné jako -y)\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - vypíše balíčky, které jsou k dispozici.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - vypíše seznam dostupných zdrojů.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - vypíše seznam dostupných zdrojů a jejich url.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
" --list-nodes - vypíše seznam uzlů k dispozici při použití volby --"
"parallel.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - seznam dostupných paralelních přezdívek.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, 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"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr " --src - další balíček je zdrojový (stejné jako -s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
@@ -2841,13 +2897,13 @@ msgstr ""
" --sources - všechny zdrojové balíčky před stažením (pouze uživatel "
"root).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr ""
" --ignorearch - povolí dotazy na balíčky RPM pro jiné architektury.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2856,22 +2912,22 @@ msgstr ""
" --use-distrib - nastaví urpmi za provozu ze stromu distribuce.\n"
" To umožní dotaz na distribuci.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - vytiskne změnový log.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - vypíše shrnutí.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - reverzní vyhledávání požadavků balíčku.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2881,7 +2937,7 @@ msgstr ""
" - rozšířené reverzní vyhledávání balíčků (včetně "
"virtuálních balíčků).\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, c-format
msgid ""
" --whatprovides, -p\n"
@@ -2890,48 +2946,48 @@ msgstr ""
" --whatprovides, -p\n"
" - bude hledat balíček v položkách provides.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - doplnit výstup balíčkem k odebrání.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - rozšířený dotaz na závislosti balíčku.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - vypíše tag skupin společně se jménem.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, 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"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - vypíše soubory v balíčku.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, c-format
msgid " -m - equivalent to -du\n"
msgstr " -m - stejné jako -du\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - společně se jménem vypíše verzi a vydání.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - další balíček je zdrojový (stejné jako --src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2939,49 +2995,49 @@ msgid ""
msgstr ""
" -u - odebere balíček pokud je již instalována novější verze.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - vnutit fuzzy vyhledávání (stejné jako --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -Y - jako -y, ale ignoruje velká a malá písmena.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, 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"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "volbu --list-nodes lze použít pouze s volbou --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
"pro zdroj \"%s\" neexistuje soubor hdlist, pouze částečný výsledek pro "
"balíček %s"
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"pro zdroj \"%s\" neexistuje soubor hdlist, pouze částečný výsledek pro "
"balíčky %s"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
"pro zdroj \"%s\" neexistuje soubor hdlist, nelze vrátit žádný výsledek pro "
"balíček %s"
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2989,11 +3045,22 @@ msgstr ""
"pro zdroj \"%s\" neexistuje soubor hdlist, nelze vrátit žádný výsledek pro "
"balíčky %s"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Nebyl nalezen záznam změn\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Následující balíčky mají chybné podpisy:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Chcete pokračovat v instalaci?"
+
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Pro použití volby --use-distrib musíte být root"
diff --git a/po/cy.po b/po/cy.po
index dfd1ea14..fa89aace 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2007-03-02 20:33-0000\n"
"Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
"Language-Team: Cymraeg\n"
@@ -20,7 +20,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n == 2) ? 1 : 0;\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "Gosod RPM"
@@ -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:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Iawn"
@@ -96,7 +96,7 @@ msgstr "_Gosod"
msgid "_Save"
msgstr "_Cadw"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Dileu"
@@ -116,17 +116,17 @@ msgstr "Dewis anhysbys %s"
msgid "No packages specified"
msgstr "Heb enwi pecyn"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Arhoswch..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "Rhaid bod yn root"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -137,42 +137,42 @@ msgstr ""
"%s\n"
"Parhau beth bynnag?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Rhybudd"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Iawn"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr "(uwchraddio)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr "(gosod)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "Dewis pecyn"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Mae angen un o'r pecynnau canlynol:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Atal"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -183,59 +183,61 @@ msgstr ""
"%s\n"
"Parhau beth bynnag?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, 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:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, 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:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, 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:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Gosod y pecyn..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "methu estyn pecynnau ffynhonnell, atal"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Paratoi..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Gosod pecyn `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Llwytho pecynnau i lawr ' %s'..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Mae gan y pecynnau canlynol lofnod gwallus:\n"
-"%s\n"
-"\n"
-"Hoffech chi barhau gyda'r gosod?"
+msgid "_Done"
+msgstr "_Gorffen"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -246,41 +248,27 @@ msgstr ""
"%s\n"
"Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "tynnu %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Paratoi..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Gosod pecyn `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Gorffen"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, c-format
msgid "Installation failed:"
msgstr "Methodd y gosod:"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Popeth wedi eu gosod eisoes"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Cwblhawyd y gosod"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "tynnu %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -315,7 +303,7 @@ msgstr " -f - allbynnu enw llawn rpm (NVRA)\n"
msgid " defaults to %s.\n"
msgstr " rhagosodedig yw %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
@@ -325,98 +313,98 @@ msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
msgid "Running urpmi in restricted mode..."
msgstr "Rhedeg urpmi mewn modd cyfyngedig..."
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "methu agor rpmdb"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr "wedi canfod %d pennawd rpm yn yr ystorfa, tynnu %d hen bennawd"
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "enw ffeil rpm annilys [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "adfer ffeil rpm (%s)..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr ".cwblhau adfer"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "... methodd ail-lwytho: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "methu cael mynediad ffeil rpm (%s)"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "methu didoli ffeil spec %s [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "methu cofrestr ffeil rpm"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Saernïaeth anghydnaws ar gyfer rpm [%s]"
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "gwall cofrestru pecynnau lleol"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Mae'r weithred yn waharddedig wrth redeg ym modd cyfyngedig"
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "datganiad dirprwy gwallus ar y llinell orchymyn\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr "Nid yw cyfeiriadur chroot yn bodoli"
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
+#, c-format
+msgid "chroot directory doesn't exist"
+msgstr "Nid yw cyfeiriadur chroot yn bodoli"
+
+#: ../urpm/args.pm:424
#, c-format
msgid "Can't use %s without %s"
msgstr "Methu defnyddio %s heb %s"
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
#, c-format
msgid "Can't use %s with %s"
msgstr "Methu defnyddio %s gyda %s"
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr "Gormod o ymresymiadau\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "adeiladu ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
@@ -605,7 +593,12 @@ msgstr "heb ganfod pecyn %s"
msgid "malformed URL: [%s]"
msgstr "URL gwallus: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "adfer ffeiliau rpm o gyfrwng [%s]"
@@ -615,44 +608,49 @@ msgstr "adfer ffeiliau rpm o gyfrwng [%s]"
msgid "[repackaging]"
msgstr "[ailbecynnu]"
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, 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:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "methu creu trosglwyddiad."
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "methu tynnu rpm o becyn delta-rpm %s"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "ychwanegu pecyn %s (id=%d, eid=%d, update=%d, file=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "methu gosod pecyn %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "tynnu pecyn %s."
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "tynnu pecyn %s."
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "tynnu rpm wedi eu gosod (%s) o %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Rhagor o wybodaeth ar becyn %s"
@@ -682,11 +680,103 @@ msgstr "Sail heb ei ddiffinio"
msgid "Cannot connect to ldap uri:"
msgstr "Methu cysylltu æg uri ldap:"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "Cronfa ddata %s wedi cloi"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Rhybudd"
+
+#: ../urpm/lock.pm:65
#, c-format
msgid "%s database locked"
msgstr "Cronfa ddata %s wedi cloi"
+#: ../urpm/main_loop.pm:99
+#, c-format
+msgid "The following package has bad signature"
+msgstr "Mae gan y pecyn canlynol lofnod gwallus"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Mae gan y pecynnau canlynol lofnod gwallus"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Ydych chi am barhau gosod?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Methodd y gosod"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "dosbarthu %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "gosod %s o %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "gosod %s"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)"
+
+#: ../urpm/main_loop.pm:205
+#, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "Mwy o orfodaeth gyda'r gosod? (--force)? (y/N)"
+
+#: ../urpm/main_loop.pm:247
+#, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "methodd trosglwyddiad gosod %d"
+msgstr[1] "methodd trosglwyddiad gosod %d"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Gosod yn bosibl"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr "Mae'r pecynnau'n rhai diweddaraf"
+
+#: ../urpm/main_loop.pm:271
+#, c-format
+msgid "Package %s is already installed"
+msgstr "Pecyn %s wedi ei osod eisoes"
+
+#: ../urpm/main_loop.pm:272
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Pecynnau %s wedi eu gosod eisoes"
+
+#: ../urpm/main_loop.pm:275
+#, c-format
+msgid "Package %s can not be installed"
+msgstr "Methu gosod pecyn %s"
+
+#: ../urpm/main_loop.pm:276
+#, c-format
+msgid "Packages %s can not be installed"
+msgstr "Methu gosod pecynnau %s"
+
#: ../urpm/md5sum.pm:23
#, c-format
msgid "examining %s file"
@@ -736,7 +826,7 @@ msgstr "nid ddylai \"synthesis\" gael ei osod (canolig \"%s\")"
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "\"synthesis\" i'w osod (canolig \"%s\")"
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "methu cael mynediad i ffeil hdlist\"%s\", anwybyddu'r cyfrwng"
@@ -830,7 +920,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Cychwyn chwilio: %s diwedd: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "cyflawni ail ymgais i gyfrifo dibyniaethau\n"
@@ -896,67 +986,72 @@ msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"methu cael mynediad at gyfrwng y dosbarthiad (heb ganfod ffeil media.cfg)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "ceisio dewis y cyfrwng nad yw'n bod \"%s\""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "dewis aml-gyfrwng: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "dewis cyfrwng \"%s\":"
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "ail-ffurfweddu urpmi ar gyfer cyfrwng \"%s\""
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...methodd ail-ffurfweddu"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "cwblhau ail-ffurfweddu"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Gwall wrth gynhyrchu ffeil enwau: heb ganfod dibyniaeth %d"
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr "Gwall wrth gynhyrchu ffeil enwau: Methu ysgrifennu ffeil (%s)"
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "cyfrwng \"%s\" wedi ei ddiweddaru"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "archwilio ffeil hdlist [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "archwilio ffeil synthesis [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "adeiladu hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -965,77 +1060,77 @@ msgstr ""
"Methu adeiladu ffeil synthesis ar gyfer cyfrwng \"%s\". Efallai bod eich "
"ffeil hdlist yn llygredig."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problem darllen hdlist neu ffeil synthesis y cyfrwng \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "copïo [%s] ar gyfer cyfrwng \"%s\"..."
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...methodd y copïo"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "copïo ffeil disgrifiad o \"%s\""
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...cwblhau'r copïo"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "methodd copïo (%s) (Mae'r ffeil yn rhy fach)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "cyfrifo md5sum o ffynhonnell hdlist gopïwyd (neu synthesis)"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "methodd copïo (%s) (md5sum gwallus)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "cyfrifo md5sum o ffynhonnell hdlist adferwyd (neu synthesis)"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "... methodd ail-lwytho: anghysondeb md5sum"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "heb ganfod ffeiliau rpm o [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "darllen ffeiliau rpm o [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "methu darllen ffeiliau rpm o (%s): %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "heb ddarllen rpmau"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1045,67 +1140,67 @@ msgstr ""
"maethu cael mynediad i gyfrwng \"%s\",\n"
"gall hyn ddigwydd os ydych wedi gosod y cyfeiriadur wrth greu'r cyfrwng."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ffeil hdlist annilys %s ar gyfer cyfrwng \"%s\""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "adfer ffynhonnell hdlist (neu synthesis) \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "canfod hdlist (neu synthesis) holwyd fel %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "dim ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "archwilio ffeil pubkey \"%s\""
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...allwedd %s wedi ei fewnforio o ffeil pubkey \"%s\""
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "methu mewnforio ffeil pubkey \"%s\""
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "ysgrifennu rhestr ffeil ar gyfer cyfrwng \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, c-format
msgid "updated medium \"%s\""
msgstr "cyfrwng \"%s\" wedi ei ddiweddaru"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "methu didoli ffeil hdlist \"%s\""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "anhawster darllen synthesis ffeil cyfrwng \"%s\""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "darllen pennawd o'r cyfrwng \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
@@ -1115,8 +1210,8 @@ 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:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "Yy"
@@ -1176,47 +1271,52 @@ msgstr "cyfrwng annealladwy \"%s\" wedi ei nodi'n symudadwy ond nid yw"
msgid "unable to access medium \"%s\""
msgstr "methu cael mynediad at gyfrwng. \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Dim pecyn o'r enw %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "oherwydd %s coll"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Pecyn %s wedi ei osod eisoes"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "%s heb ei foddloni"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "ceisio hybu %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "fel modd i gadw %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "er mwyn gosod %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "oherwydd gwrthdaro gyda %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "diofyn"
@@ -1236,6 +1336,16 @@ msgstr "Enw Allwedd Annilys (%s)"
msgid "Missing signature (%s)"
msgstr "Llofnod coll (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Methu creu ffeil Config (%s)"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Methodd y copïo"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1252,8 +1362,8 @@ msgstr ""
"\n"
"defnydd:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - argraffu neges cymorth.\n"
@@ -1268,7 +1378,7 @@ msgstr " --auto - dewis pecyn yn awtomatig o fewn dewisiadau.\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - gwirio os oes modd tynnu'n iawn.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
@@ -1276,13 +1386,13 @@ msgstr ""
" --force - gorfodi galwad hyd yn oed os na yw rhai pecynnau'n "
"bodoli.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
" --parallel - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Ailbecynnu'r ffeiliau cyn eu dileu\n"
@@ -1292,8 +1402,8 @@ 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:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
@@ -1314,17 +1424,17 @@ msgstr ""
" --use-distrib - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
" wrth (ddad)osod chroot gyda dewis --root.\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - defnyddio ffeil synthesis.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - defnyddio ffeil hdlist.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - modd llafar.\n"
@@ -1334,37 +1444,37 @@ msgstr " --verbose, -v - modd llafar.\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - select all packages matching expression.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Dim ond uwch ddefnyddiwr sy'n cael tynnu pecynnau"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "pecynnau anhysbys"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "pecyn anhysbys"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "bydd tynnu pecynnau %s yn torri'r system"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Dim i'w dynnu"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Ticio i ddileu'r pecynnau canlynol"
-#: ../urpme:134
+#: ../urpme:131
#, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1372,24 +1482,24 @@ msgid_plural ""
msgstr[0] "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu tynnu"
msgstr[1] "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu tynnu"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr " (%d MB)"
-#: ../urpme:138
+#: ../urpme:135
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "Tynnu pecynnau %d?"
msgstr[1] "Tynnu pecynnau %d?"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (y/N) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Methodd y tynnu"
@@ -1415,14 +1525,14 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - argraffu rhif fersiwn yr offeryn.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../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:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1436,12 +1546,12 @@ msgstr ""
" --literal, -l - peidio cydweddu patrymau, defnyddio ymresymiad fel llinyn "
"llythrennedd.\n"
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - defnyddio'r cyfrwng, wedi ei ran gan gollnod.\n"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1454,7 +1564,7 @@ msgstr ""
msgid " --use-distrib - use the given path to access media\n"
msgstr " --synthesis - defnyddio'r synthesis yn lle urpmi db.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../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"
@@ -1464,7 +1574,7 @@ msgstr " --synthesis - defnyddio'r synthesis yn lle urpmi db.\n"
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - peidio argraffu llinellau'r un fath.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - defnyddio cyfrwng diweddaru'n unig.\n"
@@ -1600,76 +1710,86 @@ msgid " --group - group\n"
msgstr " --group - grŵp\n"
#: ../urpmf:72
+#, fuzzy, c-format
+msgid " --license - license\n"
+msgstr " --name - enw'r pecyn\n"
+
+#: ../urpmf:73
#, c-format
msgid " --name - package name\n"
msgstr " --name - enw'r pecyn\n"
-#: ../urpmf:73
+#: ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - tagiau'r hen\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr " --packager - pecynydd\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - tag darparu\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - tagiau angenrhaid\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, c-format
msgid " --size - installed size\n"
msgstr " --size - maint wedi gosod\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - enw rpm ffynhonnell\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - tagiau'r hen\n"
+
+#: ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr " --summary - crynodeb\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, c-format
msgid " --url - url\n"
msgstr " --url - url\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, c-format
msgid " --vendor - vendor\n"
msgstr " --vendor - gwerthwr\n"
-#: ../urpmf:82
+#: ../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:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - argraffu fersiwn a rhyddhad ac arch gydag enw.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, 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:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "ddefnyddio amgylchedd penodol ar %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1678,12 +1798,12 @@ msgstr ""
"Sylw: gan nad oedd unrhyw gyfrwng chwiliwyd yn defnyddio hdlists, methodd "
"urpmf â chynnig canlyniad\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Efallai yr hoffech ddefnyddio --name i chwilio am enwau pecynnau.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1699,7 +1819,7 @@ msgstr ""
"\n"
"defnydd:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1707,7 +1827,7 @@ msgstr ""
" --searchmedia - defnyddio'r cyfrwng darparwyd i chwilio'r pecynnau "
"gofynnwyd.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
@@ -1716,41 +1836,41 @@ msgstr ""
" --auto - modd anrhyngweithiol, derbyn atebion rhagosodedig i "
"gwestiynau.\n"
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr " --auto-select - dewis pecynnau'n awtomatig i uwchraddio'r system.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr " --auto-update - diweddaru'r cyfrwng ac yna uwchraddio'r system.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - analluogi gwirio ffeil MD5SUM.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - gorfodi diweddaru allwedd gpg.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
"installation.\n"
msgstr " --no-uninstall - peidio gofyn i ddadosod pecyn, atal gosod.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr ""
" --no-install - peidio gosod y pecynnau (dim ond eu llwytho i lawr)\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1759,7 +1879,7 @@ msgstr ""
" --keep - cadw'r pecynnau presennol os yn bosibl, gwrthod\n"
" pecynnau sy'n arwain at dynnu.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1771,38 +1891,44 @@ msgstr ""
" eu gosod neu eu uwchraddio\n"
" rhagosodiad yw %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - hyd drosglwyddiad byr, rhagosodiad yw %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy - mynnu chwiliad bras.\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src, -s - pecyn nesaf yn becyn ffynhonnell.\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
" --install-src - gosod pecynnau ffynhonnell yn unig (dim binaries).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - tynnu rpm o'r storfa cyn unrhyw beth arall.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - peidio glanhau rpm o'r storfa.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1811,7 +1937,7 @@ msgstr ""
" --allow-nodeps - caniatáu gofyn i ddefnyddiwr i osod pecynnau heb\n"
" wirio dibyniaethau.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1820,12 +1946,12 @@ msgstr ""
" --allow-force - caniatáu gofyn i ddefnyddiwr osod pecyn heb\n"
" wirio dibyniaethau na'u cyfanrwydd.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - defnyddio root arall ar gyfer gosod rpm.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1834,47 +1960,47 @@ msgstr ""
" --use-distrib - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
" wrth osod chroot gyda dewis o --root.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - defnyddio wget i estyn ffeiliau pell.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - defnyddio curl i estyn ffeiliau pell.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --prozilla - defnyddio prozilla i estyn ffeiliau pell.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr " --curl-options - dewis ychwanegol wrth ddefnyddio curl\n"
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr " --rsync-options- dewis ychwanegol wrth ddefnyddio rsync\n"
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr " --wget-options - dewis ychwanegol wrth ddefnyddio wget\n"
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr " --cprozilla-options - dewis ychwanegol wrth ddefnyddio prozilla\n"
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - cyfyngu cyflymder y llwytho i lawr.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1883,7 +2009,7 @@ msgstr ""
" --verify-rpm - gwirio llofnod rpm cyn gosod\n"
" (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1892,7 +2018,7 @@ msgstr ""
" --proxy - defnyddio'r dirprwy HTTP enwyd, rhif y porth trwy\n"
" rhagosodiad yw 1080 (fformat yw <proxyhost[:port]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1901,7 +2027,7 @@ msgstr ""
" --proxy-user - enwi defnyddiwr a chyfrinair i'w ddefnyddio fel y\n"
" dilysiad dirprwy (fformat yw <user:password>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1910,7 +2036,7 @@ msgstr ""
" --bug - cynhyrchu adroddiad gwall i'r cyfeiriadur nodir gan\n"
" yr arg. nesaf\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1919,44 +2045,49 @@ msgstr ""
" --verify-rpm - gwirio llofnod rpm cyn gosod\n"
" (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr " --test - gwirio os oes modd gosod yn iawn.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - eithrio llwybr wedi ei wahanu a chollnod.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - eithrio ffeiliau docs.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr " --ignoresize - peidio gwirio maint ar ddisg cyn gosod.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --ignorearch - caniatáu gosod rpm ar gyfer saernïaeth annhebyg.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - peidio gweithredu sgripledi pecyn(au)\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - pecynnau dylid osgoi eu gosod.\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - pecynnau dylid osgoi eu gosod.\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1966,50 +2097,50 @@ msgstr ""
"ddewis\n"
" na'r rhagosodiad.\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - peidio cloi db rpm.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, 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:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - dewis pob cydweddiad ar y llinell gorchymyn.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - caniatáu i chwilio canfod pecyn.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - peidio chwilio yn provides i ganfod pecyn.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - modd distaw.\n"
-#: ../urpmi:157
+#: ../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:186
+#: ../urpmi:184
#, 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:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2019,12 +2150,12 @@ msgstr ""
"arferol\n"
"ynghyd a --bug.\n"
-#: ../urpmi:220
+#: ../urpmi:218
#, 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:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2033,7 +2164,7 @@ msgstr ""
"Mae cyfeiriadur (%s) yn bodoli eisoes, defnyddiwch gyfeiriadur arall am "
"adroddiad gwall neu ei ddileu."
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Methu creu cyfeiriadur (%s) ar gyfer adroddiad gwall"
@@ -2043,7 +2174,7 @@ msgstr "Methu creu cyfeiriadur (%s) ar gyfer adroddiad gwall"
msgid "Environment directory %s does not exist"
msgstr "Nid yw cyfeiriadur amgylchedd %s yn bodoli"
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2052,46 +2183,48 @@ msgstr ""
"Gwall: %s i weld wedi ei osod fel darllen yn unig.\n"
"Defnydd --allow-force gorfodaeth i orfodi gweithred."
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr "Diweddaru cyfrwng...\n"
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (uwchraddio)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (uwchraddio)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (gosod)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, c-format
msgid "%s (to install)"
msgstr "%s (gosod)"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu tynnu"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Beth yw eich dewis? (1-%d)"
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2102,7 +2235,7 @@ msgstr ""
"sy'n hyn na'r rhai sydd wedi eu gosod:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2113,7 +2246,7 @@ msgstr ""
"sy'n hyn na'r rhai sydd wedi eu gosod:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, c-format
msgid ""
"\n"
@@ -2122,12 +2255,12 @@ msgstr ""
"\n"
"Parhau i osod beth bynnag?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (Y/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2136,7 +2269,7 @@ msgstr ""
"Nid oes modd gosod pecyn gofynnwyd amdani:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2145,7 +2278,7 @@ msgstr ""
"Nid oes modd gosod rhai pecynnau gofynnwyd amdanynt:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2156,7 +2289,7 @@ msgstr ""
"gael ei dynnu i eraill gael eu diweddaru.\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2167,7 +2300,7 @@ msgstr ""
"gael eu tynnu i eraill gael eu diweddaru.\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2176,7 +2309,7 @@ msgstr ""
"Rhaid i'r pecyn canlynol gael ei dynnu i eraill gael eu diweddaru.\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2185,12 +2318,17 @@ msgstr ""
"Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(prawf yn unig, ni fydd yn cael ei ddadosod)"
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2199,111 +2337,29 @@ msgstr ""
"Rhaid eich bod yn wraidd i osod y dibyniaethau canlynol:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(prawf yn unig, ni fydd yn cael ei osod)"
-#: ../urpmi:597
+#: ../urpmi:617
#, 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:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Pwyso Enter pan yn barod..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Dileu"
-#: ../urpmi:671
-#, c-format
-msgid "The following package has bad signature"
-msgstr "Mae gan y pecyn canlynol lofnod gwallus"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Mae gan y pecynnau canlynol lofnod gwallus"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Ydych chi am barhau gosod?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Methodd y gosod"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "dosbarthu %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "gosod %s o %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "gosod %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)"
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Mwy o orfodaeth gyda'r gosod? (--force)? (y/N)"
-
-#: ../urpmi:815
-#, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "methodd trosglwyddiad gosod %d"
-msgstr[1] "methodd trosglwyddiad gosod %d"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Gosod yn bosibl"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr "Mae'r pecynnau'n rhai diweddaraf"
-
-#: ../urpmi:838
-#, c-format
-msgid "Package %s is already installed"
-msgstr "Pecyn %s wedi ei osod eisoes"
-
-#: ../urpmi:839
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Pecynnau %s wedi eu gosod eisoes"
-
-#: ../urpmi:842
-#, c-format
-msgid "Package %s can not be installed"
-msgstr "Methu gosod pecyn %s"
-
-#: ../urpmi:843
-#, c-format
-msgid "Packages %s can not be installed"
-msgstr "Methu gosod pecynnau %s"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "ailgychwyn urpmi"
@@ -2434,33 +2490,33 @@ msgstr " --verbose - modd llafar.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "methu diweddaru cyfrwng \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, fuzzy, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
"<url> gwallus (rhaid i'r llwybr fod yn absoliwt ar gyfer cyfeiriadur lleol)\n"
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Dim ond uwch ddefnyddiwr sy'n cael ychwanegu cyfrwng"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, c-format
msgid "creating config file [%s]"
msgstr "yn creu ffeil config (%s)"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "Methu creu ffeil Config (%s)"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "dim angen rhoi <llwybr perthynnol hdlist> gyda --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
@@ -2469,17 +2525,17 @@ msgstr ""
"\n"
"Hoffech chi ychwanegu cyfrwng '%s'"
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<llwybr perthynnol hdlist> ar goll\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr "Methu defnyddio %s gyda chyfrwng pell"
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "methu creu cyfrwng \"%s\"\n"
@@ -2642,17 +2698,17 @@ msgstr " -a - dewis pob cyfrwng.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - cydweddiad bras enwau cyfryngau\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Dim ond uwch ddefnyddiwr sy'n cael tynnu cyfrwng"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "dim i'w dynnu (defnyddio urpmi.addmedia i ychwanegu cyfrwng)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2710,17 +2766,17 @@ msgstr " -a - dewis pob cyfrwng ansymudadwy.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - gorfodi cynhyrchu ffeiliau synthesis/hdlist\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Dim ond uwch ddefnyddiwr sy'n cael diweddaru cyfrwng"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "dim i'w ddiweddaru (defnyddio urpmi.addmedia i ychwanegu cyfrwng)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2729,22 +2785,22 @@ msgstr ""
"mae'r cofnod i ddiweddaru ar goll\n"
"(un o %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "anwybyddu cyfrwng %s"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "galluogi cyfrwng %s"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2760,7 +2816,7 @@ msgstr ""
"\n"
"defnydd:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2769,38 +2825,38 @@ msgstr ""
" --searchmedia - defnyddio'r cyfrwng darparwyd i chwilio'r pecynnau "
"gofynnwyd (neu diweddarwyd).\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - mynnu chwiliad fuzzy (fel -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - rhestri'r holl gyfrwng ar gael.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - rhestri'r holl gyfrwng ar gael.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - rhestri'r holl gyfrwng ar gael.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
" --list-nodes - rhestri'r nodau sydd ar gael wrth ddefnyddio --parallel.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - rhestr ar gael ar gyfer enwau paralel.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
@@ -2808,26 +2864,26 @@ msgstr ""
" --dump-config - dympio'r ffurfweddiad mewn ffurf ymresymiad urpmi."
"addmedia.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr ""
" --src - pecyn nesaf yn becyn ffynhonnell (yr un peth â -s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr ""
" --sources - give all source packages before downloading (root only).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr ""
" --ignorearch - caniatáu ymholi rpmau ar gyfer saernïaeth annhebyg.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2836,22 +2892,22 @@ msgstr ""
" --use-distrib - ffurfweddu urpmi wrth fynd o goeden distrib.\n"
" Mae hyn yn caniatáu ymholi mewn dosbarthiad.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - cofnod argraffu.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - crynodeb argraffu.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - chwilio nôl i'r hyn sydd angen ar becyn.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2860,57 +2916,57 @@ msgstr ""
" --whatrequires-recursive\n"
" - chwilio nôl estyndig (yn cynnwys rhith becynnau) \n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -p - caniatáu i chwilio canfod pecyn.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - allbwn cyfan a phecyn i'w dynnu\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - ymestyn ymholiad i ddibyniaethau pecynnau.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - argraffu grwpiau gydag enw hefyd.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - argraffu gwybodaeth ddefnyddiol mewn ffordd ddarllenadwy "
"i bobl.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - rhestri'r ffeiliau mewn pecyn.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, c-format
msgid " -m - equivalent to -du\n"
msgstr " -m - yn cyfateb i -du.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - argraffu fersiwn a rhyddhad gydag enw hefyd.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" --s - pecyn nesaf yn becyn ffynhonnell (yr un peth â --src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2919,52 +2975,52 @@ msgstr ""
" -u - tynnu pecyn os oes yna fersiwn mwy diweddar wedi ei "
"osod.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - gosod chwilio fuzzy (fel --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - fel -y, ond yn gorfodi cydweddu diffyg cydweddiad maint "
"llythrennau.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
" bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael "
"eu holi.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "dim ond gyda --paralel mae modd defnyddio --list-nodes"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
"dim hdlist ar gyfer cyfrwng \"%s\", dim ond canlyniad rhannol ar gyfer pecyn "
"%s"
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"dim hdlist ar gyfer cyfrwng \"%s\", dim ond canlyniad rhannol ar gyfer "
"pecynnau %s"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
"dim hdlist ar gyfer cyfrwng\"%s\", methu canfod unrhyw ganlyniad ar gyfer "
"pecyn %s"
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2972,11 +3028,22 @@ msgstr ""
"dim hdlist ar gyfer cyfrwng\"%s\", methu canfod unrhyw ganlyniad ar gyfer "
"pecynnau %s"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Heb ganfod changelog\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Mae gan y pecynnau canlynol lofnod gwallus:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Hoffech chi barhau gyda'r gosod?"
+
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Rhaid i chi fod yn wraidd i ddefnyddio --use-distrib"
diff --git a/po/da.po b/po/da.po
index 9c70b2d5..8863a84c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: da1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2006-10-01 17:20+0200\n"
"Last-Translator: Keld Simonsen <keld@rap.dk>\n"
"Language-Team: <da@li.org>\n"
@@ -27,7 +27,7 @@ msgstr ""
"X-Generator: KBabel 1.10.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "RPM-installering"
@@ -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:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_O.k."
@@ -104,7 +104,7 @@ msgstr "_Installér"
msgid "_Save"
msgstr "_Gem"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Annullér"
@@ -124,17 +124,17 @@ msgstr "ukendt valg '%s"
msgid "No packages specified"
msgstr "Ingen pakker angivet"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Vent venligst..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "Skal være root"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -145,42 +145,42 @@ msgstr ""
"%s\n"
"Skal installationen fortsættes alligevel?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Advarsel"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "O.k."
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (skal opgraderes)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (skal installeres)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "Pakkevalg"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Der er brug for en af de følgende pakker:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Afbryd"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -191,61 +191,63 @@ msgstr ""
"%s\n"
"Skal installationen fortsættes alligevel?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, 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 "
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, 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"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, 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:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Pakkeinstallation..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "kan ikke hente kilde-pakker, afslutter med fejl"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Forbereder..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Installerer pakke `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Vær venlig at indsætte mediet med navnet %s i enhed [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Henter pakke %s..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"De følgende pakker har dårlige underskrifter:\n"
-"%s\n"
-"\n"
-"Ønsker du at fortsætte installeringen?"
+msgid "_Done"
+msgstr "_Færdig"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -256,41 +258,27 @@ msgstr ""
"%s\n"
"Du ønsker måske at opdatere din urpmi-database"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "fjerner %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Forbereder..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Installerer pakke `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Færdig"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, c-format
msgid "Installation failed:"
msgstr "Installationen fejlede:"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "alting er allerede installeret"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Installationen færdig"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "fjerner %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -325,7 +313,7 @@ msgstr " -g - udskriv også grupper med navn.\n"
msgid " defaults to %s.\n"
msgstr " standard er %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Kun superbrugeren har lov til at installere pakker"
@@ -335,98 +323,98 @@ 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:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "kunne ikke åbne rpmdb"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "ugyldigt rpm-filnavn [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "henter rpm-fil [%s]..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...hentning færdig"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...hentning mislykkedes: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "kunne ikke nå rpm fil [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "kunne ikke fortolke spec-fil '%s [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "kunne ikke registrere rpm-fil"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Inkompatibel arkitektur for rpm [%s]"
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "fejl ved registrering af lokale pakker"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, 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:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "Forkert proxy-erklæring på kommandolinje\n"
-#: ../urpm/args.pm:135
-#, fuzzy, c-format
-msgid "chroot directory doesn't exist"
-msgstr "Miljøkatalog %s eksisterer ikke"
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: kan ikke læse rpm-fil \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
+#, fuzzy, c-format
+msgid "chroot directory doesn't exist"
+msgstr "Miljøkatalog %s eksisterer ikke"
+
+#: ../urpm/args.pm:424
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr "For mange argumenter\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "byggede hdlist syntese fil for medie \"%s\""
@@ -615,7 +603,12 @@ msgstr "pakke %s er ikke fundet."
msgid "malformed URL: [%s]"
msgstr "misdannet URL: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "henter rpm-filer fra medie '%s'..."
@@ -625,7 +618,7 @@ msgstr "henter rpm-filer fra medie '%s'..."
msgid "[repackaging]"
msgstr "[genpakning]"
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -633,37 +626,42 @@ msgstr ""
"oprettede transaktion for installering på %s (fjern=%d, installér=%d, "
"opgradér=%d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "kan ikke oprette transaktion"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, 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:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "tilføjer pakke %s (id=%d, eid=%d, opdatering=%d, fil=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "kunne ikke installere pakke %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "fjerner pakke %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "fjerner pakke %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "installerer %s fra %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Mere information om pakke %s"
@@ -693,11 +691,103 @@ msgstr "Ingen pakker angivet"
msgid "Cannot connect to ldap uri:"
msgstr "Kan ikke tildele farvetabelselementer"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "urpmi-database låst"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Advarsel"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "urpmi-database låst"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "De følgende pakker har dårlige signaturer"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "De følgende pakker har dårlige signaturer"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Ønsker du at fortsætte installationen?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Installationen fejlede"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "distribuerer %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "installerer %s fra %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "installerer %s"
+
+#: ../urpm/main_loop.pm:187
+#, 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:205
+#, 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:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d installationstrasaktioner mislykkedes"
+msgstr[1] "%d installationstrasaktioner mislykkedes"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Installation er mulig"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "alting er allerede installeret"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "alting er allerede installeret"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "alting er allerede installeret"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "alting er allerede installeret"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -747,7 +837,7 @@ msgstr "prøver at vælge ikke-eksisterende medie \"%s\""
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "byggede hdlist syntese fil for medie \"%s\""
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "kunne ikke nå hdlist-fil af \"%s\", medie ignoreret"
@@ -838,7 +928,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Søgnings-start: %s slut: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "udfører andet gennemløb for at beregne afhængigheder\n"
@@ -905,67 +995,72 @@ msgstr ""
"kunne ikke få fat på det første installationsmedium (ingen hdlists fil "
"fundet)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "prøver at vælge ikke-eksisterende medie \"%s\""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "vælger flere medier: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "fjerner medium \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "omkonfigurerer urpmi for medie \"%s\""
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...omkonfigurering mislykkedes"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "omkonfigurering færdig"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Fejl ved generering af navnefil: afhængighed %d ikke fundet"
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr "Fejl ved generering af navnefil: Kan ikke skrive til fil (%s)"
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "medie \"%s\" er ikke valgt"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "undersøger hdlist-fil [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "undersøger syntese-fil [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "bygger hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -974,77 +1069,77 @@ msgstr ""
"Kunne ikke bygge syntese-fil for medie \"%s\". Din hdlist-fil er måske "
"ødelagt."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problem ved læsning af hdlist- eller syntese-fil for medie \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "skriver liste-fil for medie \"%s\""
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...kopiering mislykkedes"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopierer beskrivelsesfil for \"%s\"..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...kopiering færdig"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopiering af [%s] mislykkedes (filen er mistænkeligt lille)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "beregner md5sum på kopieret kilde-hdlist (eller -syntese)"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "kopi af [%s] mislykkedes (md5sum-uoverensstemmelse)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "beregner md5sum på hentet kilde-hdlist (eller -syntese)"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...hentning mislykkedes: md5sum: passer ikke"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "ingen rpm filer fundet fra [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "læser rpm-filer fra [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "kunne ikke læse rpm-filer fra [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "ingen rpm'er læst"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1054,74 +1149,74 @@ msgstr ""
"Kan ikke tilgå medie '%s',\n"
"dette kan ske hvis du manuelt monterede kataloget ved oprettelsen af mediet."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ingen hdlist-fil fundet for medie \"%s\""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "henter kilde-hdlist (eller -syntese) for \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "fandt undersøgte hdlist (eller syntese) for \"%s\"..."
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "ingen hdlist-fil fundet for medie \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "undersøger pubkey-fil for '%s'"
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...importeret nøgle %s fra pubkey-fil for \"%s\""
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "kunne ikke importere pubkey-fil for \"%s\""
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "skriver liste-fil for medie \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "tilføjede medie %s"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "kunne ikke fortolke hdlist-filen \"%s\""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problem ved læsning af syntese-fil for medie \"%s\""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "læser hoveder fra medium \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "YyJj"
@@ -1181,47 +1276,52 @@ msgstr "inkonsistent medie \"%s\" mærket udskifteligt, men er det ikke"
msgid "unable to access medium \"%s\""
msgstr "kunne ikke nå medie \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Ingen pakke kaldet %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Følgende pakker indeholder %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "grundet manglende %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "alting er allerede installeret"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "grundet uopfyldt %s"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "prøver at fremme %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "for at kunne beholde %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "for at kunne installere %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "grundet modstrid med %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "ikke ønsket"
@@ -1241,6 +1341,16 @@ msgstr "Ugyldig nøgle-id (%s)"
msgid "Missing signature (%s)"
msgstr "Manglende signatur (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Kan ikke oprette config-fil [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Kopiering mislykkedes"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1257,8 +1367,8 @@ msgstr ""
"\n"
"brug:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1273,19 +1383,19 @@ msgstr " --auto - vælg automatisk en pakke ved valg.\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - afprøv om fjernelsen kan udføres korrekt.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, 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"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - distribueret urpmi over maskiner med alias.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Ompak filer før sletning\n"
@@ -1295,8 +1405,8 @@ msgstr " --repackage - Ompak filer før sletning\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - brug en anden root for rpm-fjernelse.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - brug en anden root for rpm-installation.\n"
@@ -1315,18 +1425,18 @@ msgstr ""
" --use-distrib - konfigurér urpme løbende fra et distrib træ, "
"nyttigt til at (af)installere en chroot med root-tilvalget.\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr ""
" --probe-synthesis forsøg at finde og bruge syntese- eller hdlist-fil.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - forsøg at finde og bruge hdlist-fil.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - udførlig tilstand.\n"
@@ -1336,37 +1446,37 @@ msgstr " --verbose, -v - udførlig tilstand.\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - vælg alle pakker matchende udtryk.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Kun superbrugeren har lov til at fjerne pakker"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "ukendte pakker"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "ukendt pakke"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "fjernelse af pakke %s vil skade dit system"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Ingenting at fjerne"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Tjekker for at fjerne de følgende pakker"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1376,24 +1486,24 @@ msgstr[0] ""
msgstr[1] ""
"For at tilfredsstille afhængigheder vil de følgende %d pakker blive fjernet"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr " (%d MB)"
-#: ../urpme:138
+#: ../urpme:135
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "Skal %d pakke fjernes?"
msgstr[1] "Skal %d pakker fjernes?"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (j/N) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Fjernelse mislykkedes"
@@ -1419,12 +1529,12 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - udskriv dette værktøjs versionsnummer.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr " --env - brug specifikt miljø (typisk ved en fejlrapport).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr " --excludemedia - brug ikke de opgivne medier, adskilt med komma.\n"
@@ -1437,12 +1547,12 @@ msgstr ""
" --literal, -l - kontrollér ikke søgestrenge, brug argumenter som "
"bogstavelige strenge.\n"
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../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"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1454,7 +1564,7 @@ msgstr ""
msgid " --use-distrib - use the given path to access media\n"
msgstr " --synthesis - brug synthesis angivet i stedet for urpmi-db.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - brug synthesis angivet i stedet for urpmi-db.\n"
@@ -1464,7 +1574,7 @@ msgstr " --synthesis - brug synthesis angivet i stedet for urpmi-db.\n"
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - udskriv ikke identiske linjer.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - brug kun opdateringsmedie.\n"
@@ -1603,76 +1713,86 @@ msgid " --group - group\n"
msgstr " --group - gruppe\n"
#: ../urpmf:72
+#, fuzzy, c-format
+msgid " --license - license\n"
+msgstr " --name - pakkenavn\n"
+
+#: ../urpmf:73
#, c-format
msgid " --name - package name\n"
msgstr " --name - pakkenavn\n"
-#: ../urpmf:73
+#: ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - mærk forældet\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr " --packager - pakkeprogram.\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - tilbudsetiketter\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - afhængighedsetiketter\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, c-format
msgid " --size - installed size\n"
msgstr " --size - installeret størrelse\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - navn på kilde-rpm\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - mærk forældet\n"
+
+#: ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr " --summary - sammendrag\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, c-format
msgid " --url - url\n"
msgstr " --url - url\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, c-format
msgid " --vendor - vendor\n"
msgstr " --vendor - leverandør\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -m - mediet i hvilken pakken blev fundet\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - udskriv version, udgave og arkitektur med navn.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Ugyldigt format: du kan kun bruge flerværdi-etiketter"
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "bruger særligt miljø på %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1681,12 +1801,12 @@ msgstr ""
"Bemærk: da ingen af de undersøgte medier bruger en hdlist, var urpmf ikke i "
"stand til at returnere noget resultat\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Måske ønsker du at bruge --name for at søge efter pakkenavne.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1702,7 +1822,7 @@ msgstr ""
"\n"
"brug:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1710,7 +1830,7 @@ msgstr ""
" --searchmedia - brug kun det opgivne medie for at søge efter de ønskede "
"pakker.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
@@ -1719,30 +1839,30 @@ msgstr ""
" --auto - ikke-interaktiv tilstand, antag standardsvar på "
"spørgsmål.\n"
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../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"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
" --auto-select - vælg automatisk pakker for opgradering af systemet.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - deaktivér kontrol med MD5SUM fil.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - gennemtving opdatering af gpg-nøgle.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1751,12 +1871,12 @@ msgstr ""
" --no-uninstall - spørg aldirig om afinstallering af en pakke, afbryd "
"installationen.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - installér ikke pakker (kun nedhentning)\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1765,7 +1885,7 @@ msgstr ""
" --keep - behold eksisterende pakker om muligt, afvis anmodede\n"
" pakker som fører til fjernelse.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1776,37 +1896,43 @@ msgstr ""
" skal installeres eller opgraderes,\n"
" standard er %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - lille tansaktionslængde, standard er %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy, -y - gennemfør søgning efter fuzzy.\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src -s - næste pakke er en kildepakke.\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr " --install-src - installér kun kildepakker (ingen binære).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - fjern rpm fra cache før noget andet.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - fjern ikke rpm'er fra cache.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1816,7 +1942,7 @@ msgstr ""
"kontrol af\n"
" afhængigheder.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1825,12 +1951,12 @@ msgstr ""
" --allow-force - tillad at spørge bruger om installering af pakker\n"
" uden kontrol af afhængigheder og integritet.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - brug en anden root for rpm-installation.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1839,48 +1965,48 @@ msgstr ""
" --use-distrib - konfigurér urpmi løbende fra et distrib-træ, "
"nyttigt til at installere en chroot med --root-tilvalget.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - brug wget til at hente eksterne filer.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - brug 'curl' til at hente retrieve eksterne filer.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../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"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr " --curl-options - ekstra valg som skal gives til curl\n"
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr " --rsync-options- ekstra valg som skal gives til rsync\n"
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr " --wget-options - ekstra valg som skal gives til wget\n"
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr " --prozilla-options - ekstra valg som skal gives til prozilla\n"
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - begræns hastighed på hentning.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1889,7 +2015,7 @@ msgstr ""
" --resume - genoptag overførsel af delvist hentede filer\n"
" (--no-resume deaktiverer det, standard er deaktiveret).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1898,7 +2024,7 @@ msgstr ""
" --proxy - brug den angivne HTTP proxy, portnummeret antages at\n"
" være 1080 som standard (formatet er <proxyvært[:port]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1907,7 +2033,7 @@ msgstr ""
" --proxy-user - angiv bruger og adgangskode til brug for kontrol\n"
" af proxy (formatet er <bruger:adgangskode>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1916,7 +2042,7 @@ msgstr ""
" --bug - udskriv en fejlrapport i et katalog angivet i næste\n"
" argument.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1926,47 +2052,52 @@ msgstr ""
" (--no-verify-rpm deaktiverer det, standard er "
"aktiveret).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr " --test - afprøv kun om installationen kan udføres korrekt.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - udelukkelsessti adskilt med komma.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - udelader docs-filer.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --ignoresize - kontrollér ikke for ledig diskplads før installation.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr ""
" --ignorearch - tillad at installere rpm'er for forskellige "
"arkitekturer.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - kør ikke pakkers skript\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - pakker hvis installation bør overspringes\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - pakker hvis installation bør overspringes\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1975,48 +2106,48 @@ msgstr ""
" --more-choices - når flere pakker er fundet, så foreslå flere muligheder\n"
" end normalt.\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - lås ikke rpm-database.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, 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:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - vælg alle træffere på kommandolinje.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - tillad søgning i 'provides' for at finde pakke.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, 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"
-#: ../urpmi:155
+#: ../urpmi:153
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - stille udgave.\n"
-#: ../urpmi:157
+#: ../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"
-#: ../urpmi:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2025,12 +2156,12 @@ msgstr ""
"Fejl: For at generere en fejlrapport skal du specificere de almindelige "
"kommandolinjeargumenter med --bug.\n"
-#: ../urpmi:220
+#: ../urpmi:218
#, 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:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2039,7 +2170,7 @@ msgstr ""
"Kataloget [%s] eksisterer allerede, brug venligst et andet katalog til "
"fejlrapporten, eller slet det"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "kunne ikke oprette katalog [%s] til fejlrapport"
@@ -2049,7 +2180,7 @@ msgstr "kunne ikke oprette katalog [%s] til fejlrapport"
msgid "Environment directory %s does not exist"
msgstr "Miljøkatalog %s eksisterer ikke"
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2058,34 +2189,36 @@ msgstr ""
"Fejl: %s ser ud til at være monteret kun læsbart.\n"
"Brug --allow-force for at gennemtvinge handlingen."
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr "Opdaterer medie...\n"
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (skal opgraderes)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (skal opgraderes)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (skal installeres)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, c-format
msgid "%s (to install)"
msgstr "%s (skal installeres)"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2093,12 +2226,12 @@ msgid ""
msgstr ""
"For at tilfredsstille afhængigheder vil de følgende %d pakker blive fjernet"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Hvad er dit valg? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2109,7 +2242,7 @@ msgstr ""
"som er ældre end de installerede:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2120,7 +2253,7 @@ msgstr ""
"som er ældre end de installerede:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, c-format
msgid ""
"\n"
@@ -2129,12 +2262,12 @@ msgstr ""
"\n"
"Fortsæt installationen alligevel?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (J/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2143,7 +2276,7 @@ msgstr ""
"Nogen forespurgte pakker kan ikke installeres:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2152,7 +2285,7 @@ msgstr ""
"Nogen forespurgte pakker kan ikke installeres:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2163,7 +2296,7 @@ msgstr ""
"skal fjernes for at andre kan opgraderes:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2174,7 +2307,7 @@ msgstr ""
"skal fjernes for at andre kan opgraderes:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2183,7 +2316,7 @@ msgstr ""
"De følgende pakker skal fjernes for at andre kan opgraderes:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2192,12 +2325,17 @@ msgstr ""
"De følgende pakker skal fjernes for at andre kan opgraderes:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(kun test, fjernelse vil egentlig ikke blive gennemført)"
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2206,111 +2344,29 @@ msgstr ""
"Du skal være root for at installere de følgende afhængigheder:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(kun test, installation vil egentlig ikke blive gennemført)"
-#: ../urpmi:597
+#: ../urpmi:617
#, 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:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Tryk på retur, når den er klar..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Annullér"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "De følgende pakker har dårlige signaturer"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "De følgende pakker har dårlige signaturer"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Ønsker du at fortsætte installationen?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Installationen fejlede"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "distribuerer %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "installerer %s fra %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "installerer %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Prøv installation uden at tjekke afhængigheder? (j/N) "
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Prøv endnu hårdere at installere (--force)? (j/N) "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d installationstrasaktioner mislykkedes"
-msgstr[1] "%d installationstrasaktioner mislykkedes"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Installation er mulig"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "alting er allerede installeret"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "alting er allerede installeret"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "alting er allerede installeret"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "alting er allerede installeret"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "genstarter urpmi"
@@ -2439,32 +2495,32 @@ msgstr " -v - udførlig tilstand.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "kan ikke opdatere medie \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Kun superbrugeren har lov til at tilføje medier"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "Vil oprette config-fil [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "Kan ikke oprette config-fil [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "ingen grund til at angive <relativ sti for hdlist> med --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
@@ -2473,17 +2529,17 @@ msgstr ""
"\n"
"Ønsker du at tilføje medie '%s'"
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<relativ sti for hdlist> mangler\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "kan ikke oprette medie \"%s\"\n"
@@ -2647,17 +2703,17 @@ msgstr " -a - vælg alle medier.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - upræcis matchning på medienavne.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Kun superbrugeren har lov til at fjerne medier"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "ingenting at fjerne (brug urpmi.addmedia til at tilføje et medie)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2712,17 +2768,17 @@ msgstr " -a - vælg alle ikke-udskiftelige medier.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - gennemfør generering af hdlist-filer.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Kun superbrugeren har lov til at opdatere medier"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "ingenting at opdatere (brug urpmi.addmedia til at tilføje et medie)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2731,22 +2787,22 @@ msgstr ""
"mangler det element der skal opdateres\n"
"(én af %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "ignorerer medie %s"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "aktiverer medie %s"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2762,7 +2818,7 @@ msgstr ""
"\n"
"brug:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2771,37 +2827,37 @@ msgstr ""
" --searchmedia - brug kun det opgivne medie for at søge efter de ønskede "
"(eller opdaterede) pakker.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - gennemfør søgning efter fuzzy (samme som -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - skriv tilgængelige pakker.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - list tilgængelige medier.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - list tilgængelige medier og deres url.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr " --list-nodes - list tilgængelige knuder ved brug af --parallel.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - list tilgængelige parallelle aliaser.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
@@ -2809,25 +2865,25 @@ msgstr ""
" --dump-config - udskriv konfigurationen i form af urpmi.addmedia "
"argumenter.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr " --src - næste pakke er en kildepakke (samme som -s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr " --sources - giv alle kildepakker før hentning (kun root).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr ""
" --ignorearch - tillad at spørge efter rpm'er for forskellige "
"arkitekturer.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2836,22 +2892,22 @@ msgstr ""
" --use-distrib - konfigurér urpmi løbende fra et distrib-træ.\n"
" Dette muliggør at spørge efter en distro.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - udskriv ændringslog.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - skriv resumé.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - omvendt søgning til hvad der kræver pakke.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2860,54 +2916,54 @@ msgstr ""
" --whatrequires-recursive\n"
" - udvidet omvendt søgning (inklusive virtuelle pakker).\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -p - søg i 'provides' for at finde pakke.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - færdiggør uddata med pakke der skal fjernes.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - udvid forespørgsel til pakkeafhængigheder.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - udskriv også grupper med navn.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - udskriv nyttig information på læsevenlig form.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l.. - udskriv filer i pakken.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - stille udgave.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - udskriv også version og udgave med navn.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - næste pakke er en kildepakke (samme som --src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2916,46 +2972,46 @@ msgstr ""
" -u - fjern pakke hvis en nyere version allerede er "
"installeret.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - gennemfør upræcis søgning (samme som --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - som -y, men tvinger matchning uden forske på små og store "
"bogstaver.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " navne eller rpm-filer givne på kommandolinjen bliver forespurgt.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes kan kun bruges med --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"Bemærk: da ingen af de undersøgte medier bruger en hdlist, var urpmf ikke i "
"stand til at returnere noget resultat\n"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2963,11 +3019,22 @@ msgstr ""
"Bemærk: da ingen af de undersøgte medier bruger en hdlist, var urpmf ikke i "
"stand til at returnere noget resultat\n"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Ingen ændringslog fundet\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "De følgende pakker har dårlige underskrifter:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Ønsker du at fortsætte installeringen?"
+
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Du skal være rod (root) for at bruge --use-distrib"
diff --git a/po/de.po b/po/de.po
index f49a6dc1..d70ba3e5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2007-03-18 20:59+0100\n"
"Last-Translator: Nicolas Bauer <rastafarii@mandrivauser.de>\n"
"Language-Team: deutsch\n"
@@ -19,7 +19,7 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "RPM Installation"
@@ -29,7 +29,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:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_OK"
@@ -96,7 +96,7 @@ msgstr "_Installieren"
msgid "_Save"
msgstr "_Speichern"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Abbrechen"
@@ -116,17 +116,17 @@ msgstr "Unbekannte Option %s"
msgid "No packages specified"
msgstr "Keine Pakete angegeben"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Bitte warten..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "Muss root sein"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -137,42 +137,42 @@ msgstr ""
"%s\n"
"Wollen Sie trotzdem fortfahren?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Warnung"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (zu aktualisieren)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (zu installieren)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "Paketwahl"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Eines der folgenden Pakete wird benötigt:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Abbruch"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -184,60 +184,62 @@ msgstr ""
"%s\n"
"Wollen Sie trotzdem fortfahren?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, c-format
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:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, 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"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, 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:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Paketinstallation ..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "Ich kann die Quellpakete nicht finden, Abbruch"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Vorbereiten ..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Installieren des Pakets `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Bitte legen Sie das Medium mit Namen \"%s\" in das Gerät [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Holen des Pakets `%s' ..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Die folgenden Pakete haben falsche Signaturen:\n"
-"%s\n"
-"\n"
-"Wollen Sie die Installation fortsetzen ?"
+msgid "_Done"
+msgstr "_Fertig"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -248,41 +250,27 @@ msgstr ""
"%s\n"
"Sie sollten Ihre urpmi-Datenbank aktualisieren"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "Entferne %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Vorbereiten ..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Installieren des Pakets `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Fertig"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, c-format
msgid "Installation failed:"
msgstr "Installation fehlgeschlagen:"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Alles bereits installiert"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Installation beendet"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "Entferne %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -317,7 +305,7 @@ msgstr " -f - Voller RPM Name (NVRA)\n"
msgid " defaults to %s.\n"
msgstr " Voreinstellung ist %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Nur der Systemadministrator darf Pakete installieren"
@@ -327,98 +315,98 @@ msgstr "Nur der Systemadministrator darf Pakete installieren"
msgid "Running urpmi in restricted mode..."
msgstr "Urpmi läuft im eingeschränkten Modus..."
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "Es kann die rpmdb nicht geöffnet werden"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr "Entdeckt %d rpm Kopf im Cache, entferne %d überflüssige Köpfe"
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "Ungültiger RPM Name [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "Holen des RPMs [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...Holen fertig"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...Holen fehlgeschlagen: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "Ich habe keinen Zugriff auf die RPM-Datei [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "Nicht möglich spec file %s [%s] zu parsen"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "Ich kann die RPM-Datei nicht registrieren"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Nicht kompatible Architektur für RPM [%s]"
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "Fehler bei der Registrierung lokaler Pakete"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, 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:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "Ungültige Proxyangabe als Kommandozeilenparameter\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr "chroot Verzeichnis existiert nicht"
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: Ich kann das RPM \"%s\" nicht lesen.\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
+#, c-format
+msgid "chroot directory doesn't exist"
+msgstr "chroot Verzeichnis existiert nicht"
+
+#: ../urpm/args.pm:424
#, c-format
msgid "Can't use %s without %s"
msgstr "Es ist nicht möglich %s ohne %s zu verwenden"
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
#, c-format
msgid "Can't use %s with %s"
msgstr "Es ist nicht möglich %s mit %s zu verwenden"
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr "zu viele Argumente\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "Erstellen der HD-Listen-Synthese-Datei für das Medium \"%s\""
@@ -610,7 +598,12 @@ msgstr "Paket %s wurde nicht gefunden."
msgid "malformed URL: [%s]"
msgstr "fehlerhafte URL: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "Holen der RPMs von Medium \"%s\"..."
@@ -620,7 +613,7 @@ msgstr "Holen der RPMs von Medium \"%s\"..."
msgid "[repackaging]"
msgstr "[neupacken]"
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -628,37 +621,42 @@ msgstr ""
"Stelle Vorgang zum Installieren auf %s (entfernen=%d, installieren=%d, "
"upgraden=%d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "unmöglich den Vorgang einzuleiten"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, 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:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "Füge Paket hinzu %s (ID=%d, EID=%d, Update=%d, Datei=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "Ich kann das Paket %s nicht installieren"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "Entfernen des Pakets %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "Entfernen des Pakets %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "entferne installierte rpms (%s) von %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Mehr Informationen über das Paket %s"
@@ -688,11 +686,103 @@ msgstr "Kein Bezug definiert"
msgid "Cannot connect to ldap uri:"
msgstr "Es ist nicht möglich zur ldap uri zuverbinden: "
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "%s Datenbank ist gesperrt"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Warnung"
+
+#: ../urpm/lock.pm:65
#, c-format
msgid "%s database locked"
msgstr "%s Datenbank ist gesperrt"
+#: ../urpm/main_loop.pm:99
+#, c-format
+msgid "The following package has bad signature"
+msgstr "Folgendes Paket hat eine inkorrekte Signatur"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Folgenden Pakete haben inkorrekte Signaturen"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Wollen Sie die Installation fortsetzen?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Die Installation schlug Fehl"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "Verteile %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "Installiere %s von %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "Installiere %s"
+
+#: ../urpm/main_loop.pm:187
+#, 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:205
+#, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "Soll ich eine Installation erzwingen (--force)? (j/N) "
+
+#: ../urpm/main_loop.pm:247
+#, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d Installation schlug Fehl"
+msgstr[1] "%d Installation schlugen Fehl"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Die Installation ist möglich"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr "Die Pakete sind auf dem aktuellen Stand"
+
+#: ../urpm/main_loop.pm:271
+#, c-format
+msgid "Package %s is already installed"
+msgstr "Paket %s ist installiert"
+
+#: ../urpm/main_loop.pm:272
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Pakete %s sind installiert"
+
+#: ../urpm/main_loop.pm:275
+#, c-format
+msgid "Package %s can not be installed"
+msgstr "Paket %s kann nicht installiert werden"
+
+#: ../urpm/main_loop.pm:276
+#, c-format
+msgid "Packages %s can not be installed"
+msgstr "Pakete %s können nicht installiert werden"
+
#: ../urpm/md5sum.pm:23
#, c-format
msgid "examining %s file"
@@ -745,7 +835,7 @@ msgstr "\"synthesis\" darf nicht gesetzt sein (medium \"%s\")"
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "\"synthesis\" soll gesetzt werden (medium \"%s\")"
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr ""
@@ -842,7 +932,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Suche starten %s Ende:%s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "Zweiter Durchlauf zum Berechnen der Paketabhängigkeiten\n"
@@ -909,68 +999,73 @@ msgstr ""
"Es ist nicht möglich das Distributionsmedium zu verwenden (keine media.cfg "
"Datei gefunden)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "Versuch, das nicht existierende Medium \"%s\" auszuwählen"
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "Auswahl des Mehrfachmediums: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "Entfernen des Mediums \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "Rekonfiguriere URPMI für Medium \"%s\""
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...Rekonfiguration scheiterte"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "Rekonfiguration durchgeführt"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, 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:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
"Fehler beim Erstellen der Namens-Datei: Kann Datei (%s) nicht schreiben"
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "Medium \"%s\" ist auf dem aktuellen Stand"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "Prüfen der HD-Liste [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "Lesen der Synthese-Datei [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "Erstellen der HD-Liste [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -979,78 +1074,78 @@ msgstr ""
"Kann die Synthese-Datei für das Medium \"%s\" nicht erzeugen. Ihre HD-Liste "
"Datei ist möglicherweise fehlerhaft."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr ""
"Probleme beim Lesen der HD-Liste oder Synthese-Datei des Mediums \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "Kopiere [%s] zu Medium \"%s\" ..."
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...das Kopieren scheiterte"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "Kopiere Beschreibungs-Datei von \"%s\"..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "... das Kopieren ist beendet"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopieren von [%s] fehlgeschlagen (Datei ist verdächtig klein)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "Berechnen der md5sum der kopieren HD-Liste (oder Synthese-Datei)"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "Kopieren von [%s] fehlgeschlagen (md5sum fehlerhaft)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "errechne md5sum der erhaltenen Quell-HD-Liste (oder Synthese-Datei)"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...Holen fehlgeschlagen: md5sum stimmt nicht"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "Keine rpm-Dateien in [%s] gefunden"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "Lesen der RPM-Dateien von [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "Ich kann die RPM-Dateien von [%s] nicht lesen: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "keine rpms gefunden"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1061,74 +1156,74 @@ msgstr ""
"das kann beim manuellen Mounten des Verzeichnisses des erstellten Mediums "
"passieren."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "Fehlerhafte hdlist Datei %s für das Medium \"%s\""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "Hole HD-Liste (oder Synthese-Datei) von \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "HD-Liste (oder Synthese-Datei) als %s gefunden"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "Keine HD-Liste für das Medium \"%s\" gefunden"
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "Holen der Pubkey-Datei für \"%s\" ..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...importierter Schlüssel %s von Pubkey-Datei von \"%s\""
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "kann die Pubkey-Datei für \"%s\" nicht importieren"
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "schreibe Dateiliste für das Medium \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, c-format
msgid "updated medium \"%s\""
msgstr "Aktualisiere Medium \"%s\""
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "Die Struktur der HD-Liste von \"%s\" ist nicht korrekt"
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "Probleme beim Lesen der Synthese-Datei des Mediums \"%s\""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "Lesen der Paketinformationen des Mediums \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "JjYy"
@@ -1188,47 +1283,52 @@ msgstr "\"%s\" wurde als Wechselmedium angegeben, ist es aber nicht"
msgid "unable to access medium \"%s\""
msgstr "Ich kann auf das Medium \"%s\" nicht zugreifen"
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Kein Paket mit dem Namen %s gefunden"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Die folgenden Pakete enthalten %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "wegen fehlendem %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Paket %s ist installiert"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "wegen nicht erfüllter Abhängigkeit von %s "
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "versuche %s voranzubringen"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "um %s zu behalten"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "um %s zu installieren"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "wegen Konflikten mit %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "unangefordert"
@@ -1248,6 +1348,16 @@ msgstr "Ungültige Schlüssel ID (%s)"
msgid "Missing signature (%s)"
msgstr "Fehlende Signatur (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Kann Konfigurationsdatei [%s] nicht erzeugen"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Kopieren fehlgeschlagen"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1265,8 +1375,8 @@ msgstr ""
"\n"
"Verwendung:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1282,7 +1392,7 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - verifiziere, ob die Entfernung korrekt verlaufen wird.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
@@ -1290,14 +1400,14 @@ msgstr ""
" --force - Erzwinge Aufruf, sogar wenn einige Pakete nicht "
"existieren.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
" --parallel - verteilter urpmi Aufruf auf allen teilnehmenden\n"
" Maschinen.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - neupacken vor dem Löschen\n"
@@ -1308,8 +1418,8 @@ msgid " --root - use another root for rpm removal.\n"
msgstr ""
" --root - benutze anderes Wurzelverzeichnis zur RPM Entfernung.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
@@ -1330,17 +1440,17 @@ msgstr ""
" --use-distrib - Konfiguriere urpme von einem distrib Baum, nützlich\n"
" um einen chroot mit --root Option zu (de)installieren.\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - Versuche Synthese-Datei zu nutzen.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - versuche HD-Listen-Datei zu nutzen.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - ausführlicher Modus.\n"
@@ -1350,37 +1460,37 @@ msgstr " --verbose, -v - ausführlicher Modus.\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - wähle alle Pakete, die dem Ausdruck gleichen.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Nur der Systemadministrator darf Pakete entfernen"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "unbekannte Pakete "
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "unbekanntes Paket"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "Das Entfernen des Pakets %s macht Ihr System unbrauchbar"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Nichts zu entfernen"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Überprüfe das Entfernen folgender Pakete"
-#: ../urpme:134
+#: ../urpme:131
#, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1389,24 +1499,24 @@ 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"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr " (%d MB)"
-#: ../urpme:138
+#: ../urpme:135
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "Entfernen das Paket %d?"
msgstr[1] "Entfernen der Pakete %d?"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (j/N) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Entfernen schlug fehl"
@@ -1433,14 +1543,14 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - Ausgabe der Versionsnummer dieses Tools.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - Verwende ein besondere Umgebung (Etwa zur\n"
" Erstellung von Fehlerberichten).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1454,12 +1564,12 @@ msgstr ""
" --literal, -l - passe die Schablone nicht an, sondern benutze es als "
"string\n"
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - Benutze nur durch Kommata getrennte Medienliste.\n"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1474,7 +1584,7 @@ msgstr ""
" --synthesis - Verwende die angegebene Synthese-Datei anstelle\n"
" der urpmi-DB.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1486,7 +1596,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - keine identischen Zeilen ausgeben.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - Verwende nur Aktualisierungs-Medien.\n"
@@ -1622,78 +1732,88 @@ msgid " --group - group\n"
msgstr " --group - Gruppe\n"
#: ../urpmf:72
+#, fuzzy, c-format
+msgid " --license - license\n"
+msgstr " --name - Paketname\n"
+
+#: ../urpmf:73
#, c-format
msgid " --name - package name\n"
msgstr " --name - Paketname\n"
-#: ../urpmf:73
+#: ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - Veraltet.\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr " --packager - Packer.\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - Stellt zur Verfügung\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - Benötigt\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, c-format
msgid " --size - installed size\n"
msgstr " --size - Größe\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - Quell RPM Name.\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - Veraltet.\n"
+
+#: ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr " --summary - Zusammenfassung\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, c-format
msgid " --url - url\n"
msgstr " --url - URL\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, c-format
msgid " --vendor - vendor\n"
msgstr " --vendor - Hersteller\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -m - das Mediium, in welchem das Paket gefunden wurde\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - Ausgabe von Version, Release und Architektur mit dem "
"Namen.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Fehlerhaftes Format: Sie können nur ein mehrfach Zweig anhängen"
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "nutze spezielle Umgebung für %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1702,12 +1822,12 @@ msgstr ""
"Anmerkung: Weil kein durchsuchtes Medium HD-Listen benutzt, war urpmf nicht "
"in der Lage Resultate zu liefern\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Sie können --name zum Suchen von Paketname nutzen.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1724,7 +1844,7 @@ msgstr ""
"\n"
"Verwendung:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1732,7 +1852,7 @@ msgstr ""
" --searchmedia - verwende nur die gegebenen Medien um nach der "
"angeforderten Paketen zu suchen\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
@@ -1741,7 +1861,7 @@ msgstr ""
" --auto - nicht-interaktiver Modus, vorgegebene Antworten werden "
"bei Fragen angenommen.\n"
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
@@ -1749,24 +1869,24 @@ msgstr ""
" --auto-select - Automatische Paketauswahl zur Aktualisierung des "
"Systems.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
" --auto-update - Automatische Paketauswahl zur Aktualisierung des "
"Systems.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - deaktiviere MD5SUM Dateiüberprüfung.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - erzwinge Update auf gpg Schlüssel.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1775,12 +1895,12 @@ msgstr ""
" --no-uninstall - niemals fragen bei Paketdeinstallation, Installation "
"abbrechen.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - installiere keine Pakete (nur herunterladen).\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1790,7 +1910,7 @@ msgstr ""
"angefragte\n"
" Pakete ab, die zu einer Deinstallation führen.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1801,37 +1921,43 @@ msgstr ""
" Pakete installiert oder upgegraded werden,\n"
" Voreinstellung ist %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - kleine Länge der Vorgänge, Voreinstellung ist %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy, -y - unscharfe Suche erzwingen.\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src, -s - nächstes Paket ist ein Source Paket.\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr " --install-src - installiere nur Quellpakete (keine Binärpakete).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - leert zu Begeinn den RPM-Cache.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - belasse unverwendete RPMs im Cache.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1840,7 +1966,7 @@ msgstr ""
" --allow-nodeps - Erlaube Anwenderbefragung zur Paketinstallation\n"
" ohne Abhängigkeitskontrolle.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1849,13 +1975,13 @@ msgstr ""
" --allow-force - Erlaube Anwenderbefragung zur Paketinstallation\n"
" ohne Abhängigkeits- und Integritätskontrolle.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr ""
" --root - benutze anderes Wurzelverzeichnis zur RPM Installation.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1864,52 +1990,52 @@ msgstr ""
" --use-distrib - konfiguriere urpmi von einem distrib Baum, nützlich\n"
" zum Installieren eines chroot mit --root Option.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - Benutze wget um entfernte Dateien zu laden.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - Benutze curl um entfernte Dateien zu laden.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --prozilla - Benutze prozilla um entfernte Dateien zu laden.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
" --curl-options - zusätzliche Optionen, die an curl weitergeleitet werden\n"
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
" --rsync-options- zusätzliche Optionen, die an rsync weitergeleitet werden\n"
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
" --wget-options - zusätzliche Optionen, die an wget weitergeleitet werden\n"
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
" --prozilla-options - zusätzliche Optionen, die an prozilla weitergeleitet "
"werden\n"
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - schränke die Dowloadgeschwindigkeit ein.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1919,7 +2045,7 @@ msgstr ""
"fort\n"
" (--no-resume deaktiviert es, Vorgabe ist deaktiviert).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1928,7 +2054,7 @@ msgstr ""
" --proxy - Verwende einen HTTP Proxy, als Standard-Portnummer\n"
" wird 1080 angenommen (Format: <ProxyRechner[:port]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1938,7 +2064,7 @@ msgstr ""
" Authentifizierung gegenüber dem Proxy\n"
" (Format: <Benutzerkennzeichen:Passwort>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1947,7 +2073,7 @@ msgstr ""
" --bug - Erstellen eines Fehlerberichts im durch das nächste\n"
" Argument angegebenen Ordner.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1957,7 +2083,7 @@ msgstr ""
" (--no-verify-rpm deaktiviert das Verhalten,\n"
" Voreingestellt: Kontrolle der Signaturen).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
@@ -1965,41 +2091,47 @@ msgid ""
msgstr ""
" --test - Versuch, ob die Installation korrekt verlaufen wird.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - schließe durch Kommata getrennte Pfade aus.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - Schließe Dokumentationsdateien aus.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --ignoresize - nicht vor Installation den Festplattenplatz prüfen.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr ""
" --ignorearch - ermöglicht das installieren von RPMs für andere "
"Achitekturen\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - Paket-Skripte nicht ausführen\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
" --skip - Pakete deren Installation übersprungen werden soll\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr ""
+" --skip - Pakete deren Installation übersprungen werden soll\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2009,54 +2141,54 @@ msgstr ""
"Möglichkeiten vor\n"
" als die Vorgabe.\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - Die RPM-Datenbank nicht sperren.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
" --strict-arch - Updaten Pakete, welche die selbe Architektur sind.\n"
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
" -a - Wähle alle Treffer in der Kommandozeile.\n"
"\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, 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"
-#: ../urpmi:154
+#: ../urpmi:152
#, 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"
-#: ../urpmi:155
+#: ../urpmi:153
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - stiller Modus.\n"
-#: ../urpmi:157
+#: ../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:186
+#: ../urpmi:184
#, 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:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2065,14 +2197,14 @@ msgstr ""
"Fehler: Um ein Fehlermeldung zu erstellen bitte die Kommandozeile verwenden\n"
"mit --bug.\n"
-#: ../urpmi:220
+#: ../urpmi:218
#, 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:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2081,7 +2213,7 @@ msgstr ""
"Verzeichnis [%s] existiert bereits, bitte nutzen Sie ein anderes Verzeichnis "
"für Fehlerberichte oder löschen Sie dieses"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Konnte das Verzeichnis [%s] für die Fehlerberichte nicht anlegen"
@@ -2091,7 +2223,7 @@ msgstr "Konnte das Verzeichnis [%s] für die Fehlerberichte nicht anlegen"
msgid "Environment directory %s does not exist"
msgstr "Das angegebene Verzeichnis %s existiert nicht"
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2100,46 +2232,48 @@ msgstr ""
"Fehler: %s scheint nur lesbar gemountet zu sein.\n"
"Benutzen Sie --allow-force um eine Operation zu erzwingen."
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr "Aktualisiere Medien...\n"
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (zu aktualisieren)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (zu aktualisieren)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (zu installieren)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, c-format
msgid "%s (to install)"
msgstr "%s (zu installieren)"
-#: ../urpmi:447
+#: ../urpmi:454
#, 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:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Ihre Wahl? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2150,7 +2284,7 @@ msgstr ""
"da sie älter sind als die Installierten:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2162,7 +2296,7 @@ msgstr ""
"da sie älter sind als die Installierten:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, c-format
msgid ""
"\n"
@@ -2171,12 +2305,12 @@ msgstr ""
"\n"
"Wollen Sie trotzdem fortfahren?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (J/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2185,7 +2319,7 @@ msgstr ""
"Das gewünschte Paket kann nicht installiert werden:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2194,7 +2328,7 @@ msgstr ""
"Einige der gewünschten Pakete können nicht installiert werden:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2206,7 +2340,7 @@ msgstr ""
"durchführen zu können:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2218,7 +2352,7 @@ msgstr ""
"durchführen zu können:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2228,7 +2362,7 @@ msgstr ""
"durchführen zu können:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2238,12 +2372,17 @@ msgstr ""
"durchführen zu können:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(nur ein Test, das Entfernen wird nicht wirklich durchgeführt)"
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2253,111 +2392,29 @@ msgstr ""
"können:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(nur ein Test, es wird keine wirkliche Installation durchgeführt)"
-#: ../urpmi:597
+#: ../urpmi:617
#, 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:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Betätigen Sie die Eingabetaste, sobald Sie soweit sind..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Abbruch"
-#: ../urpmi:671
-#, c-format
-msgid "The following package has bad signature"
-msgstr "Folgendes Paket hat eine inkorrekte Signatur"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Folgenden Pakete haben inkorrekte Signaturen"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Wollen Sie die Installation fortsetzen?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Die Installation schlug Fehl"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "Verteile %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "Installiere %s von %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "Installiere %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Soll ich eine Installation ohne Abhängigkeitstest versuchen? (j/N) "
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Soll ich eine Installation erzwingen (--force)? (j/N) "
-
-#: ../urpmi:815
-#, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d Installation schlug Fehl"
-msgstr[1] "%d Installation schlugen Fehl"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Die Installation ist möglich"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr "Die Pakete sind auf dem aktuellen Stand"
-
-#: ../urpmi:838
-#, c-format
-msgid "Package %s is already installed"
-msgstr "Paket %s ist installiert"
-
-#: ../urpmi:839
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Pakete %s sind installiert"
-
-#: ../urpmi:842
-#, c-format
-msgid "Package %s can not be installed"
-msgstr "Paket %s kann nicht installiert werden"
-
-#: ../urpmi:843
-#, c-format
-msgid "Packages %s can not be installed"
-msgstr "Pakete %s können nicht installiert werden"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "starte urpmi neu"
@@ -2493,35 +2550,35 @@ msgstr " -v - ausführlicher Modus.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "Ich kann das Medium \"%s\" nicht aktualisieren.\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, fuzzy, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
"Fehler in der <url> (für das Lokale Verzeichnis, der Pfad muss absolut "
"sein)\n"
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Nur der Systemadministrator darf Medien hinzufügen"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, c-format
msgid "creating config file [%s]"
msgstr "Erstelle die Konfigurationsdatei [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "Kann Konfigurationsdatei [%s] nicht erzeugen"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr ""
"nicht erforderlich, <relativer Pfad zur HD-Liste> anzugeben mit --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
@@ -2530,17 +2587,17 @@ msgstr ""
"\n"
"Medium wirklich hinzufügen '%s'"
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<relativer Pfad zur HD-Liste> fehlt.\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr "Es ist nicht möglich %s mit einem Remote Medium zu verwenden"
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "Ich kann das Medium \"%s\" nicht anlegen\n"
@@ -2713,19 +2770,19 @@ msgstr " -a - Alle Medien auswählen.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - fuzzy match on media names.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Nur der Systemadministrator darf Medien entfernen"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr ""
"Es gibt nichts zu entfernen (verwenden Sie \"urpmi.addmedia\", \n"
"um neue Medien hinzuzufügen)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2783,19 +2840,19 @@ msgstr " -a - Wählt alle nicht entfernbaren Medien.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - Erzwinge das Updaten von synthesis/hdlist\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Nur der Systemadministrator darf Medien aktualisieren"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
"Es gibt nichts zu aktualisieren (verwenden Sie \"urpmi.addmedia\", \n"
"um neue Medien hinzuzufügen)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2804,22 +2861,22 @@ msgstr ""
"Was soll aktualisiert werden?\n"
"(eins aus %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "ignoriere Medium %s"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "Aktiviere das Medium %s"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2836,7 +2893,7 @@ msgstr ""
"\n"
"Verwendung:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2845,39 +2902,39 @@ msgstr ""
" --searchmedia - verwende nur die gegebenen Medien um nach der "
"angeforderten Paketen zu suchen (oder upzudaten).\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - unscharfe Suche erzwingen (identisch zu \"-y\").\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - Alle verfügbaren Pakete auflisten.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - Alle verfügbaren Medien auflisten.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - Führe aktuelle Medien und ihre URL auf.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
" --list-nodes - Alle für \"--parallel\" verfügbaren Knoten\n"
" auflisten.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - Alle verfügbaren Aliase auflisten.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
@@ -2885,12 +2942,12 @@ msgstr ""
" --dump-config - verwerfe die Konfiguration in der Form eines urpmi."
"addmedia Argumentes.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr " --src - es folgt ein Quellpaket (identisch zu \"-s\").\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
@@ -2898,14 +2955,14 @@ msgstr ""
" --sources - Gib alle Quellpakete vor dem Runterladen an (nur root).\n"
".\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr ""
" --ignorearch - erlaubt die Abfrage von RPMs für andere "
"Architekturen\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2914,22 +2971,22 @@ msgstr ""
" --use-distrib - konfiguriere urpmi von einem distrib Baum.\n"
" Das erlaubt eine Distribution zu befragen.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - Gebe Changelog aus.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - Zusammenfassung ausgeben.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - umgekehrte Suche nach Paketabhängigkeiten.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2939,7 +2996,7 @@ msgstr ""
" - erweiterte umgekehrte Suche (beinhaltet virtuelle "
"Pakete).\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, c-format
msgid ""
" --whatprovides, -p\n"
@@ -2948,48 +3005,48 @@ msgstr ""
" --whatprovides, -p\n"
" - Suche in provides um Pakete zu finden.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - komplette Ausgabe von zu entfernenden Paketen.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - Erweitere Anfrage auf Paket-Abhängigkeiten.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - Ausgabe der Gruppe mit dem Namen.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - Ausgabe von nützlichen Informationen in lesbarer Form.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - Dateien des Paketes auflisten.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, c-format
msgid " -m - equivalent to -du\n"
msgstr " -m - das gleiche wie -du\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - Ausgabe von Version und Release mit dem Namen.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - es folgt ein Quellpaket (identisch zu \"--src\").\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2998,51 +3055,51 @@ msgstr ""
" -u - Entferne Paket wenn bereits eine aktuellere Version "
"installiert ist.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
" -y - unscharfe Suche erzwingen (identisch zu \"--fuzzy\").\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - wie -y, aber erzwingt eine großschreibungsunabhängige "
"Schreibweise.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
" Namen oder rpm-Dateien, die auf der Kommandozeile angegeben wurden werden "
"abgefragt.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes kann nur mit --parallel benutzt werden"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
"keine hdliste für das Medium \"%s\", nur Teilresultate für das Paket %s"
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"keine hdliste für das Medium \"%s\", nur Teilresultate für die Pakete %s"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
"keine hdliste für das Medium \"%s\", es ist nicht möglich ein Ergebnis für "
"das Paket %s zu liefern"
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -3050,11 +3107,22 @@ msgstr ""
"keine hdliste für das Medium \"%s\", es ist nicht möglich Ergebnisse für die "
"Pakete %s zu liefern"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Kein Changelog gefunden\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Die folgenden Pakete haben falsche Signaturen:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Wollen Sie die Installation fortsetzen ?"
+
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Sie müssen als root angemeldet sein, um --use-distrib zu nutzen"
diff --git a/po/el.po b/po/el.po
index 761afb7a..3758325d 100644
--- a/po/el.po
+++ b/po/el.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-el\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2006-03-04 12:15+0200\n"
"Last-Translator: Theophanis Mastakas <mastakas@otenet.gr>\n"
"Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -24,7 +24,7 @@ msgstr ""
"X-Generator: KBabel 1.10.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "Εγκατάσταση RPM"
@@ -34,7 +34,7 @@ msgstr "Εγκατάσταση RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Εντάξει"
@@ -103,7 +103,7 @@ msgstr "_Εγκατάσταση"
msgid "_Save"
msgstr "_Αποθήκευση"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Ακύρωση"
@@ -123,17 +123,17 @@ msgstr "Άγνωστη επιλογή %s"
msgid "No packages specified"
msgstr "Δεν ορίστηκαν πακέτα"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Παρακαλώ περιμένετε..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "Πρέπει να είστε διαχειριστής"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -144,42 +144,42 @@ msgstr ""
"%s\n"
"Συνέχεια εγκατάστασης ;"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Προσοχή"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Εντάξει"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (προς αναβάθμιση)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (προς εγκατάσταση)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Ένα εκ των παρακάτω πακέτων απαιτείται:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Ματαίωση"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -190,7 +190,7 @@ msgstr ""
"%s\n"
"Συνέχεια εγκατάστασης;"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
@@ -198,7 +198,7 @@ msgstr ""
"Για να ικανοποιηθούν οι εξαρτήσεις, το παρακάτω πακέτο πρόκειται να "
"εγκατεστηθεί"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -206,48 +206,49 @@ msgstr ""
"Για να ικανοποιηθούν οι εξαρτήσεις, τα ακόλουθα πακέτα πρόκειται να "
"εγκατασταθούν"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d πακέτο, %d MB)"
msgstr[1] "(%d πακέτα, %d MB)"
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Εγκατάσταση πακέτου..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "αδυναμία λήψης των πακέτων πηγαίου κώδικα, ματαίωση"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Προετοιμασία..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Εγκατάσταση πακέτου `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Παρακαλώ βάλτε το μέσο με όνομα \"%s\" στη συσκευή [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Λήψη πακέτου `%s'..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Τα παρακάτω πακέτα έχουν κακές υπογραφές:\n"
-"\n"
-"%s\n"
-"\n"
-"Θέλετε να συνεχίσετε την εγκατάσταση ;"
+msgid "_Done"
+msgstr "_Ολοκληρώθηκε"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -258,41 +259,27 @@ msgstr ""
"%s\n"
"Ίσως θέλετε να αναβαθμίσετε τη βάση δεδομένων urpmi"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "αφαίρεση %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Προετοιμασία..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Εγκατάσταση πακέτου `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Ολοκληρώθηκε"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, c-format
msgid "Installation failed:"
msgstr "Η εγκατάσταση απέτυχε:"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Το(α) πακέτο(α) είναι ήδη εγκατεστημένα"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Η εγκατάσταση τελείωσε"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "αφαίρεση %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -328,7 +315,7 @@ msgstr " -q - σιωπηλή λειτουργία.\n"
msgid " defaults to %s.\n"
msgstr " προκαθορισμένο είναι το %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Μόνο ο διαχειριστής επιτρέπεται να εγκαταστήσει πακέτα"
@@ -338,98 +325,98 @@ msgstr "Μόνο ο διαχειριστής επιτρέπεται να εγκ
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "αδυναμία ανοίγματος του rpmdb"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "μη έγκυρο όνομα αρχείου rpm [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "ανάκτηση αρχείου rpm [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...η ανάκτηση ολοκληρώθηκε"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "... η ανάκτηση απέτυχε: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "αδυναμία πρόσβασης στο αρχείο rpm [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "αδυναμία ανάλυσης του \"%s\" στο αρχείο [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "αδυναμία δήλωσης του αρχείου rpm"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "σφάλμα κατά την δήλωση των τοπικών πακέτων"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "μη ορθή διακήρυξη proxy στην γραμμή εντολών\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: αδυναμία ανάγνωσης αρχείου rpm \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "δημιουργία αρχείου σύνθεσης hdlist για το μέσο \"%s\""
@@ -619,7 +606,12 @@ msgstr "το πακέτο %s δεν βρέθηκε."
msgid "malformed URL: [%s]"
msgstr "κακοδιατυπωμένη είσοδος: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "ανάκτηση αρχείων rpm από το μέσο \"%s\"..."
@@ -629,7 +621,7 @@ msgstr "ανάκτηση αρχείων rpm από το μέσο \"%s\"..."
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -637,37 +629,42 @@ msgstr ""
"δημιουργήθηκε transaction για εγκατάσταση στο %s (αφαίρεση=%d, εγκατάσταση=%"
"d, αναβάθμιση=%d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "Αδυναμία δημιουργίας transaction"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "αδυναμία εξαγωγής rpm από το πακέτο delta-rpm %s"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "προσθήκη πακέτου %s (id=%d, eid=%d, αναβάθμιση=%d, αρχείο=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "αδυναμία εγκατάστασης του πακέτου %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "αφαίρεση πακέτου %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "αφαίρεση πακέτου %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "εγκατάσταση %s από %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Περισσότερες πληροφορίες στο πακέτο %s"
@@ -697,11 +694,103 @@ msgstr "Δεν ορίστηκαν πακέτα"
msgid "Cannot connect to ldap uri:"
msgstr "Αδυναμία διάθεσης εγγραφών colormap"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "Η βάση δεδομένων urpmi είναι κλειδωμένη"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Προσοχή"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "Η βάση δεδομένων urpmi είναι κλειδωμένη"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "Τα παρακάτω πακέτα περιέχουν κακές υπογραφές"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Τα παρακάτω πακέτα περιέχουν κακές υπογραφές"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Θέλετε να συνεχίσετε την εγκατάσταση ;"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Η εγκατάσταση απέτυχε"
+
+#: ../urpm/main_loop.pm:133
+#, fuzzy, c-format
+msgid "distributing %s"
+msgstr "κατανομή %s:"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "εγκατάσταση %s από %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "εγκατάσταση %s"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Προσπάθεια για εγκατάσταση χωρίς τον έλεγχο των εξαρτήσεων; (y/N) "
+
+#: ../urpm/main_loop.pm:205
+#, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "Προσπάθεια για πιο δυνατή εγκατάσταση (--force); (y/N) "
+
+#: ../urpm/main_loop.pm:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d αποτυχία διεργασιών εγκατάστασης"
+msgstr[1] "%d αποτυχία διεργασιών εγκατάστασης"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Η εγκατάσταση είναι δυνατή"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "Το πακέτο είναι ήδη εγκατεστημένα"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Τα πακέτα είναι ήδη εγκατεστημένα"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "Το πακέτο είναι ήδη εγκατεστημένα"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Τα πακέτα είναι ήδη εγκατεστημένα"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -753,7 +842,7 @@ msgstr "προσπάθεια επιλογής ανύπαρκτου μέσου \"
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "δημιουργία αρχείου σύνθεσης hdlist για το μέσο \"%s\""
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "αδυναμία πρόσβασης στο αρχείο hdlist του \"%s\", το μέσο αγνοείται"
@@ -850,7 +939,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Έναρξη αναζήτησης: %s τέλος: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "γίνεται δεύτερος έλεγχος για να υπολογιστούν οι εξαρτήσεις\n"
@@ -916,67 +1005,72 @@ msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"αδυναμία πρόσβασης στο πρώτο μέσο εγκατάστασης (δεν βρέθηκε αρχείο hdlists)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "προσπάθεια επιλογής ανύπαρκτου μέσου \"%s\""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "επιλογή πολλαπλών μέσων: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "αφαίρεση μέσου \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "επαναρύθμιση urpmi για το μέσο \"%s\""
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...η επαναρύθμιση απέτυχε"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "επαναρύθμιση πέτυχε"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "δεν έχει επιλεγεί το μέσο \"%s\""
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "εξέταση αρχείου hdlist [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "εξέταση αρχείου σύνθεσης [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "δημιουργία hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -985,78 +1079,78 @@ msgstr ""
"αδυναμία δημιουργίας αρχείου σύνθεσης για το μέσο \"%s\". Το αρχείο hdlist "
"μπορεί να είναι λανθασμένο."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr ""
"πρόβλημα ανάγνωσης του hdlist ή του αρχείου σύνθεσης από το μέσο \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "εγγραφή αρχείου λίστας για το μέσο \"%s\""
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...η αντιγραφή απέτυχε"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "αντιγραφή διαδρομής αρχείου από \"%s\"..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...η αντιγραφή ολοκληρώθηκε"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "αντιγραφή από [%s] απέτυχε (το αρχείο είναι ύποπτα μικρό)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "υπολογισμός md5sum από αντιγραμμένης πηγής hdlist (ή synthesis)"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "η αντιγραφή του [%s] απέτυχε (τα md5sum δεν ταιριάζουν)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "υπολογισμός md5sum του ανακτημένου πηγαίου hdlist (ή synthesis)"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "... η ανάκτηση απέτυχε: Ασυμφωνία md5sum"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "δεν βρέθηκαν αρχεία rpm από το [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "ανάγνωση αρχείων rpm από το [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "αδυναμία ανάγνωσης αρχείων rpm από το [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "καμία ανάγνωση rpm πακέτων"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1067,74 +1161,74 @@ msgstr ""
"αυτό μπορεί να συμβαίνει εάν έχετε προσαρτήσει μόνοι σας τον κατάλογο όταν "
"δημιουργήθηκε το μέσο."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "δεν βρέθηκε αρχείο hdlist για το μέσο \"%s\""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "ανάκτηση πηγής hdlist (ή synthesis) από \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "βρέθηκε ανακτημένο hdlist (ή synthesis) σαν %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "δεν βρέθηκε αρχείο hdlist για το μέσο \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "Εξέταση αρχείου δημοσίου κλειδιού από το \"%s\"..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...εισαγωγή κλειδιού %s από το αρχείο δημοσίου κλειδιού από το \"%s\""
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "αδυναμία εισαγωγής αρχείου δημοσίου κλειδιού από το \"%s\""
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "εγγραφή αρχείου λίστας για το μέσο \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "προστίθεται το μέσο %s"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "αδυναμία ανάλυσης του hdlist αρχείου από το \"%s\""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "πρόβλημα ανάγνωσης του αρχείου σύνθεσης από το μέσο \"%s\""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "ανάγνωση επικεφαλίδων από το μέσο \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "ΟοNn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "ΝνYy"
@@ -1196,47 +1290,52 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "αδυναμία πρόσβασης στο μέσο \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Κανένα πακέτο με το όνομα %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Τα παρακάτω πακέτα περιέχουν %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "λόγω ελλείψεων %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Το πακέτο είναι ήδη εγκατεστημένα"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "λόγω μη ικανοποίησης %s"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "προσπάθεια ενίσχυσης του %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "για να κρατηθεί το %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "για να εγκατασταθεί το %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "λόγω συγκρούσεων με το %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "δεν ζητήθηκαν"
@@ -1256,6 +1355,16 @@ msgstr "Μη έγκυρο ID Κλειδιού (%s)"
msgid "Missing signature (%s)"
msgstr "Απουσία υπογραφής (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Δεν μπορεί να δημιουργηθεί το αρχείο ρυθμίσης [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Η αντιγραφή απέτυχε"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1273,8 +1382,8 @@ msgstr ""
"\n"
"χρήση:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - τύπωσε αυτό το μήνυμα βοήθειας.\n"
@@ -1290,7 +1399,7 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - επαλήθευση ότι η αφαίρεση μπορεί να επιτευχθεί σωστά.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
@@ -1298,13 +1407,13 @@ msgstr ""
" --force - εξαναγκάσμός επίκλησης ακόμα και εάν μερικά πακέτα δεν "
"υπάρχουν.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
" --parallel - διανεμημένα urpmi κατά μήκος των μηχανών με ψευδώνυμα.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr ""
@@ -1315,8 +1424,8 @@ msgid " --root - use another root for rpm removal.\n"
msgstr ""
" --root - χρήση διαφορετικής διαδρομής root για την αφαίρεση rpm.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
@@ -1338,21 +1447,21 @@ msgstr ""
" για την (απ)εγκατάσταση ενός chroot με την --root "
"επιλογή.\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr ""
" -h - Προσπάθησε να βρεις και να χρησιμοποιήσεις το αρχείο\n"
" synthesis hdlist.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr ""
" -h - Προσπάθησε να βρεις και να χρησιμοποιήσεις το αρχείο\n"
" synthesis hdlist.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - αναλυτική λειτουργία.\n"
@@ -1363,37 +1472,37 @@ msgid " -a - select all packages matching expression.\n"
msgstr ""
" -a - επιλογή όλων των πακέτων που ταιριάζουν με την έκφραση.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Μόνο ο διαχειριστής επιτρέπεται να αφαιρέσει πακέτα"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "άγνωστα πακέτα"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "άγνωστο πακέτο"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "η αφαίρεση του πακέτου %s θα καταστρέψει το σύστημά σας"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Τίποτα προς αφαίρεση"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Έλεγχος για την αφαίρεση των παρακάτω πακέτων"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1405,24 +1514,24 @@ msgstr[1] ""
"Για να ικανοποιηθούν οι εξαρτήσεις, τα παρακάτω πακέτα %d θα αφαιρεθούν (%d "
"MB)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr " (%d MB)"
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "Αφαίρεση πακέτων %d ;"
msgstr[1] "Αφαίρεση πακέτων %d ;"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (ν/Ο) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Η αφαίρεση απέτυχε"
@@ -1449,14 +1558,14 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --έκδοση - τύπωσε τον αριθμό έκδοσης αυτού του εργαλείου\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - χρήση συγκεκριμένου περιβάλλοντος (τυπικά μία αναφορά\n"
" σφάλματος).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1469,13 +1578,13 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - χρήση των μέσων που δόθηκαν, διαχωρισμένα με το κόμμα.\n"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1489,7 +1598,7 @@ msgid " --use-distrib - use the given path to access media\n"
msgstr ""
" --synthesis - χρήση του synthesis που δίδεται αντί του urpmi db.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1500,7 +1609,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - μην τυπώσεις πανομοιότυπες γραμμές.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - χρήση μόνο των μέσων αναβάθμισης.\n"
@@ -1631,81 +1740,91 @@ msgid " --group - group\n"
msgstr " --group - ομάδα\n"
#: ../urpmf:72
+#, fuzzy, c-format
+msgid " --license - license\n"
+msgstr " --name - όνομα πακέτου\n"
+
+#: ../urpmf:73
#, c-format
msgid " --name - package name\n"
msgstr " --name - όνομα πακέτου\n"
-#: ../urpmf:73
+#: ../urpmf:74
#, fuzzy, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - ετικέτες των εκτός χρήση"
-#: ../urpmf:74
+#: ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr " --packager - δημιουργός πακέτου\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr ""
" --provides - τύπωσε την ετικέτα με τις παροχές: όλες οι παροχές.\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr ""
" --requires - τύπωσε την ετικέτα με τις εξαρτήσεις: όλες οι "
"εξαρτήσεις.\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --size - τύπωσε την ετικέτα του μεγέθους: μέγεθος.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - όνομα πηγαίου rpm\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - ετικέτες των εκτός χρήση"
+
+#: ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr " --summary - περίληψη.\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, c-format
msgid " --url - url\n"
msgstr " --url - url\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, c-format
msgid " --vendor - vendor\n"
msgstr " --vendor - κατασκευαστής\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -m - το μέσο στο οποίο βρέθηκε το πακέτο\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - τύπωσε την έκδοση, κυκλοφορίας και αρχιτεκτονικής με "
"όνομα.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "χρήση συγκεκριμένου περιβάλλοντος στο %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1714,13 +1833,13 @@ msgstr ""
"Σημείωση: αφού δεν έγινε αναζήτηση σε κανένα μέσο που χρησιμοποιεί hdlists, "
"το urpmf δεν μπόρεσε να επιστρέψει κανένα αποτέλεσμα\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
"Μπορείτε να χρησιμοποιήσετε --name για την αναζήτηση ονομάτων πακέτων.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1737,7 +1856,7 @@ msgstr ""
"\n"
"χρήση:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1745,14 +1864,14 @@ msgstr ""
" --searchmedia - χρήση μόνο των μέσων που δόθηκαν στην αναζήτηση των "
"ζητούμενων (ή των αναβαθμιζόμενων) πακέτων.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
@@ -1760,24 +1879,24 @@ msgstr ""
" --auto-select - αυτόματη επιλογή πακέτων για την αναβάθμιση του "
"συστήματος.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
" --auto-select - αυτόματη επιλογή πακέτων για την αναβάθμιση του "
"συστήματος.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr ""
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr ""
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1786,12 +1905,12 @@ msgstr ""
" --no-uninstall - μην ρωτήσεις για να απεγκαταστήσεις ένα πακέτο, διέκοψε "
"την εγκατάσταση.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - μη εγκατάσταση πακέτων (μόνο λήψη)\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1800,7 +1919,7 @@ msgstr ""
" --keep - κράτα τα υπάρχοντα πακέτα εάν είναι δυνατόν, reject\n"
" τα ζητούμενα πακέτα που οδηγούν σε αφαίρεση.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1808,43 +1927,49 @@ msgid ""
" default is %d.\n"
msgstr ""
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr ""
-#: ../urpmi:104
+#: ../urpmi:100
#, fuzzy, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy, -y - τύπωσε όλα τα tags.\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr ""
" --src, -s - το επόμενο πακέτο είναι ένα πακέτο πηγαίου κώδικα \n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
" --install-src - εγκατάσταση μόνο του πηγαίου πακέτου (όχι εκτελέσιμα).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr ""
" --clean - αφαίρεσε τα rpm από την προσωρινή μνήμη πριν από κάθε "
"άλλο.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, fuzzy, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr ""
" --noclean - κράτα τα rpm που δεν χρησιμοποιήθηκαν στην προσωρινή "
"μνήμη.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1854,7 +1979,7 @@ msgstr ""
"πακέτα χωρίς\n"
" να ελέγχει τις εξαρτήσεις.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1863,14 +1988,14 @@ msgstr ""
" --allow-force - επέτρεψε στον χρήστη να ρωτάει για τα πακέτα χωρίς\n"
" να ελέγχει τις εξαρτήσεις και την ακεραιότητα.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr ""
" --root - χρησιμοποίηση μία άλλη διαδρομή root για την εγκατάσταση "
"του rpm.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1880,51 +2005,51 @@ msgstr ""
"χρήσιμο\n"
" για να εγκαταστήσετε ένα chroot με την επιλογή --root .\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr ""
" --wget - χρήση του wget για την ανάκτηση απομακρυσμένων αρχείων.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr ""
" --curl - χρήση του curl για την ανάκτηση απομακρυσμένων αρχείων.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr ""
" --prozilla - χρήση του prozilla για την ανάκτηση απομακρυσμένων "
"αρχείων.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - περιόρισε την ταχύτητα λήψης.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, fuzzy, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1933,28 +2058,28 @@ msgstr ""
"\n"
" ενεργοποιημένο"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../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 ""
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
" authentication (format is <user:password>).\n"
msgstr ""
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
" next arg.\n"
msgstr ""
-#: ../urpmi:138
+#: ../urpmi:135
#, fuzzy, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1963,7 +2088,7 @@ msgstr ""
"\n"
" ενεργοποιημένο"
-#: ../urpmi:140
+#: ../urpmi:137
#, fuzzy, c-format
msgid ""
" --test - only verify if the installation can be achieved "
@@ -1972,106 +2097,111 @@ msgstr ""
" --test - επαλήθευσε μόνο ότι η εγκατάσταση μπορεί να επιτευχθεί "
"σωστά.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - εξαιρούμενες διαδρομές διαχωρισμένες με το κόμμα.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - εξαιρούμενα αρχεία τεκμηρίωσης.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, fuzzy, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --no-uninstall - μην ρωτήσεις για να απεγκαταστήσεις ένα πακέτο, διέκοψε "
"την εγκατάσταση.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --url - τύπωσε την ετικέτα των συνδέσμων url: url.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - τύπωσε την ετικέτα περιγραφής: περιγραφή.\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - πακέτα τα οποίο η εγκατάσταση θα προσπεράσει\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - πακέτα τα οποίο η εγκατάσταση θα προσπεράσει\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:150
+#: ../urpmi:148
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr ""
" --noclean - κράτα τα rpm που δεν χρησιμοποιήθηκαν στην προσωρινή "
"μνήμη.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
" --strict-arch - αναβάθμισε μόνο τα πακέτα με την ίδια αρχιτεκτονική.\n"
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
" -a - επιλογή όλων των μέσων που ταιριάζουν στην γραμμή "
"εντολών.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, fuzzy, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -f - αναγκαστική δημιουργία αρχείων hdlist.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, fuzzy, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -f - αναγκαστική δημιουργία αρχείων hdlist.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - σιωπηλή λειτουργία.\n"
-#: ../urpmi:157
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
" ονόματα ή αρχεία rpm που δόθηκαν στην γραμμή εντολών θα εγκατασταθούν.\n"
-#: ../urpmi:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
"Δεν μπορείτε να εγκαταστήσετε δυαδικά αρχεία rpm όταν χρησιμοποιείτε --"
"install-src"
-#: ../urpmi:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2080,7 +2210,7 @@ msgstr ""
"Ο κατάλογος [%s] υπάρχει ήδη, παρακαλώ χρησιμοποιήστε ένα διαφορετικό "
"κατάλογο για να αναφορά σφάλματος ή διαγράψτε το"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "αδυναμία δημιουργίας καταλόγου [%s] για την αναφορά σφάλματος"
@@ -2090,41 +2220,43 @@ msgstr "αδυναμία δημιουργίας καταλόγου [%s] για
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (προς αναβάθμιση)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (προς αναβάθμιση)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (προς εγκατάσταση)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, c-format
msgid "%s (to install)"
msgstr "%s (προς εγκατάσταση)"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2133,12 +2265,12 @@ msgstr ""
"Για να ικανοποιηθούν οι εξαρτήσεις, τα παρακάτω πακέτα %d θα αφαιρεθούν (%d "
"MB)"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Ποια είναι η επιλογή σας; (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2146,7 +2278,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2154,7 +2286,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, c-format
msgid ""
"\n"
@@ -2163,12 +2295,12 @@ msgstr ""
"\n"
"Να συνεχίσω την εγκατάσταση;"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (Ν/ο) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2177,7 +2309,7 @@ msgstr ""
"Ορισμένα πακέτα που ζητήθηκαν δεν μπορούν να εγκατασταθούν:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2186,7 +2318,7 @@ msgstr ""
"Ορισμένα πακέτα που ζητήθηκαν δεν μπορούν να εγκατασταθούν:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2197,7 +2329,7 @@ msgstr ""
"αφαιρεθούν για να αναβαθμιστούν κάποια άλλα:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2208,7 +2340,7 @@ msgstr ""
"αφαιρεθούν για να αναβαθμιστούν κάποια άλλα:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2217,7 +2349,7 @@ msgstr ""
"Τα παρακάτω πακέτα πρέπει να αφαιρεθούν για να αναβαθμιστούν κάποια άλλα:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2226,12 +2358,17 @@ msgstr ""
"Τα παρακάτω πακέτα πρέπει να αφαιρεθούν για να αναβαθμιστούν κάποια άλλα:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2241,111 +2378,29 @@ msgstr ""
"εξαρτήσεις:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, 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:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Πατήστε enter όταν τελειώσετε..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Ακύρωση"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "Τα παρακάτω πακέτα περιέχουν κακές υπογραφές"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Τα παρακάτω πακέτα περιέχουν κακές υπογραφές"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Θέλετε να συνεχίσετε την εγκατάσταση ;"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Η εγκατάσταση απέτυχε"
-
-#: ../urpmi:711
-#, fuzzy, c-format
-msgid "distributing %s"
-msgstr "κατανομή %s:"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "εγκατάσταση %s από %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "εγκατάσταση %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Προσπάθεια για εγκατάσταση χωρίς τον έλεγχο των εξαρτήσεων; (y/N) "
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Προσπάθεια για πιο δυνατή εγκατάσταση (--force); (y/N) "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d αποτυχία διεργασιών εγκατάστασης"
-msgstr[1] "%d αποτυχία διεργασιών εγκατάστασης"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Η εγκατάσταση είναι δυνατή"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Το πακέτο είναι ήδη εγκατεστημένα"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Τα πακέτα είναι ήδη εγκατεστημένα"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "Το πακέτο είναι ήδη εγκατεστημένα"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "Τα πακέτα είναι ήδη εγκατεστημένα"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "Επανεκκίνηση urpmi"
@@ -2472,49 +2527,49 @@ msgstr " -v - αναλυτική περιγραφή.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "αδυναμία αναβάθμισης του μέσου \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Μόνο ο διαχειριστής επιτρέπεται να προσθέσει μέσο"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "Θα δημιουργηθεί το αρχείο ρυθμίσης [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "Δεν μπορεί να δημιουργηθεί το αρχείο ρυθμίσης [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "η χρειάζεται να δώσετε <σχετική διαδρομή του hdlist> με το --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "η <σχετική διαδρομή του hdlist> λείπει\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "αδυναμία δημιουργίας του μέσου \"%s\"\n"
@@ -2677,18 +2732,18 @@ msgstr " -a - επιλογή όλων των μέσων.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -q - σιωπηλή λειτουργία.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Μόνο ο διαχειριστής επιτρέπεται να αφαιρέσει μέσο"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr ""
"τίποτα για διαγραφή (χρησιμοποιήστε urpmi.addmedia για προσθήκη μέσου)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2744,18 +2799,18 @@ msgstr " -a - επιλογή όλων των μη αφαιρούμ
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - αναγκαστική δημιουργία αρχείων hdlist.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Μόνο ο διαχειριστής επιτρέπεται να αναβαθμίσει μέσο"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
"τίποτα για αναβάθμιση (χρησιμοποιήστε urpmi.addmedia για προσθήκη μέσου)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2764,22 +2819,22 @@ msgstr ""
"η επιλογή για αναβάθμιση λείπει\n"
"(ένα εκ των %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "Αγνόηση μέσου %s"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "ενεργοποίηση μέσου %s"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2796,7 +2851,7 @@ msgstr ""
"\n"
"χρήση:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2805,139 +2860,139 @@ msgstr ""
" --searchmedia - χρήση μόνο των μέσων που δόθηκαν στην αναζήτηση των "
"ζητούμενων (ή των αναβαθμιζόμενων) πακέτων.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, fuzzy, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --all - τύπωσε όλα τα tags."
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - εμφάνιση διαθέσιμων πακέτων.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - εμφάνιση διαθέσιμων μέσων.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, fuzzy, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-media - εμφάνιση διαθέσιμων μέσων.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, fuzzy, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr " --list-media - εμφάνιση διαθέσιμων μέσων.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, fuzzy, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-media - εμφάνιση διαθέσιμων μέσων.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr ""
" --src - το επόμενο πακέτο είναι ένα πακέτο πηγαίου κώδικα (ίδιο "
"με το -s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr ""
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --url - τύπωσε την ετικέτα των συνδέσμων url: url.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
" This permit to querying a distro.\n"
msgstr ""
-#: ../urpmq:84
+#: ../urpmq:81
#, fuzzy, c-format
msgid " --changelog - print changelog.\n"
msgstr " --all - τύπωσε όλα τις ετικέτες.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - τύπωσε την ετικέτα περίληψης: περίληψη.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " -a - επιλογή όλων των μέσων.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, fuzzy, c-format
msgid ""
" --whatrequires-recursive\n"
" - extended reverse search (includes virtual packages).\n"
msgstr " -a - επιλογή όλων των μέσων.\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " --X - χρήση διεπαφής X.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, fuzzy, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " γραμμή εντολών αλλά χωρίς όνομα πακέτου)."
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - εκτεταμένο ερώτημα στις εξαρτήσεις των πακέτων.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, fuzzy, c-format
msgid " -g - print groups with name also.\n"
msgstr " -q - σιωπηλή λειτουργία.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, fuzzy, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -f - αναγκαστική δημιουργία αρχείων hdlist.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - λίστα αρχείων στο πακέτο.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - σιωπηλή λειτουργία.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, fuzzy, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -v - αναλυτική λειτουργία.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - το επόμενο πακέτο είναι πηγαίο πακέτο (ίδιο με το --"
"src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2946,46 +3001,46 @@ msgstr ""
" -u - αφαίρεση πακέτου εάν μια πιο πρόσφατη έκδοση είναι ήδη "
"εγκατεστημένη.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, fuzzy, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
" -s - το επόμενο πακέτο είναι πηγαίο πακέτο (ίδιο με το --"
"src).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, fuzzy, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " --list - εμφάνιση διαθέσιμων πακέτων.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
-#: ../urpmq:181
+#: ../urpmq:180
#, fuzzy, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr " --all - τύπωσε όλα τα tags."
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"Σημείωση: αφού δεν έγινε αναζήτηση σε κανένα μέσο που χρησιμοποιεί hdlists, "
"το urpmf δεν μπόρεσε να επιστρέψει κανένα αποτέλεσμα\n"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2993,11 +3048,23 @@ msgstr ""
"Σημείωση: αφού δεν έγινε αναζήτηση σε κανένα μέσο που χρησιμοποιεί hdlists, "
"το urpmf δεν μπόρεσε να επιστρέψει κανένα αποτέλεσμα\n"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Τα παρακάτω πακέτα έχουν κακές υπογραφές:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Θέλετε να συνεχίσετε την εγκατάσταση ;"
+
#, fuzzy
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Πρέπει να είστε root για να κάνετε χρήση της εντολής ! \n"
diff --git a/po/eo.po b/po/eo.po
index 36505de7..78f320ac 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+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"
@@ -23,7 +23,7 @@ msgstr ""
"X-Generator: KBabel 1.0.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "RPM instalado"
@@ -33,7 +33,7 @@ msgstr "RPM instalado"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Jes"
@@ -99,7 +99,7 @@ msgstr "_Instalu"
msgid "_Save"
msgstr "_Konservu"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Nuligu"
@@ -119,17 +119,17 @@ msgstr "Nekonataj opcio %s"
msgid "No packages specified"
msgstr "Neniu pakaĵo indikita"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Bonvole atendu..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "Devas esti sistemestro"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -140,42 +140,42 @@ msgstr ""
"%s\n"
"Ĉu vi deziras tamen daŭrigi?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Averto"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Jes"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (ĝisdatigi)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (instali)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Unu el la sekvantaj pakaĵoj estas bezonata:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "Ĉ_esigu"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -186,14 +186,14 @@ msgstr ""
"%s\n"
"Ĉu vi deziras tamen daŭrigi?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, 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:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -202,48 +202,49 @@ msgstr ""
"esti instalataj:\n"
"%s\n"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, 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:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Instalado de pakaĵo..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "Ne povas preni fontajn pakaĵojn, mi ĉesiĝas."
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Mi preparas..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Mi instalas pakaĵon '%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Bonvole enŝovu la medion nomata \"%s\" en aparaton [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Mi elŝutas pakaĵon '%s'..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"La sekvantaj dosieroj havas nevalidajn signaturojn:\n"
-"\n"
-"%s\n"
-"\n"
-"Ĉu vi deziras tamen daŭrigi la instaladon ?"
+msgid "_Done"
+msgstr "_Finata"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -254,41 +255,27 @@ msgstr ""
"%s\n"
"Eble vi ĝisdatigu vian urpmi-datenbazon"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "foriganta %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Mi preparas..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Mi instalas pakaĵon '%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Finata"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, c-format
msgid "Installation failed:"
msgstr "Instalado malsukcesis:"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "La pakaĵo(j) estas jam instalita(j)"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Instalo finita"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "foriganta %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -323,7 +310,7 @@ msgstr " -g - printu grupojn ankaŭ kun nomo.\n"
msgid " defaults to %s.\n"
msgstr " defaŭlte al %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Nur superuzulo rajtas instali pakaĵojn"
@@ -333,98 +320,98 @@ msgstr "Nur superuzulo rajtas instali pakaĵojn"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "ne povis malfermi rpmdb"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nevalida rpm-a dosiernomo [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "mi ekstraktas rpm-dosieron [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "... ekstraktado farita"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...ekstraktado malsukcesis: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "ne povis atingi rpm-an dosieron [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "ne povis analizi \"%s\" en dosiero [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "ne povas registri rpm-dosieron"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "eraro dum registri lokajn pakaĵojn"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "malĝusta deklaro de prokuro en la komanda linio\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: ne povas legi rpm-an dosieron \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "konstruis hdlist-an sintezan dosieron por medio \"%s\""
@@ -614,7 +601,12 @@ msgstr "pakaĵo %s ne estis trovata."
msgid "malformed URL: [%s]"
msgstr "malbone formata enigo: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "ekstraktanta la rpm-dosierojn de datenportilo \"%s\"..."
@@ -624,44 +616,49 @@ msgstr "ekstraktanta la rpm-dosierojn de datenportilo \"%s\"..."
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, 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:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "ne povis krei transakcion"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "ne povas forigi pakaĵon %s"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "mi aldonas pakaĵon %s (id=%d, eid=%d, ĝisdatigo=%d, dosiero=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "ne povas instali pakaĵon %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "mi forigas la pakaĵon %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "mi forigas la pakaĵon %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "instalas %s el %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Kromaj informoj pri pakaĵo %s"
@@ -691,11 +688,103 @@ msgstr "Neniu pakaĵo indikita"
msgid "Cannot connect to ldap uri:"
msgstr ""
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "urpmi-datenbazo ŝlosita"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Averto"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "urpmi-datenbazo ŝlosita"
+#: ../urpm/main_loop.pm:99
+#, c-format
+msgid "The following package has bad signature"
+msgstr "La sekvanta pakaĵo havas malĝustan signaturon"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "La sekvantaj pakaĵoj havas malĝustajn signaturojn"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Ĉu vi deziras daŭrigi la instaladon ?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Instalado malsukcesis"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "distribuanta %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "instalas %s el %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "instalas %s"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Provu instaladon sen kontroli dependaĵojn? (j/N) "
+
+#: ../urpm/main_loop.pm:205
+#, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "Provu instaladon eĉ pli forte (--force)? (j/N) "
+
+#: ../urpm/main_loop.pm:247
+#, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d instal-transakcio malsukcesis"
+msgstr[1] "%d instal-transakcioj malsukcesis"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Instalado eblas"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, c-format
+msgid "Package %s is already installed"
+msgstr "La pakaĵo %s estas jam instalita"
+
+#: ../urpm/main_loop.pm:272
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "La pakaĵoj %s estas jam instalitaj"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "La pakaĵo estas jam instalita"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "La pakaĵoj estas jam instalitaj"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -745,7 +834,7 @@ msgstr "provas elekti neekzistantan datenportilon \"%s\""
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "konstruis hdlist-an sintezan dosieron por medio \"%s\""
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "ne povas atingi \"hdlist\" dosieron de \"%s\", ignoris medion"
@@ -838,7 +927,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Serĉo startas al: %s finas al: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "mi faras duan pason por kalkuli dependaĵojn\n"
@@ -904,67 +993,72 @@ 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:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "provas elekti neekzistantan datenportilon \"%s\""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "mi elektas plurtipan datenportilon: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "foriganta datenportilon \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "rekonfiguras urpmi-on por datenportilo \"%s\"..."
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...rekonfigurado malsukcesis"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "rekonfigurado finita"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "medio \"%s\" ne estas elektata"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "kontrolanta hdlist-dosieron [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "mi kontrolas la sintezo-dosieron [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "konstruas \"hdlist\" [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -973,77 +1067,77 @@ msgstr ""
"Ne povis konstrui syntezan dosieron por medio \"%s\".Via hd-list-dosiero "
"estas probable nevalida."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problemo legante la hdlist aŭ sintezo-dosiero de datenportilo \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "skribante list-dosieron por datenportilo \"%s\""
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...kopiado malsukcesis"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "mi kopias priskrib-dosieron de \"%s\"..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...kopiado farita"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopiado de [%s] malsukcesis (dosiero estas strange malgranda)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "mi kalkulas md5sum de kopiita font-hdlist (aŭ sintezo)"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "kopiado de [%s] malsukcesis (md5sum-konfuzo)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "kalkulata md5sum de ekstraktita fonto hdlist (aŭ sintezo)"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...ekstraktado malsukcesis: md5sum-konfuzo"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "neniom da rpm-aj dosieroj trovataj de [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "mi legas la rpm-dosierojn de [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "ne povis legi rpm-dosierojn de [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "neniu rpm-a dosiero legita"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1053,74 +1147,74 @@ msgstr ""
"ne povas aliri datenportilon \"%s\",\n"
"tio povas okazi se vi mane surmetis la dosierujon kreante la datenportilon."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "neniu \"hdlist\" dosiero trovita por medio \"%s\""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "ekstraktanta la font-hd-liston (aŭ sintezon) de \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "provita hd-listo (aŭ sintezo) trovita kiel %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "neniu \"hdlist\" dosiero trovita por medio \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "kontrolante la publikan ĉifroŝlosilon de \"%s\"..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...importis ĉifroŝlosilon %s de \"%s\""
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "ne povis importi la publikan ĉifroŝlosilon de \"%s\""
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "skribante list-dosieron por datenportilo \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "aldonita datenportilo %s"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "ne povis analizi hdlist dosieron de \"%s\""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problemo por legi sintezan dosieron por datenportilo \"%s\""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "mi legas la ĉapojn de la datenportilo \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "YyJj"
@@ -1180,47 +1274,52 @@ msgstr "malkohera medio \"%s\" indikita forigebla sed ne vere"
msgid "unable to access medium \"%s\""
msgstr "ne povis atingi medion \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Neniu pakaĵo nomata %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "La sekvantaj pakaĵoj enhavas %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "pro mankanta %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "La pakaĵo %s estas jam instalita"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "pro neplenumita %s"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "mi provas disponigi %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "por konservi %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "por instali %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "pro konflikto kun %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "nepetita"
@@ -1240,6 +1339,16 @@ msgstr "Nevalida Ŝlosil-ID (%s)"
msgid "Missing signature (%s)"
msgstr "Mankas signaturo (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "ne povas skribi dosieron [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Kopiado malsukcesis"
+
#: ../urpme:40
#, fuzzy, c-format
msgid ""
@@ -1257,8 +1366,8 @@ msgstr ""
"\n"
"uzado:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1274,18 +1383,18 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - kontrolu ĉu la instalado povas esti ĝuste arĥivota.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr " --force - trudu envokon eĉ se iuj pakaĵoj ne ekzistas.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - distribuita urpmi tra maŝinoj de kromnomo.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - printu etiked-pakilon: packager.\n"
@@ -1296,8 +1405,8 @@ msgid " --root - use another root for rpm removal.\n"
msgstr ""
" --root - uzu alian vojprefikson por instali la RPM-aj dosieroj.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
@@ -1315,17 +1424,17 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - provu trovi kaj uzi sintezan dosieron.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - provu trovi kaj uzi hd-listan dosieron.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - babilema modo.\n"
@@ -1335,37 +1444,37 @@ msgstr " --verbose - babilema modo.\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - elektu ĉiujn pakaĵojn kongruajn kun la esprimo.\n"
-#: ../urpme:76
+#: ../urpme:73
#, fuzzy, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Nur superuzulo rajtas forpreni pakaĵojn"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "nekonataj pakaĵoj"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "nekonata pakaĵo"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "forigi pakaĵon %s detruos vian sistemon"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Nenio forigenda"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Mi kontrolas por forigi la sekvantajn pakaĵojn"
-#: ../urpme:134
+#: ../urpme:131
#, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1373,24 +1482,24 @@ msgid_plural ""
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"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr " (%d MB)"
-#: ../urpme:138
+#: ../urpme:135
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "Malinstalu %d pakaĵon?"
msgstr[1] "Malinstalu %d pakaĵojn?"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (J/n) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Forigado malsukcesis"
@@ -1417,12 +1526,12 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --help - presu tiun ĉi help-mesaĝon.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr " --env - uzu specifan medion (tipe estas cim-raporto).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1434,13 +1543,13 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../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"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1453,7 +1562,7 @@ msgstr ""
msgid " --use-distrib - use the given path to access media\n"
msgstr " --synthesis - uzu la donitan sintezon anstataŭ la urpmi-db.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - uzu la donitan sintezon anstataŭ la urpmi-db.\n"
@@ -1463,7 +1572,7 @@ msgstr " --synthesis - uzu la donitan sintezon anstataŭ la urpmi-db.\n"
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - ne printu identajn liniojn.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - uzu nur ĝisdatigajn datenportilojn.\n"
@@ -1595,76 +1704,86 @@ msgstr " --group - printu etikedo-grupon: group.\n"
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr " --name - printu nur la nomojn de la pakaĵoj.\n"
#: ../urpmf:73
#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr " --name - printu nur la nomojn de la pakaĵoj.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - printu etikedajn arkaikojn: ĉiuj arkaikoj.\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr " --packager - printu etiked-pakilon: packager.\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, fuzzy, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - presu etikedan provizon: ĉiuj provizoj.\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, fuzzy, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - printu etikedan postulojn: ĉiujn postulojn.\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --size - printu grandecon de etikedo: size.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, fuzzy, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - printu etikedon sourcerpm: source rpm.\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - printu etikedajn arkaikojn: ĉiuj arkaikoj.\n"
+
+#: ../urpmf:81
#, fuzzy, c-format
msgid " --summary - summary\n"
msgstr " --group - printu etikedan resumon: summary.\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr " --url - presu url-on de etikedo: url.\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr " --verbose - babilema modo.\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -l - listigu dosierojn en la pakaĵo.\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - printu version, eldonon kaj arkitekturon kun nomo.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "uzante specifan medion sur %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1673,12 +1792,12 @@ msgstr ""
"Notu: ĉar neniu serĉita datenportilo uzas hdlist-dosierojn, urpmf ne povis "
"doni rezulton\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Eblas ke vi volas uzi --name por serĉi pakaĵ-nomojn.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, fuzzy, c-format
msgid ""
"urpmi version %s\n"
@@ -1695,7 +1814,7 @@ msgstr ""
"\n"
"uzado:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1703,37 +1822,37 @@ msgstr ""
" --searchmedia - uzu nur la donitajn datenportilojn por serĉi menditaj (aŭ "
"ĝisdatigitaj) pakaĵoj.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr ""
" --auto-select - aŭtomate elektas pakaĵojn por ĝisdatigi la sistemon.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
" --auto-select - aŭtomate elektas pakaĵojn por ĝisdatigi la sistemon.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, fuzzy, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - malebligas la kontrolon de dosieroj per MD5SUM.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, fuzzy, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - devigu la ĝisdatigon de la GPG ĉifroŝlosilon.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1741,12 +1860,12 @@ msgid ""
msgstr ""
" --no-uninstall - neniam petu malinstali pakaĵon, ĉesigu la instaladon.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, fuzzy, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --install-src - instalu nur font-pakaĵojn (ne binarajn).\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1756,7 +1875,7 @@ msgstr ""
"postulatajn\n"
" pakaĵojn kiuj kondukas al forigo.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1767,38 +1886,44 @@ msgstr ""
" estas instalotaj aŭ ĝisdatigotaj,\n"
" defaŭlta estas %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - eta transakcio-longo, defaŭlta estas %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, fuzzy, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy - trudu serĉadon de dubindaĵoj (same kiel -y).\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, fuzzy, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src - venonta pakaĵo estas font-pakaĵo (same kiel -s).\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr " --install-src - instalu nur font-pakaĵojn (ne binarajn).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr ""
" --clean - forigu rpm el la kaŝejo antaŭ ol fari ion ajn alian.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, fuzzy, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - konservu rpm ne uzatan en kaŝejo.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1807,7 +1932,7 @@ msgstr ""
" --allow-nodeps - permesu peti la uzulon instali pakaĵojn sen\n"
" kontrolado de dependaĵoj.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1816,60 +1941,60 @@ msgstr ""
" --allow-force - permesu peti uzulon instali pakaĵojn sen\n"
" dependaĵ-kontrolo kaj integreco.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr ""
" --root - uzu alian vojprefikson por instali la RPM-aj dosieroj.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
" to install a chroot with --root option.\n"
msgstr ""
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - uzu wget por ekstrakti forajn dosierojn.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - uzu curl por ekstrakti forajn dosierojn.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, fuzzy, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --curl - uzu curl por ekstrakti forajn dosierojn.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - limigu la deŝut-rapidon.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1878,7 +2003,7 @@ msgstr ""
" --resume - pluigu elŝutado de nekomplete elŝutataj dosieroj\n"
" (--no-resume elŝaltu ĝin, defaŭlta estas elŝaltita).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1889,7 +2014,7 @@ msgstr ""
" 1080 defaŭlte (la formato estas <prokura gastiganto[:"
"pordo]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1898,7 +2023,7 @@ msgstr ""
" --proxy-user - difinu uzulon kaj pasvorton por uzi prokuran\n"
" aŭtentigon (formato estas <uzulo:pasvorto>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1907,7 +2032,7 @@ msgstr ""
" --bug - eligu cim-raporton en dosierujon indikitan de\n"
" next arg.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, fuzzy, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1916,7 +2041,7 @@ msgstr ""
" --verify-rpm - kontrolu rpm-signaturon antaŭ instalado\n"
" (--no-verify-rpm elŝaltu ĝin, defaŭlta estas enŝaltita).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, fuzzy, c-format
msgid ""
" --test - only verify if the installation can be achieved "
@@ -1924,38 +2049,43 @@ msgid ""
msgstr ""
" --test - kontrolu ĉu la instalado povas esti ĝuste arĥivota.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - eksigu padon disigitan de komo.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - eksigu dokumentajn dosierojn.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, fuzzy, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --no-uninstall - neniam petu malinstali pakaĵon, ĉesigu la instaladon.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --url - presu url-on de etikedo: url.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - printu etikedan priskribon: description.\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - pakaĵoj kiuj ne devas esti instalataj.\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - pakaĵoj kiuj ne devas esti instalataj.\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1965,60 +2095,60 @@ msgstr ""
"elektojn\n"
" ol en la defaŭlta moduso.\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - konservu rpm ne uzatan en kaŝejo.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, 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:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - elektu ĉiujn kongruojn en la komanda linio.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, 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"
-#: ../urpmi:154
+#: ../urpmi:152
#, 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"
-#: ../urpmi:155
+#: ../urpmi:153
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - silenta modo.\n"
-#: ../urpmi:157
+#: ../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:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, 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:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2027,7 +2157,7 @@ msgstr ""
"Dosieraro [%s] jam ekzistas, bonvole elektu alian dosieraron por la cim-"
"raporto, aŭ forigi ĝin"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Ne povas krei dosierujon [%s] por cim-raporto"
@@ -2037,7 +2167,7 @@ msgstr "Ne povas krei dosierujon [%s] por cim-raporto"
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2046,46 +2176,48 @@ msgstr ""
"Eraro: %s ŝajnas esti nur legebla.\n"
"Uzu --allow-force por provi skribadon."
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (ĝisdatigi)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (ĝisdatigi)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (instali)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (instali)"
-#: ../urpmi:447
+#: ../urpmi:454
#, 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:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Kiu estas via elekto? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2097,7 +2229,7 @@ msgstr ""
"kiuj estas pli malnovaj ol tiuj kiuj estas jam instalataj:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2109,19 +2241,19 @@ msgstr ""
"kiuj estas pli malnovaj ol tiuj kiuj estas jam instalataj:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Ĉu mi devus daŭri malgraŭe?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (J/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2130,7 +2262,7 @@ msgstr ""
"Iuj postulataj pakaĵoj ne instaleblas:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2139,7 +2271,7 @@ msgstr ""
"Iuj postulataj pakaĵoj ne instaleblas:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2150,7 +2282,7 @@ msgstr ""
"forigotas por ke aliaj estu ĝisdatigotaj:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2161,7 +2293,7 @@ msgstr ""
"forigotas por ke aliaj estu ĝisdatigotaj:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2170,7 +2302,7 @@ msgstr ""
"La sekvanta pakaĵo estas forigota por ke aliaj estu ĝisdatigotaj:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2179,12 +2311,17 @@ msgstr ""
"La sekvantaj pakaĵoj estas forigotaj por ke aliaj estu ĝisdatigotaj:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2193,111 +2330,29 @@ msgstr ""
"Vi devas esti root por instali la sekvantajn dependaĵojn:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, 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:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Premu la enigklavon kiam vi pretas..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Nuligu"
-#: ../urpmi:671
-#, c-format
-msgid "The following package has bad signature"
-msgstr "La sekvanta pakaĵo havas malĝustan signaturon"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "La sekvantaj pakaĵoj havas malĝustajn signaturojn"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Ĉu vi deziras daŭrigi la instaladon ?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Instalado malsukcesis"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "distribuanta %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "instalas %s el %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "instalas %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Provu instaladon sen kontroli dependaĵojn? (j/N) "
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Provu instaladon eĉ pli forte (--force)? (j/N) "
-
-#: ../urpmi:815
-#, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d instal-transakcio malsukcesis"
-msgstr[1] "%d instal-transakcioj malsukcesis"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Instalado eblas"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, c-format
-msgid "Package %s is already installed"
-msgstr "La pakaĵo %s estas jam instalita"
-
-#: ../urpmi:839
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "La pakaĵoj %s estas jam instalitaj"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "La pakaĵo estas jam instalita"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "La pakaĵoj estas jam instalitaj"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "restartas urpmi"
@@ -2424,49 +2479,49 @@ msgstr " -v - babilema modo.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "ne povis ĝisdatigi medion \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Nur superuzulo rajtas aldoni datenportilon"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, c-format
msgid "creating config file [%s]"
msgstr "mi kreos konfiguran dosieron [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "Ne povas krei konfiguran dosieron [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "ne bezonas doni <relative path of hdlist> per --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<relativa dosieronomo de hd-listo> mankas\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "ne povis krei medion \"%s\"\n"
@@ -2627,17 +2682,17 @@ msgstr " -a - elektu ĉiujn datenportilojn.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - proksimuma serĉo en la nomoj de medioj.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Nur superuzulo rajtas forpreni pakaĵojn"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "nenio por forpreni (uzu urpmi.addmedia por aldoni medion)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2692,17 +2747,17 @@ msgstr " -a - elektu ĉiujn nemoveblajn datenportilojn.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - trudu ĝisdatigon de sintezo/hdlist-dosieroj.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Nur superuzulo rajtas ĝisdatigi pakaĵojn"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "nenio por ĝisdatigi (uzu urpmi.addmedia por aldoni medion)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2711,22 +2766,22 @@ msgstr ""
"la enskribaĵo por ĝisgatigi mankas\n"
"(unu el %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "preterlasante datenportilon \"%s\":"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "ebligante datenportilon \"%s\""
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2743,7 +2798,7 @@ msgstr ""
"\n"
"uzado:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2752,84 +2807,84 @@ msgstr ""
" --searchmedia - uzu nur la donitajn datenportilojn por serĉi menditaj (aŭ "
"ĝisdatigitaj) pakaĵoj.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - trudu serĉadon de dubindaĵoj (same kiel -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - listigu haveblajn pakaĵojn.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - listigu haveblajn datenportilojn.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - listu haveblajn datenportilojn kaj ĝiajn URL-ojn.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
" --list-nodes - listigas haveblajn nodojn kiam vi uzas --parallel.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - listigu haveblajn paralelajn kromnomojn.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
" --dump-config - afiŝu la konfigurado kiel urpmi.addmedia argumento.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr " --src - venonta pakaĵo estas font-pakaĵo (same kiel -s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr ""
" --sources - donu ĉiujn font-pakaĵojn antaŭ ol deŝuti (nur root).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --url - presu url-on de etikedo: url.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
" This permit to querying a distro.\n"
msgstr ""
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - printu la ĵurnalon de la ŝanĝoj.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --group - printu etikedan resumon: summary.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - retroiru serĉadon al tio kion postulas la pakaĵo.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2838,55 +2893,55 @@ msgstr ""
" --whatrequires-recursive\n"
" - retroiru serĉadon al tio kion postulas la pakaĵo.\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -p - serĉu en \"provides\" por trovi la pakaĵon.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - kompleta eligo kun forigota pakaĵo.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - etendu la informmendon al pakaĵ-dependaĵoj.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - printu grupojn ankaŭ kun nomo.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - presu uzeblan informon en homlega formo.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - listigu dosierojn en la pakaĵo.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - silenta modo.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - presu version kaj ankaŭ eldonon kun nomo.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - sekvanta pakaĵo estas font-pakaĵo (same kiel --src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2894,45 +2949,45 @@ msgid ""
msgstr ""
" -u - forigu pakaĵon se pli freŝa versio estas jaminstalita.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - trudu serĉadon de dubindaĵoj (same kiel --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -Y - same kiel -y, sed uskleco-blinda.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
" nomoj aŭ rpm-dosieroj donitaj en komand-linio estas informmendataj.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes uzeblas nur kun --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"Notu: ĉar neniu serĉita datenportilo uzas hdlist-dosierojn, urpmf ne povis "
"doni rezulton\n"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2940,11 +2995,23 @@ msgstr ""
"Notu: ĉar neniu serĉita datenportilo uzas hdlist-dosierojn, urpmf ne povis "
"doni rezulton\n"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Neniu \"changelog\" trovita\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "La sekvantaj dosieroj havas nevalidajn signaturojn:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Ĉu vi deziras tamen daŭrigi la instaladon ?"
+
#, fuzzy
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Vi devas esti \"root\" por uzi ĉi tiun ordonon ! \n"
@@ -3228,9 +3295,6 @@ msgstr "Neniu \"changelog\" trovita\n"
#~ "Iuj postulataj pakaĵoj ne instaleblas:\n"
#~ "%s"
-#~ msgid "unable to write file [%s]"
-#~ msgstr "ne povas skribi dosieron [%s]"
-
#~ msgid ""
#~ " --distrib-XXX - automatically create a medium for XXX part of a\n"
#~ " distribution, XXX may be main, contrib, updates or\n"
diff --git a/po/es.po b/po/es.po
index e99939ff..cebaa723 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2005-04-29 13:26+0200\n"
"Last-Translator: José Manuel Pérez <jmprodu@hotmail.com>\n"
"Language-Team: Español <es@li.org>\n"
@@ -28,7 +28,7 @@ msgstr ""
"X-Generator: KBabel 1.10\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "Instalación de RPMs"
@@ -38,7 +38,7 @@ msgstr "Instalación de RPMs"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -106,7 +106,7 @@ msgstr "_Instalar"
msgid "_Save"
msgstr "_Guardar"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Cancelar"
@@ -126,17 +126,17 @@ msgstr "Opción desconocida «%s»"
msgid "No packages specified"
msgstr "Ningún paquete especificado"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Por favor, espere..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "Debe ser root"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -147,42 +147,42 @@ msgstr ""
"%s\n"
"¿Continuar a pesar de todo?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Advertencia"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Aceptar"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (para actualizar)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (para instalar)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "Elección de paquetes"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Uno de los paquetes siguientes es necesario:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Abortar"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -193,60 +193,62 @@ msgstr ""
"%s\n"
"¿Continuar a pesar de todo?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, 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:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, 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:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, 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:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Instalación de paquete..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "no se pueden obtener los paquetes fuente, abortando"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Preparando..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instalando paquete `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Por favor, inserte el soporte denominado «%s» en el dispositivo [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Descargando paquete `%s'..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Los paquetes siguientes tienen firmas no válidas:\n"
-"%s\n"
-"\n"
-"¿Desea continuar con la instalación?"
+msgid "_Done"
+msgstr "_Hecho"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -257,41 +259,27 @@ msgstr ""
"%s\n"
"Puede querer actualizar su base de datos de urpmi"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "quitando %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Preparando..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instalando paquete `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Hecho"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, c-format
msgid "Installation failed:"
msgstr "Falló la instalación:"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "ya está todo instalado"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Finalizó la instalación"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "quitando %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -326,7 +314,7 @@ msgstr " -g - imprimir los grupos junto con los nombres.\n"
msgid " defaults to %s.\n"
msgstr " lo predeterminado es %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Sólo el superusuario está autorizado a instalar paquetes"
@@ -336,98 +324,98 @@ msgstr "Sólo el superusuario está autorizado a instalar paquetes"
msgid "Running urpmi in restricted mode..."
msgstr "Lanzando urpmi en modo restringido..."
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "no se puede abrir rpmdb"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nombre de archivo rpm no válido [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "obteniendo archivo rpm [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...recuperación hecha"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...falló la recuperación: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "no se puede acceder al archivo rpm [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "no se pudo interpretar el archivo spec %s [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "no se puede registrar el archivo rpm"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Arquitectura incompatible para el rpm [%s]"
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "error registrando paquetes locales"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Esta operación está prohibida en modo restringido"
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, 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:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: no se puede leer el archivo rpm «%s»\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr "Demasiados argumentos\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "se generó el archivo de síntesis hdlist para el soporte «%s»"
@@ -617,7 +605,12 @@ msgstr "no se encontró el paquete %s."
msgid "malformed URL: [%s]"
msgstr "URL mal formada: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "obteniendo archivos rpm desde el soporte «%s» ..."
@@ -627,7 +620,7 @@ msgstr "obteniendo archivos rpm desde el soporte «%s» ..."
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -635,37 +628,42 @@ msgstr ""
"transacción creada para instalar sobre %s (quitar=%d, instalar=%d, "
"actualizar=%d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "no se puede crear transacción"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, 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:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "añadiendo paquete %s (id=%d, eid=%d, actualización=%d, archivo=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "no se puede instalar el paquete %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "quitando paquete %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "quitando paquete %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "instalando %s desde %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Más información sobre el paquete %s"
@@ -695,11 +693,103 @@ msgstr "Ningún paquete especificado"
msgid "Cannot connect to ldap uri:"
msgstr "No se puede conectar con el servidor"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "base de datos de urpmi bloqueada"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Advertencia"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "base de datos de urpmi bloqueada"
+#: ../urpm/main_loop.pm:99
+#, c-format
+msgid "The following package has bad signature"
+msgstr "El siguiente paquete contienen una firma no válida"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Los siguientes paquetes contienen firmas no válidas"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "¿Desea continuar con la instalación?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Falló la instalación"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "distribuyendo %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "instalando %s desde %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "instalando %s"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "¿Intentar de instalar sin verificar las dependencias? (s/N) "
+
+#: ../urpm/main_loop.pm:205
+#, 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:247
+#, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "falló una transacción de instalación"
+msgstr[1] "fallaron %d transacciones de instalación"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Es posible la instalación"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, c-format
+msgid "Package %s is already installed"
+msgstr "El paquete %s ya está instalado"
+
+#: ../urpm/main_loop.pm:272
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Los paquetes %s ya están instalados"
+
+#: ../urpm/main_loop.pm:275
+#, c-format
+msgid "Package %s can not be installed"
+msgstr "El paquete %s no se puede instalar"
+
+#: ../urpm/main_loop.pm:276
+#, c-format
+msgid "Packages %s can not be installed"
+msgstr "Los paquetes %s no se pueden instalar"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -749,7 +839,7 @@ msgstr "intentando seleccionar soporte inexistente \"%s\""
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "se generó el archivo de síntesis hdlist para el soporte «%s»"
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "no se puede acceder al archivo hdlist de «%s», soporte ignorado"
@@ -840,7 +930,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Inicio de la búsqueda: %s fin: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "realizando una segunda pasada para computar las dependencias\n"
@@ -907,67 +997,72 @@ msgstr ""
"no se puede acceder al primer soporte de la instalación (no se encontró el "
"archivo hdlists)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "intentando seleccionar soporte inexistente \"%s\""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "seleccionando soportes múltiples: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "quitando el soporte «%s»"
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "reconfigurando urpmi para el soporte «%s»"
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...falló la reconfiguración"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "reconfiguración terminada"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "el soporte «%s» está al día"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "examinando el archivo hdlist [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "examinando el archivo de síntesis [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "generando hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -976,77 +1071,77 @@ msgstr ""
"No se puede generar el archivo de síntesis para el soporte «%s». Su archivo "
"hdlist puede estar corrupto."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problema leyendo hdlist o el archivo de síntesis del soporte «%s»"
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "escribiendo archivo de lista para el soporte «%s»"
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...falló la copia"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "copiando descripción de archivo de «%s»..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...copia hecha"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, 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:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "computando md5sum de hdlist fuente (o síntesis) copiado"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "falló la copia de [%s] (no coincide md5sum)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "computando md5sum del hdlist fuente (o síntesis) recuperado"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...falló la recuperación: no concuerda md5sum"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "no se encontraron archivos rpm en [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "leyendo archivos rpm de [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "no se pueden leer los archivos rpm de [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "no se leyeron rpms"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1056,74 +1151,74 @@ msgstr ""
"no se puede acceder soporte \"%s\",\n"
"esto puede ocurrir si montó manualmente el directorio cuando creó el soporte."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "no se encuentra el archivo hdlist para el soporte «%s»"
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "recuperando hdlist fuente (o síntesis) de «%s»..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "encontrado hdlist por prueba (o síntesis) como «%s»"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "no se encuentra el archivo hdlist para el soporte «%s»"
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "examinando archivo de clave pública de «%s»..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, 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:1553
+#: ../urpm/media.pm:1560
#, 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:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "escribiendo archivo de lista para el soporte «%s»"
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "añadido soporte %s"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "no se puede interpretar el archivo hdlist de «%s»"
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problema leyendo el archivo de síntesis del soporte «%s»"
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "leyendo encabezados del soporte «%s»"
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "SsYy"
@@ -1183,47 +1278,52 @@ msgstr "soporte no coherente «%s» marcado como borrable, pero no borrado"
msgid "unable to access medium \"%s\""
msgstr "no se puede acceder al soporte «%s»"
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Ningún paquete llamado %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Los siguientes paquetes contienen %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "debido a que falta %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "El paquete %s ya está instalado"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "debido a que no se satisfizo %s"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "intentando promover %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "para mantener %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "para instalar %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "debido a conflictos con %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "no pedido"
@@ -1243,6 +1343,16 @@ msgstr "ID de clave no válida (%s)"
msgid "Missing signature (%s)"
msgstr "Falta firma (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "No se puede crear el archivo de configuración [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Falló la copia"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1260,8 +1370,8 @@ msgstr ""
"\n"
"uso:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1280,19 +1390,19 @@ msgstr ""
" --test - verificar si se puede llevar a cabo correctamante la "
"desinstalación.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr ""
" --force - fuerza invocación aunque no existan algunos paquetes.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - urpmi distribuido entre máquinas de alias.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - imprime etiq. packager: quien lo empaquetó.\n"
@@ -1302,8 +1412,8 @@ msgstr " --packager - imprime etiq. packager: quien lo empaquetó.\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - usar otra raíz para la desinstalación de rpm.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - usar otra raíz para la instalación de rpm.\n"
@@ -1323,17 +1433,17 @@ msgstr ""
"distribución,\n"
" útil para (des)instalar un chroot con la opción --root.\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - usar archivo synthesis.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - usar archivo hdlist.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - modo informativo.\n"
@@ -1345,37 +1455,37 @@ msgstr ""
" -a - selecciona todas los paquetes que coincidan con la "
"expresión.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Sólo el superusuario está autorizado a quitar paquetes"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "paquetes desconocidos "
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "paquete desconocido "
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "quitar el paquete %s dañará su sistema"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Nada que quitar"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Verificando para quitar los paquetes siguientes"
-#: ../urpme:134
+#: ../urpme:131
#, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1384,24 +1494,24 @@ msgstr[0] "Para satisfacer las dependencias, se quitará el paquete siguiente"
msgstr[1] ""
"Para satisfacer las dependencias, se quitarán los %d paquetes siguientes"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr " (%d MB)"
-#: ../urpme:138
+#: ../urpme:135
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "¿Quitar %d paquete?"
msgstr[1] "¿Quitar %d paquetes?"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (s/N) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Falló la desinstalación"
@@ -1428,14 +1538,14 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - mostrar la versión de este programa.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - usar entorno específico (típicamente para reportar "
"bugs).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr " --excludemedia - no usar soportes dados, separados por coma.\n"
@@ -1446,12 +1556,12 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../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"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1466,7 +1576,7 @@ msgstr ""
" --synthesis - usar síntesis provista en lugar de base de datos de "
"urpmi.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1478,7 +1588,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - no imprime líneas idénticas.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - usa sólo soporte de actualización.\n"
@@ -1617,76 +1727,86 @@ msgstr " --group - imprime etiqueta de grupo: group.\n"
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr " --name - mostrar sólo los nombres de los paquetes.\n"
#: ../urpmf:73
#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr " --name - mostrar sólo los nombres de los paquetes.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - imprime etiq. obsoletes: todo lo obsoleto.\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr " --packager - imprime etiq. packager: quien lo empaquetó.\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, fuzzy, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - imprime etiq. provides: todo que proporciona.\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, fuzzy, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - imprime etiq. requires: todo que precisa.\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --size - imprime etiqueta de tamaño: size.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, fuzzy, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - imprime etiq. sourcerpm: rpm fuente.\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - imprime etiq. obsoletes: todo lo obsoleto.\n"
+
+#: ../urpmf:81
#, fuzzy, c-format
msgid " --summary - summary\n"
msgstr " --summary, -S - imprimir el descriptivo corto (summary).\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr " --url - imprime etiq. url: url.\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr " --verbose - modo informativo.\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -l - lista los archivos en el paquete.\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - imprime versión, release y arquitectura con nombre.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "uasando un entorno específico en %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1695,12 +1815,12 @@ msgstr ""
"Nota: debido a que ningún soporte usa hdlists, urpmf no pudo retornar "
"resultado alguno\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Puede querer utilizar --name para buscar nombres de paquetes.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1717,7 +1837,7 @@ msgstr ""
"\n"
"uso:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1725,14 +1845,14 @@ msgstr ""
" --searchmedia - usar sólo soportes dados para la búsqueda de los paquetes "
"pedidos (o actualizados).\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
@@ -1740,24 +1860,24 @@ msgstr ""
" --auto-select - seleccionar automáticamente paquetes para actualizar "
"sistema.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
" --auto-select - seleccionar automáticamente paquetes para actualizar "
"sistema.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - deshabilitar la prueba MD5SUM sobre el archivo.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - forzar actualización de clave gpg.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1766,12 +1886,12 @@ msgstr ""
" --no-uninstall - nunca preguntar si desinstalar un paquete, cancelar la "
"instalación.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - no instalar paquetes (sólo descargar)\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1781,7 +1901,7 @@ msgstr ""
"pedidos\n"
" de paquetes que lleven a quitarlos.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1792,38 +1912,44 @@ msgstr ""
" o instalar más paquetes dados,\n"
" %d es el predeterminado.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr ""
" --split-length - tamaño de transacción pequeña, predeterminado es %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy, -y - forzar búsqueda difusa.\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src, -s - paquete siguiente es paquete fuente.\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr " --install-src - instalar sólo paquete de fuentes (ningún binario)\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - quitar rpm del cache antes que nada.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - no eliminar los rpms del cache.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1832,7 +1958,7 @@ msgstr ""
" --allow-nodeps - permitir preguntar al usuario para instalar paquetes\n"
" sin verificar las dependencias.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1841,12 +1967,12 @@ msgstr ""
" --allow-force - permitir preguntar al usuario para instalar paquetes sin\n"
" verificar las dependencias ni la integridad.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - usar otra raíz para la instalación de rpm.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1856,47 +1982,47 @@ msgstr ""
"distribución,\n"
" útil para instalar un chroot con la opción --root.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - usa wget para recuperar archivos remotos.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - usa curl para recuperar archivos remotos.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --prozilla - usa curl para recuperar archivos remotos.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - limitar la velocidad de descarga.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1906,7 +2032,7 @@ msgstr ""
"parcialmente\n"
" (--no-resume lo deshabilita, que es lo predeterminado).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1915,7 +2041,7 @@ msgstr ""
" --proxy - usar proxy HTTP especificado, se asume que el puerto es\n"
" 1080 por defecto (formato <hostproxy[:puerto]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1924,7 +2050,7 @@ msgstr ""
" --proxy-user - especificar usuario y contraseña para utilizar en la\n"
" autenticación del proxy (formato <usuario:contraseña>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1933,7 +2059,7 @@ msgstr ""
" --bug - emitir un reporte de bug en el directorio indicado\n"
" por el argumento siguiente.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1942,7 +2068,7 @@ msgstr ""
" --verify-rpm - verificar la firma del rpm antes de la instalación.\n"
" (--no-verify-rpm lo deshabilita, habilitado predet.).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
@@ -1950,39 +2076,44 @@ msgid ""
msgstr ""
" --test - sólo verificar si se puede instalar sin problemas.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - ruta de exclusión separada por coma.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - excluir archivos de documentación.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, fuzzy, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --no-uninstall - nunca preguntar si desinstalar un paquete, cancelar la "
"instalación.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --url - imprime etiq. url: url.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - imprime etiqueta de descripción: description.\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - paquetes que no deberían instalarse\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - paquetes que no deberían instalarse\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1991,63 +2122,63 @@ msgstr ""
" --more-choices - cuando se encuentran varios paquetes, proponer más\n"
" opciones que las predeterminadas.\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - no eliminar los rpms del cache.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, 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:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
" -a - selecciona todas coincidencias en línea de comando.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - permite buscar en «provides» para encontrar paquete.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -p - no buscar en «provides» para encontrar paquete.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - modo silencioso.\n"
-#: ../urpmi:157
+#: ../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:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
"Lo que se puede hacer con archivos rpm binarios utilizando --install-src"
-#: ../urpmi:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2056,7 +2187,7 @@ msgstr ""
"El directorio [%s] ya existe, por favor use otro directorio para reportar "
"errores o bórrelo"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "No se puede crear el directorio [%s] para reporte de bugs"
@@ -2066,7 +2197,7 @@ msgstr "No se puede crear el directorio [%s] para reporte de bugs"
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2075,46 +2206,48 @@ msgstr ""
"Error: %s parece estar montado como sólo lectura.\n"
"Use --allow-force para forzar la operación"
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (para actualizar)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (para actualizar)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (para instalar)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, c-format
msgid "%s (to install)"
msgstr "%s (para instalar)"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "Para satisfacer las dependencias, se quitará el paquete siguiente"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "¿Qué elige? (1-%d)"
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2125,7 +2258,7 @@ msgstr ""
"más antiguos que los ya instalados:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2136,7 +2269,7 @@ msgstr ""
"más antiguos que los ya instalados:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, c-format
msgid ""
"\n"
@@ -2145,12 +2278,12 @@ msgstr ""
"\n"
"¿Seguir adelante con la instalación?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (S/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2159,7 +2292,7 @@ msgstr ""
"No se puede instalar el paquete pedido:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2168,7 +2301,7 @@ msgstr ""
"No se puede instalar algunos paquetes pedidos:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2179,7 +2312,7 @@ msgstr ""
"siguiente para poder actualizar otros:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2190,7 +2323,7 @@ msgstr ""
"siguientes para poder actualizar otros:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2199,7 +2332,7 @@ msgstr ""
"Se tiene que quitar el paquete siguiente para poder actualizar otros:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2208,12 +2341,17 @@ msgstr ""
"Se tienen que quitar los paquetes siguientes para poder actualizar otros:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2222,111 +2360,29 @@ msgstr ""
"Necesita ser root para instalar las dependencias siguientes:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, 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:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Presione «Intro» cuando esté listo..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Cancelar"
-#: ../urpmi:671
-#, c-format
-msgid "The following package has bad signature"
-msgstr "El siguiente paquete contienen una firma no válida"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Los siguientes paquetes contienen firmas no válidas"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "¿Desea continuar con la instalación?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Falló la instalación"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "distribuyendo %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "instalando %s desde %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "instalando %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "¿Intentar de instalar sin verificar las dependencias? (s/N) "
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "¿Intentar con más fuerza la instalación (--force)? (s/N) "
-
-#: ../urpmi:815
-#, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "falló una transacción de instalación"
-msgstr[1] "fallaron %d transacciones de instalación"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Es posible la instalación"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, c-format
-msgid "Package %s is already installed"
-msgstr "El paquete %s ya está instalado"
-
-#: ../urpmi:839
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Los paquetes %s ya están instalados"
-
-#: ../urpmi:842
-#, c-format
-msgid "Package %s can not be installed"
-msgstr "El paquete %s no se puede instalar"
-
-#: ../urpmi:843
-#, c-format
-msgid "Packages %s can not be installed"
-msgstr "Los paquetes %s no se pueden instalar"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "reiniciando urpmi"
@@ -2454,49 +2510,49 @@ msgstr " -v - modo informativo.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "no se puede actualizar soporte «%s»\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Sólo el superusuario está autorizado a añadir soportes"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, c-format
msgid "creating config file [%s]"
msgstr "creando el archivo de configuración [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "No se puede crear el archivo de configuración [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "no es necesario dar <ruta relativa de hdlist> con --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "falta <ruta relativa de hdlist>\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "no se puede crear soporte «%s»\n"
@@ -2657,17 +2713,17 @@ msgstr " -a - selecciona todos los soportes.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - coincidencia 'fuzzy' en nombres de soportes.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Sólo el superusuario está autorizado a quitar soportes"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "nada para quitar (use urpmi.addmedia para agregar un soporte)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2723,17 +2779,17 @@ msgid " -f - force updating synthesis/hdlist\n"
msgstr ""
" -f - fuerza actualización de archivos synthesis/hdlist.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Sólo el superusuario está autorizado a actualizar soportes"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "nada para actualizar (use urpmi.addmedia para agregar un soporte)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2742,22 +2798,22 @@ msgstr ""
"falta la entrada a actualizar\n"
"(una de %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "«%s»"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "Ignorando soporte %s"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "activando el soporte %s"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2774,7 +2830,7 @@ msgstr ""
"\n"
"uso:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2783,38 +2839,38 @@ msgstr ""
" --searchmedia - usar sólo soportes dados para la búsqueda de los paquetes "
"pedidos (o actualizados).\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - forzar búsqueda difusa (lo mismo que -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - lista los paquetes disponibles.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - lista los soportes disponibles.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - lista los soportes disponibles junto con sus URL.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
" --list-nodes - lista los nodos disponibles cuando se usa --parallel.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - lista los alias paralelo disponibles.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
@@ -2822,12 +2878,12 @@ msgstr ""
" --dump-config - volcar la configuración en forma de argumento para urpmi."
"addmedia.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr " --src - sig. paquete es paquete fuente (igual que -s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
@@ -2835,12 +2891,12 @@ msgstr ""
" --sources - da todos los paquetes fuentes antes de bajar (sólo "
"root).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --url - imprime etiq. url: url.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2850,22 +2906,22 @@ msgstr ""
"distribución.\n"
" Esto permite consultar una distro.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - imprimir el registro de cambios.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - imprimir el descriptivo corto (summary).\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - búsqueda inversa de lo que necesita el paquete.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2875,56 +2931,56 @@ msgstr ""
" - búsqueda inversa extendida (incluye los paquetes "
"virtuales).\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -p - busca en provides para encontrar paquete.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - completar salida con paquete(s) a quitar.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - extiende consulta a las dependencias del paquete.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - imprimir los grupos junto con los nombres.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - imprimir información útil en formato legible para las "
"personas.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - lista los archivos en el paquete.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, c-format
msgid " -m - equivalent to -du\n"
msgstr " -m - equivalente a -du.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - imprimir versión y revisión junto con el nombre.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - sig. paquete es paquete fuente (igual que --src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2933,47 +2989,47 @@ msgstr ""
" -u - quitar paquete si ya está instalada una versión más "
"reciente.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - forzar búsqueda difusa (lo mismo que --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - como -y, pero fuerza la no distinción entre mayúsculas y "
"minúsculas.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
" los nombres o archivos rpm dados en línea de comandos se consultan.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes sólo se puede utilizar con --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"Nota: debido a que ningún soporte usa hdlists, urpmf no pudo retornar "
"resultado alguno\n"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2981,11 +3037,22 @@ msgstr ""
"Nota: debido a que ningún soporte usa hdlists, urpmf no pudo retornar "
"resultado alguno\n"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "No se encontró changelog\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Los paquetes siguientes tienen firmas no válidas:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "¿Desea continuar con la instalación?"
+
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Necesita ser root para usar --use-distrib"
diff --git a/po/et.po b/po/et.po
index ebd35514..c3b829b7 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2007-08-07 12:43+0300\n"
"Last-Translator: Marek Laane <bald@starman.ee>\n"
"Language-Team: Estonian <et@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
"X-Generator: KBabel 1.3\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "RPM-i paigaldamine"
@@ -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:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Olgu"
@@ -93,7 +93,7 @@ msgstr "_Paigalda"
msgid "_Save"
msgstr "_Salvesta"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Loobu"
@@ -113,17 +113,17 @@ msgstr "Tundmatu võti %s"
msgid "No packages specified"
msgstr "Pakette pole valitud"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Palun oodake..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "Vajalikud on administraatori õigused"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -134,42 +134,42 @@ msgstr ""
"%s\n"
"Kas siiski jätkata paigaldamist?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Hoiatus"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Olgu"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (uuendus)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (paigaldus)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "Paketivalik"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Vajalik on üks järgnevatest pakettidest:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Katkesta"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -180,59 +180,61 @@ msgstr ""
"%s\n"
"Kas siiski jätkata paigaldamist?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Sõltuvuste lahendamiseks paigaldatakse järgmine pakett:"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Sõltuvuste lahendamiseks paigaldatakse järgmised paketid:"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, 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:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Paketi paigaldamine..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "pakette ei õnnestunud hankida, katkestatakse"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Valmistumine..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Paketi '%s' paigaldamine (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Palun asetage andmekandja nimega \"%s\" seadmesse [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Paketi '%s' allalaadimine..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Järgmistel pakettidel puudub korralik signatuur:\n"
-"%s\n"
-"\n"
-"Kas jätkata paigaldamisega?"
+msgid "_Done"
+msgstr "_Tehtud"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -243,41 +245,27 @@ msgstr ""
"%s\n"
"Te võiksite ehk uuendada urpmi andmebaasi"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "%s eemaldamine"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Valmistumine..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Paketi '%s' paigaldamine (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Tehtud"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, c-format
msgid "Installation failed:"
msgstr "Paigaldamine ebaõnnestus:"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Kõik on juba paigaldatud"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Paigaldus lõpetatud"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "%s eemaldamine"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -313,7 +301,7 @@ msgstr " -f - näitab RPM-i täielikku nime (NVRA).\n"
msgid " defaults to %s.\n"
msgstr " vaikimisi on %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Pakette võib paigaldada ainult administraator"
@@ -323,98 +311,98 @@ msgstr "Pakette võib paigaldada ainult administraator"
msgid "Running urpmi in restricted mode..."
msgstr "Urpmi käivitamine piiratud režiimis..."
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "rpmdb avamine ebaõnnestus"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr "puhvris leiti %d RPM-päist, eemaldatakse %d iganenud päist"
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "vigane RPM-faili nimi [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "RPM-faili [%s] tõmbamine..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...tõmbamine tehtud"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...tõmbamine ebaõnnestus: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "ligipääs RPM-failile [%s] ebaõnnestus"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "spetsifikatsioonifaili %s parsimine ebaõnnestus [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "RPM-faili registreerimine ebaõnnestus"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Sobimatu arhitektuur RPM-ile [%s]"
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "viga kohalike pakettide registreerimisel"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "See operatsioon on piiratud režiimis keelatud"
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "käsureal on määratud vigane puhverserver\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr "chroot-kataloogi ei ole olemas"
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: RPM-faili \"%s\" lugemine ebaõnnestus\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
+#, c-format
+msgid "chroot directory doesn't exist"
+msgstr "chroot-kataloogi ei ole olemas"
+
+#: ../urpm/args.pm:424
#, c-format
msgid "Can't use %s without %s"
msgstr "%s kasutamine on võimalik ainult koos %s-ga"
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
#, c-format
msgid "Can't use %s with %s"
msgstr "%s kasutamine ei ole võimalik %s-ga"
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr "Liiga palju argumente\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "loodi hdlist sünteesifail andmekandjale \"%s\""
@@ -603,7 +591,12 @@ msgstr "paketti %s ei leitud."
msgid "malformed URL: [%s]"
msgstr "vigane URL: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "RPM-failide tõmbamine andmekandjalt \"%s\"..."
@@ -613,44 +606,49 @@ msgstr "RPM-failide tõmbamine andmekandjalt \"%s\"..."
msgid "[repackaging]"
msgstr "[taaspakendamine]"
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, 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:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "tehingu loomine ebaõnnestus"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "RPM-i ekstraktimine delta-rpm-paketist %s ebaõnnestus"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "paketi %s lisamine (id=%d, eid=%d, uuendus=%d, fail=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "paketi %s paigaldamine ebaõnnestus"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "paketi %s eemaldamine"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "paketi %s eemaldamine"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "paigaldatud RPM-failide (%s) eemaldamine %s-st"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Rohkem infot paketi %s kohta"
@@ -680,11 +678,103 @@ msgstr "Baas pole määratud"
msgid "Cannot connect to ldap uri:"
msgstr "Ühendus LDAP URI-ga nurjus:"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "%s andmebaas on lukus"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Hoiatus"
+
+#: ../urpm/lock.pm:65
#, c-format
msgid "%s database locked"
msgstr "%s andmebaas on lukus"
+#: ../urpm/main_loop.pm:99
+#, c-format
+msgid "The following package has bad signature"
+msgstr "Järgmisel paketil on vigane signatuur"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Järgmistel pakettidel on vigane signatuur"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Kas jätkata paigaldusega?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Paigaldamine ebaõnnestus"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "%s jaotamine"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "%s paigaldamine andmekandjalt %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "%s paigaldamine"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Kas proovida paigaldust ilma sõltuvusi kontrollimata? (j/E)"
+
+#: ../urpm/main_loop.pm:205
+#, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "Kas proovida paigaldust veel jõulisemalt (--force)? (j/E) "
+
+#: ../urpm/main_loop.pm:247
+#, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d paigaldamistehing ebaõnnestus"
+msgstr[1] "%d paigaldamistehingut ebaõnnestus"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Paigaldamine on võimalik"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr "Pole ühtegi paketti uuendada"
+
+#: ../urpm/main_loop.pm:271
+#, c-format
+msgid "Package %s is already installed"
+msgstr "Pakett %s on juba paigaldatud"
+
+#: ../urpm/main_loop.pm:272
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Paketid %s on juba paigaldatud"
+
+#: ../urpm/main_loop.pm:275
+#, c-format
+msgid "Package %s can not be installed"
+msgstr "Paketti %s ei saa paigaldada"
+
+#: ../urpm/main_loop.pm:276
+#, c-format
+msgid "Packages %s can not be installed"
+msgstr "Pakette %s ei saa paigaldada"
+
#: ../urpm/md5sum.pm:23
#, c-format
msgid "examining %s file"
@@ -734,7 +824,7 @@ msgstr "sünteesifail ei tohi olla määratud (andmekandja \"%s\")"
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "sünteesifail peab olema määratud (andmekandja \"%s\")"
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "ligipääs \"%s\" hdlist failile nurjus, andmekandjat eiratakse"
@@ -829,7 +919,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Otsingu algus: %s lõpp: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "teistkordne sõltuvuste arvutamine\n"
@@ -895,67 +985,72 @@ msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"ligipääs distributsiooniandmekandjale ebaõnnestus (ei leitud faili media.cfg)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "püüti valida olematut andmekandjat \"%s\""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "mitme andmekandja valik: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "andmekandja \"%s\" eemaldamine"
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "urpmi ümberseadistamine andmekandja \"%s\" tarbeks"
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...ümberseadistamine ebaõnnestus"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "ümberseadistamine tehtud"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Viga nimedefaili loomisel: sõltuvust %d ei leitud"
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr "Viga nimedefaili loomisel: faili kirjutamine ebaõnnestus (%s)"
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "andmekandja \"%s\" on täiesti värske"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "hdlist faili [%s] uurimine"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "sünteesifaili [%s] uurimine"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "hdlist [%s] loomine"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -964,77 +1059,77 @@ msgstr ""
"Sünteesifaili loomine andmekandjale \"%s\" ebaõnnestus. Teie hdlist-fail "
"võib olla vigane."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "probleem andmekandja \"%s\" hdlist või sünteesifaili lugemisel"
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "kopeeritakse [%s] andmekandjale \"%s\"..."
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...kopeerimine ebaõnnestus"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "\"%s\" kirjelduste faili kopeerimine..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...kopeerimine tehtud"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "[%s] kopeerimine ebaõnnestus (fail on kahtlaselt väike)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "kopeeritud allika hdlisti (või sünteesi) MD5SUM arvutamine"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "[%s] kopeerimine ebaõnnestus (MD5SUM ei klapi)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "tõmmatud allika hdlisti (või sünteesi) MD5SUM arvutamine"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...tõmbamine ebaõnnestus: MD5SUM ei klapi"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "[%s] ei sisalda RPM-faile"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "[%s] RPM-failide lugemine"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "[%s] RPM-failide lugemine ebaõnnestus: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "ühtki RPM-faili ei loetud"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1044,74 +1139,74 @@ msgstr ""
"andmekandjat \"%s\" ei õnnestunud leida,\n"
"mis võib juhtuda siis, kui andmekandjat luues ühendati kataloog käsitsi."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "vigane hdlist-fail %s andmekandjale \"%s\""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "\"%s\" allika hdlisti (või sünteesi) tõmbamine..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "leiti kontrollitud hdlist (või süntees) %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "andmekandjale \"%s\" ei leitud hdlist faili"
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "\"%s\" avaliku võtme faili uurimine..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...imporditi võti %s \"%s\" avaliku võtme failist"
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "\"%s\" avaliku võtme faili import ebaõnnestus"
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "andmekandja \"%s\" nimekirjafaili kirjutamine"
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, c-format
msgid "updated medium \"%s\""
msgstr "uuendati andmekandjat \"%s\""
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "\"%s\" hdlist faili analüüs ebaõnnestus"
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "probleem andmekandja \"%s\" sünteesifaili lugemisel"
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "päiste lugemine andmekandjalt \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "EeNn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "JjYy"
@@ -1171,47 +1266,52 @@ msgstr "andmekandja \"%s\" on kirjas eemaldatavana, aga ei ole seda mitte"
msgid "unable to access medium \"%s\""
msgstr "ligipääs andmekandjale \"%s\" ebaõnnestus"
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Paketti nimega %s ei ole"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "%s sisaldub järgmistes pakettides: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "puuduva %s tõttu"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Pakett %s on juba paigaldatud"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "rahuldamata %s tõttu"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "püüdes välja pakkuda %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "säilitamaks %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "paigaldamaks %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "konflikti tõttu %s-ga"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "soovimata"
@@ -1231,6 +1331,16 @@ msgstr "Vigane võtme ID (%s)"
msgid "Missing signature (%s)"
msgstr "Puudub signatuur (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Seadistustefaili [%s] loomine ebaõnnestus"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Kopeerimine ebaõnnestus"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1248,8 +1358,8 @@ msgstr ""
"\n"
"kasutamine:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1266,7 +1376,7 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - kontrollitakse, kas eemaldamine on korrektselt võimalik.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
@@ -1274,14 +1384,14 @@ msgstr ""
" --force - käivitatakse ka siis, kui mõnda nõutud paketti ei ole "
"olemas.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
" --parallel - jagatud urpmi käivitamine üle mitme aliasega määratud "
"masina.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - pakendab failid uuesti enne kustutamist.\n"
@@ -1291,8 +1401,8 @@ msgstr " --repackage - pakendab failid uuesti enne kustutamist.\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - muu baasi kasutamine RPM-ide eemaldamisel.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
@@ -1314,17 +1424,17 @@ msgstr ""
" kasulik chroot paigaldamiseks/eemaldamiseks võtmega --"
"root.\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - kasutatakse sünteesifaili.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - kasutatakse hdlist-faili.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - selgitav režiim.\n"
@@ -1334,37 +1444,37 @@ msgstr " --verbose, -v - selgitav režiim.\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - valib kõik käsureaga sobivad paketid.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Tarkvara võib eemaldada ainult administraator"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "tundmatud paketid"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "tundmatu pakett"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "paketi %s eemaldamine halvab Teie süsteemi"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Pole midagi eemaldada"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Kontrollitakse, kas on võimalik eemaldada järgmised paketid"
-#: ../urpme:134
+#: ../urpme:131
#, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1372,24 +1482,24 @@ msgid_plural ""
msgstr[0] "Sõltuvuste lahendamiseks tuleb eemaldada järgmine pakett"
msgstr[1] "Sõltuvuste lahendamiseks tuleb eemaldada järgmised %d paketti"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr " (%d MB)"
-#: ../urpme:138
+#: ../urpme:135
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "Kas eemaldada %d pakett?"
msgstr[1] "Kas eemaldada %d paketti?"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (j/E) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Eemaldamine ebaõnnestus"
@@ -1416,14 +1526,14 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - näitab programmi versiooni.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - kasutatakse spetsiifilist keskkonda (tavaliselt\n"
" vearaportideks).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1438,14 +1548,14 @@ msgstr ""
" --literal, -l - mustrina tõlgendamise asemel kasutatakse argumenti "
"täpselt esitatud kujul.\n"
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../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"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1456,9 +1566,10 @@ msgstr ""
#: ../urpmf:43
#, c-format
msgid " --use-distrib - use the given path to access media\n"
-msgstr " --use-distrib - andmekandja kasutamiseks kasutatakse määratud asukohta.\n"
+msgstr ""
+" --use-distrib - andmekandja kasutamiseks kasutatakse määratud asukohta.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - kasutatakse sünteesi urpmi andmebaasi asemel.\n"
@@ -1468,7 +1579,7 @@ msgstr " --synthesis - kasutatakse sünteesi urpmi andmebaasi asemel.\n"
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - ei näidata ühesuguseid ridu.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - kasutatakse ainult uuendus-andmekandjat.\n"
@@ -1601,78 +1712,88 @@ msgid " --group - group\n"
msgstr " --group - grupp\n"
#: ../urpmf:72
+#, fuzzy, c-format
+msgid " --license - license\n"
+msgstr " --name - paketi nimi\n"
+
+#: ../urpmf:73
#, c-format
msgid " --name - package name\n"
msgstr " --name - paketi nimi\n"
-#: ../urpmf:73
+#: ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - iganenute sildid\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr " --packager - paketi valmistaja\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - pakutavate sildid\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - nõutavate sildid\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, c-format
msgid " --size - installed size\n"
msgstr " --size - paigalduse suurus\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - lähtekoodi RPM-i nimi\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - iganenute sildid\n"
+
+#: ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr " --summary - kokkuvõte\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, c-format
msgid " --url - url\n"
msgstr " --url - URL\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, c-format
msgid " --vendor - vendor\n"
msgstr " --vendor - tootja\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -m - paketti sisaldav andmekandja\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - näitab koos nimega versiooni, väljalaset ja "
"arhitektuuri.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Vigane vorming: kasutada tohib ainult üht mitme väärtusega silti"
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "spetsiifilise keskkonna kasutamine %s -l\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1681,12 +1802,12 @@ msgstr ""
"Märkus: kuna ükski otsitud andmekandja ei kasutanud hdlisti, ei suutnud "
"urpmf mingit tulemust anda\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Paketi otsimiseks nime järgi tasuks pruukida võtit --name.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1703,7 +1824,7 @@ msgstr ""
"\n"
"kasutamine:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1711,7 +1832,7 @@ msgstr ""
" --searchmedia - soovitud pakettide otsinguks kasutatakse ainult määratud "
"andmekandjaid.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
@@ -1720,28 +1841,28 @@ msgstr ""
" --auto - mitteinteraktiivne režiim, eeldatakse kõigile küsimustele "
"vaikimisi pakutavaid vastuseid.\n"
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr " --auto-select - valib automaatselt paketid süsteemi uuendamiseks.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr " --auto-update - uuendab andmekandjaid ja seejärel süsteemi.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - keelatakse faili MD5SUM kontroll.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - sunnib uuendama gpg võtit.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1750,12 +1871,12 @@ msgstr ""
" --no-uninstall - kunagi ei paluta paketti eemaldada, paigaldusest "
"loobuda.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - pakette ei paigaldata (ainult tõmmatakse).\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1764,7 +1885,7 @@ msgstr ""
" --keep - säilitab võimalusel olemasolevad paketid, lükkab tagasi\n"
" soovitud paketid, mis toovad kaasa eemaldamise.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1775,38 +1896,44 @@ msgstr ""
" uuendatakse enam kui määratud arv pakette,\n"
" vaikimisi on see %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - väikese tehingu pikkus, vaikimisi %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy, -y - lubab ebatäpset otsingut.\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src, -s - järgmine pakett on lähtetekstipakett.\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
" --install-src - paigaldab ainult lähtetekstipaketi (mitte binaarpaketi).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - eemaldab enne muud tegevust RPM-i puhvrist.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - säilitab puhvris mittekasutatud RPM-id.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1815,7 +1942,7 @@ msgstr ""
" --allow-nodeps - lubab kasutajal paigaldamise\n"
" pakettide sõltuvusi kontrollimata.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1824,12 +1951,12 @@ msgstr ""
" --allow-force - lubab kasutajal paigaldada pakette ilma\n"
" sõltuvusi ja sobivust kontrollimata.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - muu baasi kasutamine RPM-ide paigaldamisel.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1838,47 +1965,47 @@ msgstr ""
" --use-distrib - seadistab urpmi lennult distributsioonipuu põhjal,\n"
" kasulik chroot paigaldamiseks võtmega --root.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - wget kasutamine kaugfailide tõmbamiseks.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - curl'i kasutamine kaugfailide tõmbamiseks.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --prozilla - prozilla kasutamine kaugfailide tõmbamiseks.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr " --curl-options - curl'i lisavõtmed\n"
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr " --rsync-options- rsync'i lisavõtmed\n"
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr " --wget-options - wget'i lisavõtmed\n"
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr " --prozilla-options - prozilla lisavõtmed\n"
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - piirab allalaadimiskiirust.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1887,7 +2014,7 @@ msgstr ""
" --resume - taasalustab osaliselt alla tõmmatud failide tõmbamist\n"
" (--no-resume tühistab selle, vaikimisi on väljas).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1897,7 +2024,7 @@ msgstr ""
"eeldatavalt\n"
" vaikimisi 1080 (vorming on <puhverserver[:port]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1906,7 +2033,7 @@ msgstr ""
" --proxy-user - määrab kasutajanime ja parooli puhverserveri\n"
" autentimiseks (vorming: <kasutajanimi:parool>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1915,7 +2042,7 @@ msgstr ""
" --bug - väljastab vearaporti kataloogi, mis on ära näidatud\n"
" järgnevas argumendis.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1924,7 +2051,7 @@ msgstr ""
" --verify-rpm - kontrollib RPM-i signatuuri enne paigaldust\n"
" (--no-verify-rpm tühistab selle, vaikimisi on sees).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
@@ -1932,39 +2059,44 @@ msgid ""
msgstr ""
" --test - kontrollitakse, kas paigaldus on korrektselt võimalik.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - eirab asukohta (või asukohti, eraldajaks koma).\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - jätab välja dokumentatsioonifailid.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr " --ignoresize - kettaruumi ei kontrollita enne paigaldamist.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr ""
" --ignorearch - lubab paigaldada sobimatule arhitektuurile mõeldud RPM-"
"e.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - pakettide skripte ei käivitata.\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - paigaldamisel vahele jäetavad paketid.\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - paigaldamisel vahele jäetavad paketid.\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1973,47 +2105,47 @@ msgstr ""
" --more-choices - mitme paketi leidmisel pakutakse lisaks vaikevalikule\n"
" ka teisi valikuid.\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - RPM-ide andmebaasi ei lukustata.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - uuendatakse ainult senise arhitektuuriga pakette.\n"
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - valib kõik käsureaga sobivad.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - lubab pakette otsida pakutavate seas.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - ei luba pakettide otsimist pakutavate seas.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - vaikne režiim.\n"
-#: ../urpmi:157
+#: ../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:186
+#: ../urpmi:184
#, 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:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2022,12 +2154,12 @@ msgstr ""
"Viga: vearaporti loomiseks kasutage koos võtmega --bug\n"
"tavalisi käsureaargumente.\n"
-#: ../urpmi:220
+#: ../urpmi:218
#, 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:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2036,7 +2168,7 @@ msgstr ""
"Kataloog [%s] on juba olemas, palun kasutage vearaportideks muud kataloogi "
"või kustutage see"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Kataloogi [%s] loomine vearaportideks ebaõnnestus"
@@ -2046,7 +2178,7 @@ msgstr "Kataloogi [%s] loomine vearaportideks ebaõnnestus"
msgid "Environment directory %s does not exist"
msgstr "Keskkonna kataloogi %s ei ole olemas"
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2055,47 +2187,48 @@ msgstr ""
"Viga: %s paistab olevat haagitud ainult loetavana.\n"
"Kasutage operatsiooni pealesundimiseks võtit --allow-force."
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr "Andmekandja uuendamine...\n"
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (uuendus)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (uuendus)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (paigaldus)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, c-format
msgid "%s (to install)"
msgstr "%s (paigaldus)"
-#: ../urpmi:447
+#: ../urpmi:454
#, 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:"
+msgstr "Sõltuvuse '%s' lahendamiseks on vajalik üks järgmistest pakettidest:"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Millise valite? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2106,7 +2239,7 @@ msgstr ""
"vanemad kui paigaldatud paketid:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2117,7 +2250,7 @@ msgstr ""
"vanemad kui paigaldatud paketid:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, c-format
msgid ""
"\n"
@@ -2126,12 +2259,12 @@ msgstr ""
"\n"
"Kas siiski paigaldamist jätkata?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (J/e) "
-#: ../urpmi:503
+#: ../urpmi:520
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2140,7 +2273,7 @@ msgstr ""
"Soovitud paketti ei õnnestu paigaldada:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2149,7 +2282,7 @@ msgstr ""
"Mõnda soovitud paketti ei õnnestu paigaldada:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2160,7 +2293,7 @@ msgstr ""
"järgmine pakett:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2171,7 +2304,7 @@ msgstr ""
"järgmised paketid:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2180,7 +2313,7 @@ msgstr ""
"Teiste uuendamiseks tuleb eemaldada järgmine pakett:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2189,12 +2322,17 @@ msgstr ""
"Teiste uuendamiseks tuleb eemaldada järgmised paketid:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(ainult test, tegelikult midagi ei eemaldata)"
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2203,111 +2341,29 @@ msgstr ""
"Järgmiste sõltuvuste paigaldamiseks peate olema administraator:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(ainult test, tegelikult midagi ei paigaldata)"
-#: ../urpmi:597
+#: ../urpmi:617
#, 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:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Vajutage Enter, kui see on tehtud..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Loobu"
-#: ../urpmi:671
-#, c-format
-msgid "The following package has bad signature"
-msgstr "Järgmisel paketil on vigane signatuur"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Järgmistel pakettidel on vigane signatuur"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Kas jätkata paigaldusega?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Paigaldamine ebaõnnestus"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "%s jaotamine"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "%s paigaldamine andmekandjalt %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "%s paigaldamine"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Kas proovida paigaldust ilma sõltuvusi kontrollimata? (j/E)"
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Kas proovida paigaldust veel jõulisemalt (--force)? (j/E) "
-
-#: ../urpmi:815
-#, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d paigaldamistehing ebaõnnestus"
-msgstr[1] "%d paigaldamistehingut ebaõnnestus"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Paigaldamine on võimalik"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr "Pole ühtegi paketti uuendada"
-
-#: ../urpmi:838
-#, c-format
-msgid "Package %s is already installed"
-msgstr "Pakett %s on juba paigaldatud"
-
-#: ../urpmi:839
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Paketid %s on juba paigaldatud"
-
-#: ../urpmi:842
-#, c-format
-msgid "Package %s can not be installed"
-msgstr "Paketti %s ei saa paigaldada"
-
-#: ../urpmi:843
-#, c-format
-msgid "Packages %s can not be installed"
-msgstr "Pakette %s ei saa paigaldada"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "urpmi taaskäivitamine"
@@ -2439,33 +2495,33 @@ msgstr " -v - selgitav režiim.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "andmekandja \"%s\" uuendamine ebaõnnestus\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr "vigane <url> (kohaliku kataloogi asukoht peab olema absoluutne)"
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Andmekandjaid võib lisada ainult administraator"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, c-format
msgid "creating config file [%s]"
msgstr "luuakse seadistustefail [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "Seadistustefaili [%s] loomine ebaõnnestus"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr ""
"võtme --distrib puhul puudub vajadus anda <suhteline tee hdlist juurde>"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
@@ -2474,17 +2530,17 @@ msgstr ""
"\n"
"Kas soovite lisada andmekandja '%s'?"
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "Puudub <suhteline tee hdlist juurde>\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr "%s kasutamine ei ole võimalik võrguandmekandjaga"
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "andmekandja \"%s\" loomine ebaõnnestus\n"
@@ -2652,17 +2708,17 @@ msgstr " -a - valib kõik andmekandjad.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - andmekandjate ligilähedane sobivus.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Andmekandjaid võib eemaldada ainult administraator"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "ei ole midagi eemaldada (andmekandja lisamiskäsk: urpmi.addmedia)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2720,17 +2776,17 @@ msgstr " -a - valib kõik mitte-eemaldatavad andmekandjad.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - sunnib genereerima sünteesti/hdlist-faile.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Andmekandjaid võib uuendada ainult administraator"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "ei ole midagi uuendada (andmekandja lisamiskäsk: urpmi.addmedia)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2739,22 +2795,22 @@ msgstr ""
"puudub uuendatava kirje nimi\n"
"(võimalikud: %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "andmekandja %s ignoreerimine"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "andmekandja %s arvestamine"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2771,7 +2827,7 @@ msgstr ""
"\n"
"kasutamine:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2780,52 +2836,52 @@ msgstr ""
" --searchmedia - soovitud (või uuendatavate) pakettide otsinguks "
"kasutatakse ainult määratud andmekandjaid.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - lubab ebatäpset otsingut (sama, mis -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - näitab saadaolevaid pakette.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - näitab saadaolevaid andmekandjaid.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - näitab saadaolevaid andmekandjaid URL-idega.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
" --list-nodes - näitab saadaolevaid sõlmi, kui kasutatakse võtit --"
"parallel.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - näitab saadaolevaid aliaseid.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
" --dump-config - seadistusest tehakse tõmmis kujul urpmi.addmedia võti.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr ""
" --src - järgmine pakett on lähtetekstipakett (sama, mis -s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
@@ -2833,12 +2889,12 @@ msgstr ""
" --sources - näitab enne allalaadimist kõiki lähtetekstipakette "
"(ainult administraator).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --ignorearch - lubab sobimatu arhitektuuriga RPM-ide päringuid.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2847,22 +2903,22 @@ msgstr ""
" --use-distrib - seadistab urpmi lennult distributsioonipuu põhjal.\n"
" Võimaldab esitada päringu distributsiooni kohta.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - näitab muutuste logi.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - näitab kokkuvõtet.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - kohandab otsingu sellele, mida pakett nõuab.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2872,7 +2928,7 @@ msgstr ""
" - laiendatud kohandatud otsing (kaasa arvatud virtuaalsed "
"paketid).\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, c-format
msgid ""
" --whatprovides, -p\n"
@@ -2881,49 +2937,49 @@ msgstr ""
" --whatprovides, -p\n"
" - lubab pakette otsida pakutavate seas.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - täielik väljund eemaldatavate pakettidega.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - laiendab päringut paketi sõltuvustele.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - näitab koos nimega ka gruppi.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - näitab kasulikku infot ka inimesele arusaadaval kujul.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - näitab faile paketis.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, c-format
msgid " -m - equivalent to -du\n"
msgstr " -m - sama mis -du.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - näitab koos nimega ka versiooni ja väljalaset.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - järgmine pakett on lähtetekstipakett (sama, mis --src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2931,56 +2987,67 @@ msgid ""
msgstr ""
" -u - eemaldab paketi, kui uuem versioon on juba paigaldatud.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - lubab ebatäpset otsingut (sama, mis --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - nagu -y, aga sunnib sobivusi leidma tõstutundetult.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " päringu esitamine käsureal antud nimede või RPM-failide kohta.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "võtit --list-nodes saab kasutada ainult koos võtmega --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
"andmekandjal \"%s\" puudub hdlist, paketil %s on ainult osaline tulemus"
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"andmekandjal \"%s\" puudub hdlist, pakettidel %s on ainult osaline tulemus"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr "andmekandjal \"%s\" puudub hdlist, paketile %s ei ole mingit tulemust"
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
"andmekandjal \"%s\" puudub hdlist, pakettidele %s ei ole mingit tulemust"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Muutuste logi ei leitud\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Järgmistel pakettidel puudub korralik signatuur:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Kas jätkata paigaldamisega?"
+
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Võtme --use-distrib kasutamiseks peate olema administraator"
diff --git a/po/eu.po b/po/eu.po
index 70ff1601..c0a69d70 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-eu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2006-05-08 23:54+0200\n"
"Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
"Language-Team: EUSKARA <itzulpena@euskalgnu.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
"X-Generator: KBabel 1.10.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "RPM instalaketa"
@@ -30,7 +30,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:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Ados"
@@ -96,7 +96,7 @@ msgstr "_Instalatu"
msgid "_Save"
msgstr "_Gorde"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Utzi"
@@ -116,17 +116,17 @@ msgstr "Aukera ezezaguna %s"
msgid "No packages specified"
msgstr "Ez da paketerik zehaztu"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Itxaron mesedez..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "Root izan behar da"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -137,42 +137,42 @@ msgstr ""
"%s\n"
"Instalazioarekin jarraitu hala ere?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Kontuz"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Ados"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (Eguneratu)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (instalatu)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "Paketa aukera"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Ondoko paketeetako bat behar da:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Geldiarazi"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -183,59 +183,61 @@ msgstr ""
"%s\n"
"Instalazioarekin jarraitu hala ere?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Mendekotasunak asetzeko, ondorengo paketea instalatuko da:"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Mendekotasunak asetzeko, ondoko paketeak instalatuko dira:"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, fuzzy, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d pakete, %d MB)"
msgstr[1] "(%d pakete, %d MB)"
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Paketearen instalazioa..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "ezin dira iturburuko paketeak lortu, abortatzen"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Prestatzen..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "`%s' paketea instalatzen (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Sartu \"%s\" izena duen euskarria [%s] gailuan"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "`%s' paketea deskargatzen..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Ondoko paketeek sinadura okerrak dituzte:\n"
-"%s\n"
-"\n"
-"Instalazioarekin jarraitu nahi duzu?"
+msgid "_Done"
+msgstr "_Eginda"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -246,41 +248,27 @@ msgstr ""
"%s\n"
"Zure urpmi datu-basea eguneratzea komeni da"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "%s kentzen"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Prestatzen..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "`%s' paketea instalatzen (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Eginda"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Instalazioak huts egin du"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Dena dago instalatuta"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Instalazioa amaitu da"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "%s kentzen"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -315,7 +303,7 @@ msgstr " -g - taldeak ere izenarekin inprimatzen ditu.\n"
msgid " defaults to %s.\n"
msgstr " lehenetsia %s da.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Supererabiltzaileak bakarrik du paketeak instalatzeko baimena"
@@ -325,98 +313,98 @@ msgstr "Supererabiltzaileak bakarrik du paketeak instalatzeko baimena"
msgid "Running urpmi in restricted mode..."
msgstr "urpmi modu murriztuan exekutatzen..."
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "ezin da rpmdb ireki"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "rpm fitxategi-izen baliogabea [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "[%s] rpm fitxategia berreskuratzen..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...berreskuratu da"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...berreskuratzeak huts egin du: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "ezin izan da rpm fitxategia atzitu [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "[%s] fitxategian ezin da \"%s\" analizatu"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "ezin da rpm fitxategia erregistratu"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "rpm-rentzako arkitektura bateraezina [%s]"
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "errorea pakete lokalak erregistratzean"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Eragiketa hau debekatuta dago modu murriztuan exekutatzerakoan"
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "proxy-adierazpen okerra komando-lerroan\n"
-#: ../urpm/args.pm:135
-#, fuzzy, c-format
-msgid "chroot directory doesn't exist"
-msgstr "%s ingurune direktorioa ez da existitzen"
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: ezin da \"%s\" rpm fitxategia irakurri\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
+#, fuzzy, c-format
+msgid "chroot directory doesn't exist"
+msgstr "%s ingurune direktorioa ez da existitzen"
+
+#: ../urpm/args.pm:424
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "\"%s\" euskarrirako hdlist laburpen-fitxategia eraiki da"
@@ -607,7 +595,12 @@ msgstr "ez da %s paketea aurkitu."
msgid "malformed URL: [%s]"
msgstr "gaizki osatutako URL: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "rpm fitxategiak berreskuratzen \"%s\" euskarritik..."
@@ -617,7 +610,7 @@ msgstr "rpm fitxategiak berreskuratzen \"%s\" euskarritik..."
msgid "[repackaging]"
msgstr "[birpaketatzen]"
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -625,37 +618,42 @@ msgstr ""
"transakzioa sortu da %s(e)n instalatzeko (kendu=%d, instalatu=%d,eguneratu=%"
"d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "ezin da transakziorik sortu"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "ezin da rpm atera %s delta-rpm paketetik"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "%s paketea gehitzen (id=%d, eid=%d, eguneratzea=%d, fitxategia=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "ezin da %s paketea instalatu"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "%s paketea kentzen"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "%s paketea kentzen"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "%s %s-tik instalatzen"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Informazio gehiago %s paketeari buruz"
@@ -685,11 +683,103 @@ msgstr "Ez da paketerik zehaztu"
msgid "Cannot connect to ldap uri:"
msgstr "Ezin dira kolore-maparen sarrerak esleitu"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "urpmi datu-basea blokeatuta"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Kontuz"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "urpmi datu-basea blokeatuta"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "Ondoko pakete hauek sinadura okerra dute"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Ondoko pakete hauek sinadura okerra dute"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Instalatzen jarraitu nahi duzu?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Instalazioak huts egin du"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "%s banatzen"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "%s %s-tik instalatzen"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "%s instalatzen"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Mendekotasunak egiaztatu gabe saiatu nahi duzu instalatzen? (b/E) "
+
+#: ../urpm/main_loop.pm:205
+#, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "Indar handiagoz instalatzen saiatu (--force)? (b/E) "
+
+#: ../urpm/main_loop.pm:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d instalazio transakzioek huts egin dute"
+msgstr[1] "%d instalazio transakzioek huts egin dute"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Instalazioa posible da"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "Dena dago instalatuta"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Dena dago instalatuta"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "Dena dago instalatuta"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Dena dago instalatuta"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -742,7 +832,7 @@ msgstr "existitzen ez den \"%s\" euskarria hautatu nahian zabiltza"
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "\"%s\" euskarrirako hdlist laburpen-fitxategia eraiki da"
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "ezin da \"%s\"(r)en hdlist fitxategia atzitu, euskarriari jaramonik ez"
@@ -838,7 +928,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Bilaketa hasera: %s amaiera: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "mendekotasunak kontatzeko bigarren pasada egiten\n"
@@ -904,67 +994,72 @@ msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"ezin da lehen instalazio-euskarria atzitu (ez da hdlists fitxategia aurkitu)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "existitzen ez den \"%s\" euskarria hautatu nahian zabiltza"
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "hainbat euskarri hautatzen: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "\"%s\" euskarria kentzen"
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "\"%s\" euskarriarentzako urpmi birkonfiguratzen"
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...birkonfiguraketak hutsegin du"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "birkonfiguraketa amaituta"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Akatsa izenen fitxategia sortzerakoan: ez da aurkitu %d menpekotasuna"
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr "Akatsa izenen fitxategia sortzerakoan: Ezin da fitxategira idatzi (%s)"
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "\"%s\" euskarria ez dago hautatuta"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "[%s] hdlist fitxategia aztertzen"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "[%s] laburpen-fitxategia aztertzen"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "[%s] hdlist eraikitzen"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -973,78 +1068,78 @@ msgstr ""
"Ezin da \"%s\" euskarriarentzat synthesis fitxategia sortu. Baliteke zure "
"hdlist fitxategia hondatuta egotea."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "arazoa \"%s\" euskarriaren hdlist edo laburpen-fitxategia irakurtzean"
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "\"%s\" euskarriaren zerrenda-fitxategia idazten"
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...ezin izan da kopiatu"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "\"%s\"(r)en deskribapen-fitxategia kopiatzen..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...kopiatzea burutu da"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "ezin izan da [%s] kopiatu (fitxategia txikiegia da)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "kopiatutako iturburuko hdlist-en md5sum kalkulatzen (edo laburpena)"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "ezin izan da [%s] kopiatu (md5sum ez dator bat)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr ""
"berreskuratutako iturburuko hdlist-en md5sum kalkulatzen (edo laburpena)"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...berreskuratzeak huts egin du: md5sum ez dator bat"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "[%s](e)n ez da rpm fitxategirik aurkitu"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "[%s](e)ko rpm fitxategiak irakurtzen"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "ezin izan da [%s](e)ko rpm fitxategirik irakurri: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "ez da rpm-rik irakurri"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1054,74 +1149,74 @@ msgstr ""
"ezin da \"%s\" euskarria atzitu,\n"
"agian euskarria sortzean direktorioa eskuz muntatu zenuelako izan daiteke."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ez da \"%s\" euskarriaren hdlist fitxategirik aurkitu"
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "\"%s\"(r)en iturburuko hdlist (edo laburpena) berreskuratzen..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "probatutako hdlist (edo laburpena) aurkitu da %s gisa"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "ez da \"%s\" euskarriaren hdlist fitxategirik aurkitu"
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "\"%s\"(r)en gako publikoen fitxategia aztertzen..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, 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:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "ezin da \"%s\"(r)en gako publikoen fitxategia inportatu"
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "\"%s\" euskarriaren zerrenda-fitxategia idazten"
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "%s euskarria gehitu da"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "ezin da \"%s\"(r)en hdlist fitxategia analizatu"
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "arazoa \"%s\" euskarriaren laburpen-fitxategia irakurtzean"
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "\"%s\" euskarritik goiburuak irakurtzen"
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "eEnN"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "bByYsS"
@@ -1182,47 +1277,52 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "ezin izan dugu \"%s\" euskarria atzitu"
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Ez dago %s izeneko paketerik"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Ondoko paketeek %s dute: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "%s falta delako"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Dena dago instalatuta"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "%s bete gabe dagoelako"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "%s jaso nahian"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "%s gordetzeko"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "%s instalatzeko"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "%s(r)ekin gatazkak daudelako"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "ez da eskatu"
@@ -1242,6 +1342,16 @@ msgstr "ID gakoa ez da baliozkoa (%s)"
msgid "Missing signature (%s)"
msgstr "Sinadura falta da (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Ezin da konfig fitxategia sortu [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Ezin izan da kopiatu"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1259,8 +1369,8 @@ msgstr ""
"\n"
"erabilera:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1275,19 +1385,19 @@ msgstr " --auto - automatikoki pakete bat hautatzen du aukeratik.\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - ezabaketa egokiro egin daitekeen egiaztatzen du.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, 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"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - urpmi banatzen du alias-makinen artean.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - fitxategiak bir-paketatu ezabatu aurretik\n"
@@ -1297,8 +1407,8 @@ msgstr " --repackage - fitxategiak bir-paketatu ezabatu aurretik\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - beste root bat erabiltzen du rpm ezabaketarako.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - beste root bat erabiltzen du rpm instalatzeko.\n"
@@ -1318,20 +1428,20 @@ msgstr ""
" erabilgarria chroot --root aukerarekin (des)"
"instalatzeko.\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr ""
" --probe-synthesis - laburpen-fitxategia bilatzen eta erabiltzen saiatzen "
"da.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr ""
" --probe-hdlist - hdlist fitxategia bilatzen eta erabiltzen saiatzen da.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - modu berritsua.\n"
@@ -1343,37 +1453,37 @@ msgstr ""
" -a - pakete denak hautatzen ditu bat datozen adierazpenak "
"kontuan hartuz.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Supererabiltzaileak soilik dauka paketeak ezabatzeko baimena"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "pakete ezezagunak"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "pakete ezezaguna"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "%s paketea kentzen baduzu, sistema apurtuko duzu"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Ez dago ezer kentzeko"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Ondoko paketeak kentzeko egiaztatzen"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1383,24 +1493,24 @@ msgstr[0] ""
msgstr[1] ""
"Mendekotasunak asetzeko, ondoko %d paketeak ezabatu egingo dira (%d MB)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr " (%d MB)"
-#: ../urpme:138
+#: ../urpme:135
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "%d paketea ezabatu?"
msgstr[1] "%d paketeak ezabatu?"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (b/E) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Kentzean huts egin du"
@@ -1427,14 +1537,14 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - inprimatu tresna honen bertsio zenbakia.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - ingurune espezifikoa erabiltzen du (normalean\n"
" errorearen berri ematea).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1448,14 +1558,14 @@ msgstr ""
" --literal, -l - ez parekatu patroi gisa, erabili argumentua hitzez hitz "
"testu ilara gisa.\n"
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../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"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1469,7 +1579,7 @@ msgid " --use-distrib - use the given path to access media\n"
msgstr ""
" --synthesis - emandako laburpena erabiltzen du urpmi db-ren ordez.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1480,7 +1590,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - ez inprimatu lerro berdinak.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - eguneratze-euskarria bakarrik erabiltzen du.\n"
@@ -1613,78 +1723,88 @@ msgid " --group - group\n"
msgstr " --group - taldea\n"
#: ../urpmf:72
+#, fuzzy, c-format
+msgid " --license - license\n"
+msgstr " --name - pakete izena\n"
+
+#: ../urpmf:73
#, c-format
msgid " --name - package name\n"
msgstr " --name - pakete izena\n"
-#: ../urpmf:73
+#: ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - \"zaharkituak\" etiketak\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr " --packager - paketatzailea\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - \"hornitu\" etiketak.\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - \"beharrezko\" etiketak\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, c-format
msgid " --size - installed size\n"
msgstr " --size - neurria instalatu ondoren\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - rpm iturburu izena.\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - \"zaharkituak\" etiketak\n"
+
+#: ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr " --summary - laburpena\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, c-format
msgid " --url - url\n"
msgstr " --url - url\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, c-format
msgid " --vendor - vendor\n"
msgstr " --verbose - hornitzailea\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -m - paketea zeukan euskarria\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - bertsioa, argitalpena eta fitxategia ere izenarekin inprimatzen "
"ditu.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Formatu okerra: etiketa balio-anitz bakarra erabili dezakezu"
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "%s(e)n ingurune espezifikoa erabiliz\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1693,12 +1813,12 @@ msgstr ""
"Oharra: bilatutako euskarriek ez dutenez hdlists erabiltzen, urpmf-ek ezin "
"izan du emaitzarik itzuli\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "--name erabili dezakezu pakete izenen arabera bilatzeko.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1715,7 +1835,7 @@ msgstr ""
"\n"
"erabilera:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1723,7 +1843,7 @@ msgstr ""
" --searchmedia - soilik adierazitako euskarria erabiltzen du eskatutako "
"paketeak bilatzeko.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
@@ -1732,7 +1852,7 @@ msgstr ""
" --auto - modu ez-interaktiboa, galderen erantzun lehenetsiak "
"erabili.\n"
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
@@ -1740,24 +1860,24 @@ msgstr ""
" --auto-select - automatikoki sistemaren bertsioa berritzeko paketeak "
"hautatzen ditu\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
" --auto-select - automatikoki sistemaren bertsioa berritzeko paketeak "
"hautatzen ditu\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - MD5SUM fitxategiaren egiaztapena desgaitzen du.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - gpg gakoa eguneratzera behartzen du.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1766,12 +1886,12 @@ msgstr ""
" --no-uninstall - inoiz ez du pakete bat desinstalatu nahi den galdetzen, "
"instalazioa bertan behera uzten da.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - paketeak ez instalatu (jaitsi soilik)\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1780,7 +1900,7 @@ msgstr ""
" --keep - gorde lehendik dauden paketeak ahal bada, ezetsi kentzea\n"
" eragiten duten pakete-eskaerak.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1792,38 +1912,44 @@ msgstr ""
" baino gehiago instalatu edo bertsio-berrituko badira,\n"
" lehenetsia %d da.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - transakzio txikiaren luzera, lehenetsia %d da.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy, -y - hurbilketazko bilaketa inposatzen du.\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src, -s - hurrengo paketea iturburu pakete bat da.\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
" --install-src - iturburu-paketea bakarrik instalatzen du (binarioak ez).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - kendu rpm cachetik beste ezer baino lehen.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - ez garbitu rpm-ak katxetik.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1832,7 +1958,7 @@ msgstr ""
" --allow-nodeps - erabiltzaileari paketeak instalatzeko eskatzeko aukera\n"
"ematen du, mendekotasunak egiaztatu gabe.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1841,12 +1967,12 @@ msgstr ""
" --allow-force - erabiltzaileari paketeak instalatzeko eskatzeko aukera\n"
"ematen du, mendekotasunak eta osotasuna egiaztatu gabe.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - beste root bat erabiltzen du rpm instalatzeko.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1855,49 +1981,49 @@ msgstr ""
" --use-distrib - urpmi berehala konfiguratzen du distrib zuhaitzetik, \n"
" erabilgarria chroot --root aukerarekin instalatzeko.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../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"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - curl erabiltzen du urruneko fitxategiak eskuratzeko.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../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"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr " --curl-options - curl-i aukera gehiago pasatzeko\n"
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr " --rsync-options- rsync-i aukera gehigarriak pasatzeko\n"
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr " --wget-options - wget-i aukera gehigarriak pasatzeko\n"
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr " --prozilla-options - prozilla-i aukera gehiago pasatzeko\n"
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - deskarga-abiadura mugatzen du.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1907,7 +2033,7 @@ msgstr ""
"berriro\n"
"ekiten dio ('--no-resume'-k hori desgaitzen du; lehenetsia desgaituta da).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1917,7 +2043,7 @@ msgstr ""
" 1080 izan behar du lehenespenez (formatua hau da: \n"
"<proxy-ostalaria[:ataka]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1926,7 +2052,7 @@ msgstr ""
" --proxy-user - zehaztu proxy-aren autentifikazioan erabiltzeko \n"
"erabiltzailea eta pasahitza (formatua hau da: <erabiltzailea:pasahitza>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1936,7 +2062,7 @@ msgstr ""
"argumentuak\n"
" adierazitako direktorioan.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1946,7 +2072,7 @@ msgstr ""
" (--no-verify-rpm ezgaitzeko, era lehenetsian gaituta "
"dago).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
@@ -1954,38 +2080,43 @@ msgid ""
msgstr ""
" --test - instalazioa zuzen gauzatu daitekeen egiaztatzen du.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - kanpoan uzten du komaz bereizitako bide-izena.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - docs fitxategiak kanpoan uzten ditu.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --ignoresize - ez egiaztatu diskoan dagoen lekua instalazio aurretik.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --ignorearch - bat ez datozen arkitekturetan instalatzen uzteko.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - ez du scriptlet(s) paketea exekutatzen\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - instalatu behar ez liratekeen paketeak\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - instalatu behar ez liratekeen paketeak\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1994,62 +2125,62 @@ msgstr ""
" --more-choices - pakete ugari aurkitzen direnean, proposatu lehenetsiak\n"
" baino aukera gehiago.\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - ez giltzatu rpm db.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
" --strict-arch - berritu soilik arkitektura berdina duten paketeak.\n"
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - komando-lerroko bat-etortze guztiak hautatzen ditu.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - paketeak aurkitzeko bilaketa 'provides'en egitea baimentzen du.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -p - paketeak aurkitzeko bilaketa ez du 'provides'en egiten.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - modu lasaia.\n"
-#: ../urpmi:157
+#: ../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"
-#: ../urpmi:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, 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:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2058,7 +2189,7 @@ msgstr ""
"[%s] direktorioa badago lehendik, erabili beste direktorio bat akatsen berri "
"emateko edo ezabatu"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Ezin da erroreen berri emateko [%s] direktorioa sortu"
@@ -2068,7 +2199,7 @@ msgstr "Ezin da erroreen berri emateko [%s] direktorioa sortu"
msgid "Environment directory %s does not exist"
msgstr "%s ingurune direktorioa ez da existitzen"
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2077,34 +2208,36 @@ msgstr ""
"Akatsa: %s irakurri-soilik muntatu dela dirudi.\n"
"Erabili --allow-force eragiketa behartzeko."
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr "Euskarria eguneratzen...\n"
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (eguneratu)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (eguneratu)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (instalatu)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, c-format
msgid "%s (to install)"
msgstr "%s (instalatu)"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2112,12 +2245,12 @@ msgid ""
msgstr ""
"Mendekotasunak asetzeko, ondoko %d paketeak ezabatu egingo dira (%d MB)"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Zein hautatzen duzu? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2128,7 +2261,7 @@ msgstr ""
" batzuekiko menpekotasuna dutelako:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2139,7 +2272,7 @@ msgstr ""
" batzuekiko menpekotasuna dutelako:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, c-format
msgid ""
"\n"
@@ -2148,12 +2281,12 @@ msgstr ""
"\n"
"Instalazioarekin jarraitu hala ere?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (B/e) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2162,7 +2295,7 @@ msgstr ""
"Eskatutako pakete bat ezin da instalatu:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2171,7 +2304,7 @@ msgstr ""
"Eskatutako pakete bat ezin da instalatu:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2182,7 +2315,7 @@ msgstr ""
"kendu egin behar direlako, beste batzuen bertsioa berritzeko:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2193,7 +2326,7 @@ msgstr ""
"kendu egin behar direlako, beste batzuen bertsioa berritzeko:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2202,7 +2335,7 @@ msgstr ""
"Pakete hauek kendu egin behar dira besteak berritzeko:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2211,12 +2344,17 @@ msgstr ""
"Pakete hauek kendu egin behar dira besteak berritzeko:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(froga soilik, ezabaketa ez da egingo)"
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2225,111 +2363,29 @@ msgstr ""
"Root-a izan behar duzu ondoko mendekotasunak instalatzeko:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(froga soilik, instalazioa ez da egingo)"
-#: ../urpmi:597
+#: ../urpmi:617
#, fuzzy, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "%d paketeen instalazioarekin jarraitu? (%d MB)"
msgstr[1] "%d paketeen instalazioarekin jarraitu? (%d MB)"
-#: ../urpmi:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Prest zaudenean sakatu Sartu..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Utzi"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "Ondoko pakete hauek sinadura okerra dute"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Ondoko pakete hauek sinadura okerra dute"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Instalatzen jarraitu nahi duzu?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Instalazioak huts egin du"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "%s banatzen"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "%s %s-tik instalatzen"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "%s instalatzen"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Mendekotasunak egiaztatu gabe saiatu nahi duzu instalatzen? (b/E) "
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Indar handiagoz instalatzen saiatu (--force)? (b/E) "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d instalazio transakzioek huts egin dute"
-msgstr[1] "%d instalazio transakzioek huts egin dute"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Instalazioa posible da"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Dena dago instalatuta"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Dena dago instalatuta"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "Dena dago instalatuta"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "Dena dago instalatuta"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "urpmi berrabiarazten"
@@ -2460,50 +2516,50 @@ msgstr " -v - modu berritsua.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "ezin da \"%s\" euskarria eguneratu\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Supererabiltzaileak soilik dauka euskarriak eransteko baimena"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "Konfig fitxategia sortuko du [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "Ezin da konfig fitxategia sortu [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr ""
"ez dago <hdlist-en bide-izen erlatiboa> --distrib erabiliz eman beharrik"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<hdlist bide-izen erlatiboa> falta da\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "ezin da \"%s\" euskarria sortu\n"
@@ -2668,17 +2724,17 @@ msgstr " -a - euskarri guztiak hautatzen ditu.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - parekatze lausoa euskarri izenetan.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Supererabiltzaileak soilik dauka euskarriak ezabatzeko baimena"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "ez dago kentzeko ezer (erabili urpmi.addmedia euskarria gehitzeko)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2734,18 +2790,18 @@ msgstr " -a - euskarri ez-aldagarri guztiak hautatzen ditu.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - hdlist fitxategiak sortzera behartzen du.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Supererabiltzaileak soilik dauka euskarriak eguneratzeko baimena"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, 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"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2754,22 +2810,22 @@ msgstr ""
"eguneratu beharreko sarrera falta da\n"
"(%s(e)tako bat\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "%s euskarria baztertzen"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "%s euskarria gaitzen"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2786,7 +2842,7 @@ msgstr ""
"\n"
"erabilera:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2795,54 +2851,54 @@ msgstr ""
" --searchmedia - soilik emandako euskarria erabiltzen du eskatutako "
"paketeak (edo eguneratutakoak) bilatzeko.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - hurbilketazko bilaketa inposatzen du (-y bezala).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - pakete erabilgarrien zerrenda.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - euskarri erabilgarrien zerrenda.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr ""
" --list-url - erabilgarri dauden euskarriak eta haien url-a zerrendatzen "
"ditu.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
" --list-nodes - --parallel erabiltzean erabilgarri dauden nodoen "
"zerrenda .\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - alias paralelo erabilgarrien zerrenda.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, 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"
-#: ../urpmq:65
+#: ../urpmq:62
#, 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"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
@@ -2850,12 +2906,12 @@ msgstr ""
"--sources - iturburu-pakete guztiak deskargatu aurretik ematen ditu \n"
" (root-ek bakarrik).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --arch - arkitektura\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2864,22 +2920,22 @@ msgstr ""
" --use-distrib - urpmi berehala konfiguratzen du distrib zuhaitzetik.\n"
" Horren bidez distro bati kontsulta egin diezaiokezu.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - changelog inprimatzen du.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - laburpena inprimatu.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - paketeak behar duenaren alderantzizko bilaketa.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2889,59 +2945,59 @@ msgstr ""
" - alderantzizko bilaketa hedatua (alegiazko paketeak "
"barne).\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -p - bilatu 'provides'-en paketeak aurkitzeko.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - osatu irteera kendu behar den paketearekin.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - kontsulta paketeen mendekoetara zabaltzen du.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - taldeak ere izenarekin inprimatzen ditu.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - informazio erabilgarria pertsonek irakurtzeko moduan inprimatzen "
"du.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - paketeko fitxategiak zerrendatzen ditu.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - modu lasaia.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr ""
" -r - bertsioa eta argitalpena ere izenarekin inprimatzen "
"ditu.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, 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"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2949,47 +3005,47 @@ msgid ""
msgstr ""
"-u - paketea kentzen du bertsio berriagoa instalatuta badago.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - inposatu hurbilketazko bilaketa (--fuzzy bezala).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - -y bezala, baino ez ditu hizki larri/xeheak "
"desberdinduko.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, 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"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--nodo-zerrendak honekin bakarrik erabil daitezke: --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"Oharra: bilatutako euskarriek ez dutenez hdlists erabiltzen, urpmf-ek ezin "
"izan du emaitzarik itzuli\n"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2997,11 +3053,22 @@ msgstr ""
"Oharra: bilatutako euskarriek ez dutenez hdlists erabiltzen, urpmf-ek ezin "
"izan du emaitzarik itzuli\n"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Ez da aldaketa-erregistroa aurkitu\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Ondoko paketeek sinadura okerrak dituzte:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Instalazioarekin jarraitu nahi duzu?"
+
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Root-a izan behar duzu --use-distrib erabiltzeko"
diff --git a/po/fa.po b/po/fa.po
index 3a966815..2c71e8a0 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2005-02-06 08:42-0500\n"
"Last-Translator: \n"
"Language-Team: <en@li.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
"X-Generator: KBabel 1.9.1\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "نصب RPM"
@@ -30,7 +30,7 @@ msgstr "نصب RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_تأیید"
@@ -96,7 +96,7 @@ msgstr "_نصب"
msgid "_Save"
msgstr "_ذخیره"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_لغو"
@@ -118,17 +118,17 @@ msgstr ""
msgid "No packages specified"
msgstr "هیچ بسته‌ای با نام %s"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "لطفاً صبر کنید..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "باید مدیر باشید"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -139,42 +139,42 @@ msgstr ""
"%s\n"
"ادامه میدهید؟"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "هشدار"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "تایید"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (ارتقاء دادن)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (نصب کردن)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "یکی از بسته‌های بدنبال آمده لازم است:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_ترک"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -185,58 +185,60 @@ msgstr ""
"%s\n"
"ادامه میدهید؟"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "برای ارضای وابستگی‌ها، بسته‌ی بدنبال آمده نصب خواهد شد (%d مگابایت)"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "برای ارضای وابستگی‌ها، بسته‌ی بدنبال آمده نصب خواهد شد (%d مگابایت)"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(بسته‌های %d، %d مگابایت)"
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "نصب بسته..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "نمب‌توان بسته های منبع را دریافت کرد، پایان داده می‌شود"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "در حال آماده کردن..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "نصب بسته `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "لطفاً رسانه‌ی بنام \"%s\" بر دستگاه [%s] را داخل نمایید"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "بارگیری بسته `%s'..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"بسته‌های بدنبال آمده امضاهای بد دارند:\n"
-"%s\n"
-"\n"
-"آیا می‌خواهید نصب را ادامه دهید؟"
+msgid "_Done"
+msgstr "_انجام شد"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -247,41 +249,27 @@ msgstr ""
"%s\n"
"بهتر است بانک اطلاعات urpmi را بروزسازی نمایید"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "برداشتن %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "در حال آماده کردن..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "نصب بسته `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_انجام شد"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "نصب شکست خورد"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "همه چیز قبلاً نصب شده است"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "نصب پایان یافت"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "برداشتن %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -316,7 +304,7 @@ msgstr " -g - چاپ گروه‌ها با نام.\n"
msgid " defaults to %s.\n"
msgstr " %s پیش‌فرض است.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "فقط کاربر برتر برای نصب بسته‌ها مجاز می‌باشد"
@@ -326,98 +314,98 @@ msgstr "فقط کاربر برتر برای نصب بسته‌ها مجاز می
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "نمی‌توان rpmdb را باز کرد"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "نام پرونده rpm نامعتبر [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "در حال دریافت پرونده‌ی rpm [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...دریافت انجام گرفت"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...دریافت شکست خورد: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "نمی‌توان به پرونده rpm [%s] دسترسی یافت"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "نمی‌توان \"%s\" را در پرونده [%s] تجزیه کرد"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "نمی‌توان پرونده rpm را بایگانی کرد"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "خطا در بایگانی کردن بسته‌های محلی"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "تعریف بد پراکسی بر خط فرمان\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: نمی‌توان پرونده rpm \"%s\" را خواند\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "ساختن پرونده ترکیب hdlist برای رسانه \"%s\""
@@ -607,7 +595,12 @@ msgstr "بسته‌ی %s پیدا نشد."
msgid "malformed URL: [%s]"
msgstr "درون‌ریز درهمریخته: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "دریافت پرونده‌های rpm از رسانه \"%s\"..."
@@ -617,43 +610,48 @@ msgstr "دریافت پرونده‌های rpm از رسانه \"%s\"..."
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, 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:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "نمی‌توان تکه‌های انتقالی را ایجاد کرد"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "نمی‌توان بسته‌ی %s را برداشت"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "افرودن بسته %s (id=%d, eid=%d, update=%d, file=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "نمی‌توان بسته %s را نصب کرد"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "برداشتن بسته %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "برداشتن بسته %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "نصب %s از %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "اطلاعات بیشتر برای بسته‌ی %s"
@@ -683,11 +681,102 @@ msgstr "هیچ بسته‌ای با نام %s"
msgid "Cannot connect to ldap uri:"
msgstr "نمی‌توان مدخلهای نقشه‌رنگ را تخصیص داد"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "بانک اطلاعات urpmi قفل شده است"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "هشدار"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "بانک اطلاعات urpmi قفل شده است"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "بسته‌های بدنبال آمده امضاهای بد دارند"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "بسته‌های بدنبال آمده امضاهای بد دارند"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "آیا می‌خواهید نصب را ادامه دهید؟"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "نصب شکست خورد"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "انتشار دادن %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "نصب %s از %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "نصب %s"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "تلاش برای نصب بدون بررسی وابستگی‌ها؟ (y/N) "
+
+#: ../urpm/main_loop.pm:205
+#, fuzzy, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "تلاش برای نصب حتی قویتر (--force)؟ (y/N) "
+
+#: ../urpm/main_loop.pm:247
+#, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d معامله‌های نصب شکست خورد"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "نصب ممکن می‌باشد"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "همه چیز قبلاً نصب شده است"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "همه چیز قبلاً نصب شده است"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "همه چیز قبلاً نصب شده است"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "همه چیز قبلاً نصب شده است"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -738,7 +827,7 @@ msgstr "تلاش برای انتخاب رسانه‌ \"%s\" که وجود ندا
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "ساختن پرونده ترکیب hdlist برای رسانه \"%s\""
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "نمی‌توان به پرونده hdlist \"%s\" دسترسی یافت، رسانه نادیده گرفته می‌شود "
@@ -833,7 +922,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "جستجو کردن با شروع در: %s پایان در: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "در حال اجرای دومین نوبت حساب کردن وابستگی‌ها\n"
@@ -898,67 +987,72 @@ msgstr "نمی‌توان rpmdb را باز کرد"
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "ناتوان به دسترسی اولین رسانه‌ی نصب (هیچ پرونده‌ی hdlists دیسک پیدا شد)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "تلاش برای انتخاب رسانه‌ \"%s\" که وجود ندارد"
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "انتخاب چندین رسانه ها: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "برداشتن رسانه‌ی \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "تنظیم مجدد urpmi برای رسانه \"%s\""
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...تنظیم مجدد شکست خورد"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "تنظیم مجدد انجام گردید"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "رسانه \"%s\" انتخاب نشده است"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "آزمایش پرونده hdlist [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "آزمایش پرونده ترکیب [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "ساختن hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -967,77 +1061,77 @@ msgstr ""
"نمیتوان پرونده تجزیه را برای رسانه \"%s\" ساخت. پرونده hdlist شما ممکن است "
"خراب باشد."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "مشکل در خواندن سرلیست یا پرونده‌ی ترکیب رسانه‌ی \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "نگارش پرونده لیست برای رسانه \"%s\""
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...کپی کردن شکست خورد"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "کپی کردن پرونده‌ی توضیحات \"%s\"..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...کپی شد"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "کپی از [%s] شکست خورد (پرونده بطرز مشکوکی کوچک است)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "حساب کردن md5sum سرلیست منبع کپی شده (یا ترکیب)"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "کپی کردن [%s] شکست خورد (عدم تطابق md5sum)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "حساب کردن md5sum از hdlist منبع دریافت شده (یا ترکیب)"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...دریافت شکست خورد: عدم تطابق md5sum "
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "هیچ پرونده‌های rpm از [%s] پیدا نشد"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "خواندن پرونده‌های rpm از [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "نمی‌توان پرونده‌های rpm را از [%s] خواند: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "هیچ rpms خوانده نشد"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1048,74 +1142,74 @@ msgstr ""
"این می‌تواند در صورتی که شما شاخه را هنگام ایجاد رسانه دستی سوار کرده باشید "
"اتفاق بیافتد."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "هیچ پرونده‌ی hdlist برای رسانه \"%s\" یافت شد"
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "دریافت hdlist منبع (یا ترکیب) \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "hdlist (یا ترکیب) شناسایی شده مانند %s یافت شد"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "هیچ پرونده‌ی hdlist برای رسانه \"%s\" یافت شد"
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "در حال آزمایش پرونده کلید عمومی \"%s\"..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...در حال وارد کردن کلید %s از پرونده کلیدعمومی \"%s\""
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "نمی‌توان پرونده کلید عمومی \"%s\" را وارد کرد"
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "نگارش پرونده لیست برای رسانه \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "رسانه اضافه شده %s"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "نمی‌توان پرونده hdlist \"%s\" را تجزیه کرد"
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "مشکل در خواندن پرونده‌ی ترکیب رسانه‌ی \"%s\""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "خواندن سرآیندها از رسانه \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "NnخنoO"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "YyبfF"
@@ -1175,47 +1269,52 @@ msgstr "رسانه بی‌ارتباط \"%s\" قابل انتقال نشان د
msgid "unable to access medium \"%s\""
msgstr "نمی‌توان به رسانه \"%s\" دسترسی پیدا کرد"
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "هیچ بسته‌ای با نام %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "بسته‌های بدنبال آمده حاوی %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "بدلیل عدم وجود %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "همه چیز قبلاً نصب شده است"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "بدلیل عدم رضایت %s"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "تلاش برای ترفیع %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "برای نگهداشتن %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "برای نصب %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "بدلیل اختلاف با %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "خواسته نشده"
@@ -1235,6 +1334,16 @@ msgstr "شناسه کلید نامعتبر (%s)"
msgid "Missing signature (%s)"
msgstr "عدم وجود امضا (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "نمی‌توان پرونده‌ی [%s] را نوشت"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "کپی کردن شکست خورد"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1251,8 +1360,8 @@ msgstr ""
"\n"
"طرز استفاده:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - چاپ این پیغام راهنما.\n"
@@ -1268,19 +1377,19 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - تصدیق کردن اینکه آیا حذف می‌تواند بدرستی انجام پذیرد.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr ""
" --force - اجبار درخواست حتی اگر بعضی از بسته ها وجود ندارند.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - urpmi منتشر شده در بین ماشین‌های مستعار.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - چاپ برچسب بسته‌گر: packager.\n"
@@ -1290,8 +1399,8 @@ msgstr " --packager - چاپ برچسب بسته‌گر: packager.\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - استفاده از ریشه‌ی دیگری برای حذف نصب rpm.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - استفاده از ریشه‌ی دیگری برای نصب rpm.\n"
@@ -1310,17 +1419,17 @@ msgstr ""
" --use-distrib - urpmi را در هوا از درخت distrib پیکربندی می‌کند، برای\n"
" نصب(برداری) یک chroot با گزینه‌ی --root مفید است.\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - تلاش برای یافتن و استفاده از پرونده ترکیب.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - تلاش برای پیدا کردن و استفاده از پرونده‌ی hdlist.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - حالت لغتی.\n"
@@ -1330,60 +1439,60 @@ msgstr " --verbose, -v - حالت لغتی.\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - انتخاب تمام بسته‌های مطابق با عبارت.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "فقط کاربر مدیر برای برداشتن بسته‌ها مجاز است"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "بسته‌های ناشناس"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "بسته‌ی ناشناس"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "برداشتن بسته‌ی %s سیستم شما را خواهد شکست"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "هیچ چیزی برای برداشتن"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "در حال بررسی برای برداشتن بسته‌های بدنبال آمده"
-#: ../urpme:134
+#: ../urpme:131
#, 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] "برای ارضای وابستگی‌ها، %dبسته‌های بدنبال آمده برداشته خواهند شد"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr " (%d مگابایت)"
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "برداشتن بسته %s"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (y/N) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "برداشتن شکست خورد"
@@ -1409,12 +1518,12 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --help - چاپ این پیغام راهنما.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr " --env - استفاده از محیط مشخص (معمولاً یک گزارش اشکال).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1426,13 +1535,13 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - فقط از رسانه‌های داده شده، جدا شده با ویرگول استفاده شود.\n"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1444,7 +1553,7 @@ msgstr ""
msgid " --use-distrib - use the given path to access media\n"
msgstr " --synthesis - استفاده از ترکیب داده شده بجای urpmi db.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - استفاده از ترکیب داده شده بجای urpmi db.\n"
@@ -1454,7 +1563,7 @@ msgstr " --synthesis - استفاده از ترکیب داده شده بجا
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - خطهای یکسان چاپ نشوند.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - فقط استفاده از رسانه‌های بروزسازی.\n"
@@ -1590,75 +1699,85 @@ msgstr " --group - چاپ برچسب گروه: گروه.\n"
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr " --name - فقط نام‌های بسته چاپ شود.\n"
#: ../urpmf:73
#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr " --name - فقط نام‌های بسته چاپ شود.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - چاپ برچسب کهنه‌ها: همه کهنه‌ها.\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr " --packager - چاپ برچسب بسته‌گر: packager.\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, fuzzy, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - برچسب چاپ عرضه می‌دارد: عرضه‌ی همه.\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, fuzzy, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - چاپ برچسب لازمه: همه لازم.\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --size - چاپ برچسب اندازه: اندازه.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, fuzzy, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - چاپ برچسب sourcerpm: منبع rpm.\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - چاپ برچسب کهنه‌ها: همه کهنه‌ها.\n"
+
+#: ../urpmf:81
#, fuzzy, c-format
msgid " --summary - summary\n"
msgstr " --summary - برچسب خلاصه‌ی چاپ: خلاصه.\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr " --url - چاپ برچسب url: url.\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr " --verbose - حالت لغتی.\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -l - پرونده‌های در بسته را فهرست می‌کند\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - چاپ نسخه، انتشار و ساختار با نام.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "استفاده از محیط مشخص بر %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1667,12 +1786,12 @@ msgstr ""
"توجه: چون هیچ رسانه‌ای با استفاده از hdlists جستجو نگردید، urpmf قادر نبود "
"نتیجه‌ای را بازگرداند\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "ممکن است بخواهید از -name برای جستجوی نام‌های بسته استفاده کنید.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1688,7 +1807,7 @@ msgstr ""
"\n"
"طرز استفاده:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1696,47 +1815,47 @@ msgstr ""
" --searchmedia - فقط از رسانه داده شده برای جستجوی بسته‌های درخواست شده "
"استفاده گردد.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr " --auto-select - انتخاب بطور خودکار بسته‌ها برای ارتقای سیستم.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr " --auto-select - انتخاب بطور خودکار بسته‌ها برای ارتقای سیستم.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - بررسی MD5SUM پرونده را از کار می‌اندازد.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - اجبار بروزسازی کلید gpg.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
"installation.\n"
msgstr " --no-uninstall - هرگز برای عزل یک بسته پرسش نشود، پایان نصب.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, fuzzy, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --install-src - فقط بسته‌ی منبع نصب می‌شود (نه باینری).\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1745,7 +1864,7 @@ msgstr ""
" --keep - نگهداشتن بسته‌های موجود در صورت ممکن، عدم پذیرش بسته‌هایی\n"
" که به برداشتن ختم می‌شود.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1756,37 +1875,43 @@ msgstr ""
" قرار است نصب یا ارتقا داده شوند،\n"
" پیش‌فرض %d می‌باشد.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - اندازه‌های کوچک انتقال, پیش‌فرض %d می‌باشد.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, fuzzy, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy - تحمیل جستجوی فازی (همانند -y).\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, fuzzy, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src - بسته‌ی بعدی یک بسته‌ی منبع (مانند -s) می‌باشد.\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr " --install-src - فقط بسته‌ی منبع نصب می‌شود (نه باینری).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - برداشتن rpm از حافظه پنهان قبل از هر چیز دیگر.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, fuzzy, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - نگهداری rpm استفاده نشده در حافظه‌ی پنهان.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1795,7 +1920,7 @@ msgstr ""
" --allow-nodeps - اجازه‌ی پرسش از کاربر برای نصب بسته‌ها بدون بررسی\n"
" وابستگی‌ها را می‌دهد.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1804,12 +1929,12 @@ msgstr ""
" --allow-force - اجازه‌ی پرسش از کاربر برای نصب بسته‌ها بدون\n"
" بررسی وابستگی و درستی آنها.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - استفاده از ریشه‌ی دیگری برای نصب rpm.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1818,50 +1943,50 @@ msgstr ""
"··--use-distrib··-·urpmi·را·در·هوا·از·درخت·distrib·پیکربندی·می‌کند،·برای\n"
"···················نصب(برداری)·یک·chroot·با·گزینه‌ی·--root·مفید·است.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr ""
" --wget - از wget برای دریافت پرونده‌های دوردست استفاده نمایید.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr ""
" --curl - از curl برای دریافت پرونده‌های دور دست استفاده شود.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, fuzzy, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr ""
" --curl - از curl برای دریافت پرونده‌های دور دست استفاده شود.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - محدود کردن سرعت بارگیری.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1871,7 +1996,7 @@ msgstr ""
" (--no-resume آن را از کار می‌اندازد, ازکارافتاده پیش‌فرض "
"است).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1880,7 +2005,7 @@ msgstr ""
" --proxy - استفاده از پراکسی HTTP، شماره درگاه بوسیله‌ی پیش فرض\n"
" ۱۰۸۰ فرض شده است (قالب آن <proxyhost[:port]> می‌باشد).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1889,7 +2014,7 @@ msgstr ""
" --proxy-user - کاربر و گذرواژه را برای اعتبارسنجی پراکسی مشخص\n"
" می‌کند (قالب آن <user:password>است).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1898,7 +2023,7 @@ msgstr ""
" --bug - بیرون‌ریزی یک گزارش اشکال در شاخه‌ی مشخص شده بوسیله\n"
" مبحث بعدی.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, fuzzy, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1907,7 +2032,7 @@ msgstr ""
" --verify-rpm - تصدیق امضاهای rpm قبل از نصب\n"
" (--no-verify-rpm غیر فعال شود، پیش‌فرض فعال شده است).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, fuzzy, c-format
msgid ""
" --test - only verify if the installation can be achieved "
@@ -1915,37 +2040,42 @@ msgid ""
msgstr ""
" --test - تصدیق کردن اینکه آیا نصب می‌تواند بدرستی انجام پذیرد.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - مسیر بوسیله‌ی ویرگول جدا کننده خارج شود .\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - پرونده‌های نوشتاری محسوب نشوند.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, fuzzy, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr " --no-uninstall - هرگز برای عزل یک بسته پرسش نشود، پایان نصب.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --url - چاپ برچسب url: url.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - چاپ برچسب توضیحات: توضیحات.\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - بسته‌هایی که نصب آنها باید نادیده گرفته شود\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - بسته‌هایی که نصب آنها باید نادیده گرفته شود\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1954,60 +2084,60 @@ msgstr ""
" --more-choices - هنگامی که چندین بسته یافت می‌گردد، گزینه‌های بیشتری\n"
" از پیش‌فرض پیشنهاد شود.\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - نگهداری rpm استفاده نشده در حافظه‌ی پنهان.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - فقط بسته‌های با ساختار یکسان ارتقاء داده شوند.\n"
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - انتخاب همه مطابقت‌ها بر خط فرمان.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - جستجو در عرضه‌ها برای یافتن بسته را اجازه می‌دهد.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - جستجو در عرضه‌ها برای یافتن بسته نشود.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - حالت ساکت.\n"
-#: ../urpmi:157
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " نام‌ها یا پرونده‌های rpm داده شده بر خط فرمان نصب خواهند شد.\n"
-#: ../urpmi:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
"آنچه می‌توان با پرونده‌های باینری rpm انجام داد هنگام استفاده --install-src"
-#: ../urpmi:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2016,7 +2146,7 @@ msgstr ""
"شاخه‌ی [%s] از قبل وجود دارد، لطفا از شاخه‌ی دیگری برای گزارش اشکال استفاده "
"کنید یاآن را حذف کنید"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "نمی‌توان شاخه‌ی [%s] را برای گزارش اشکال ایجاد کرد"
@@ -2026,7 +2156,7 @@ msgstr "نمی‌توان شاخه‌ی [%s] را برای گزارش اشکال
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2035,46 +2165,48 @@ msgstr ""
"خطا: %s بنظر میرسد بطور فقط-خوانش سوار شده است.\n"
"از --allow-force برای اجبار عملیات استفاده گردد."
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (ارتقاء دادن)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (ارتقاء دادن)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (نصب کردن)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (نصب کردن)"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "برای ارضای وابستگی‌ها، %dبسته‌های بدنبال آمده برداشته خواهند شد"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "انتخاب شما چه است؟ (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2085,7 +2217,7 @@ msgstr ""
"بستگی داشته که کهنه تر از بسته‌های نصب شده هستند:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2096,19 +2228,19 @@ msgstr ""
"بستگی داشته که کهنه تر از بسته‌های نصب شده هستند:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "در هر حال ادامه می‌دهید؟"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (Y/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2117,7 +2249,7 @@ msgstr ""
"بعضی از بسته‌های خواسته شده نمی‌توانند نصب شوند:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2126,7 +2258,7 @@ msgstr ""
"بعضی از بسته‌های خواسته شده نمی‌توانند نصب شوند:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2137,7 +2269,7 @@ msgstr ""
"باید برداشته شوند تا بسته‌های دیگر بتوانند ارتقا یابند: \n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2148,7 +2280,7 @@ msgstr ""
"باید برداشته شوند تا بسته‌های دیگر بتوانند ارتقا یابند: \n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2157,7 +2289,7 @@ msgstr ""
"بسته‌های بدنبال آمده باید برداشته شوند تا بسته‌های دیگر بتوانند ارتقا یابند:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2166,12 +2298,17 @@ msgstr ""
"بسته‌های بدنبال آمده باید برداشته شوند تا بسته‌های دیگر بتوانند ارتقا یابند:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2180,109 +2317,28 @@ msgstr ""
"برای نصب وابستگی‌های بدنبال آمده شما باید مدیر سیستم باشید:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
-#: ../urpmi:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "وقتی آماده‌اید ورود را فشار دهید..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "لغو"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "بسته‌های بدنبال آمده امضاهای بد دارند"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "بسته‌های بدنبال آمده امضاهای بد دارند"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "آیا می‌خواهید نصب را ادامه دهید؟"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "نصب شکست خورد"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "انتشار دادن %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "نصب %s از %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "نصب %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "تلاش برای نصب بدون بررسی وابستگی‌ها؟ (y/N) "
-
-#: ../urpmi:776
-#, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "تلاش برای نصب حتی قویتر (--force)؟ (y/N) "
-
-#: ../urpmi:815
-#, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d معامله‌های نصب شکست خورد"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "نصب ممکن می‌باشد"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "همه چیز قبلاً نصب شده است"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "همه چیز قبلاً نصب شده است"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "همه چیز قبلاً نصب شده است"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "همه چیز قبلاً نصب شده است"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "راه‌اندازی دوباره‌ی urpmi"
@@ -2411,49 +2467,49 @@ msgstr " -v - حالت لغتی.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "نمی‌توان رسانه \"%s\" را بروزسازی کرد\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "فقط کاربر مدیر برای افزودن رسانه مجاز است"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "پرونده پیکربندی [%s] ایجاد خواهد شد"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "نمیتوان پرونده پیکربندی [%s] را ایجاد کرد"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "احتیاجی به دادن <relative path of hdlist> با --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<relative path of hdlist> وجود ندارد\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "نمی‌توان رسانه \"%s\" را ایجاد کرد\n"
@@ -2612,18 +2668,18 @@ msgstr " -a - انتخاب تمام رسانه‌ها.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - تطابق نامعلوم در نام‌های رسانه.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "فقط کاربر مدیربرای برداشتن رسانه مجاز است"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr ""
"هیچ چیز برای برداشتن (استفاده از urpmi.addmedia برای افزودن یک رسانه)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2682,18 +2738,18 @@ msgstr " -a - انتخاب همه رسانه‌های غیر قاب
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - اجبار تولید پرونده‌های hdlist.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "فقط کاربر مدیر برای بروزسازی رسانه مجاز است"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
"هیچ چیز برای بروزسازی (استفاده از urpmi.addmedia برای اضافه کردن یک رسانه)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2702,22 +2758,22 @@ msgstr ""
"ورودی برای بروزسازی وجود ندارد\n"
"(یکی از %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "نادیده‌گیری رسانه‌ی %s"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "بکار انداختن رسانه‌ی %s"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2733,7 +2789,7 @@ msgstr ""
"\n"
"طرز استفاده:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2742,60 +2798,60 @@ msgstr ""
" --searchmedia - فقط از رسانه داده شده برای جستجوی بسته‌های درخواست شده "
"استفاده گردد.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - تحمیل جستجوی فازی (همانند -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - لیست کردن بسته‌های موجود.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - لیست رسانه‌های موجود.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - رسانه‌ی در دسترس و url آنها را فهرست می‌کند.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr " --list-nodes - list available nodes when using --parallel.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - نام های مستعار موازی موجود را فهرست می‌کند.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr " --dump-config - تخلیه‌ی پیکربندی به شکل آرگومان urpmi.addmedia.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr " --src - بسته‌ی بعدی یک بسته‌ی منبع (مانند -s) می‌باشد.\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr ""
" --sources - همه بسته‌های منابع را قبل از باگیری می‌دهد (فقط مدیر).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --url - چاپ برچسب url: url.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2804,22 +2860,22 @@ msgstr ""
" --use-distrib - پیکربندی urpmi در هوا از درخت distrib.\n"
" این پرسش یک توزیع را اجازه می‌دهد.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - چاپ ثبت تغییرات.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - برچسب خلاصه‌ی چاپ: خلاصه.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - جستجوی معکوس برای آنچه بسته را لازم دارد.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2828,54 +2884,54 @@ msgstr ""
" --whatrequires-recursive\n"
" - جستجوی معکوس برای آنچه بسته را لازم دارد.\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -p -درعرضه‌ها برای یافتن بسته جستجو شود\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - تکمیل بیرون‌ریز با بسته‌ای که برداشته می‌شود.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - پرسش گسترده برای وابستگی‌های بسته.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - چاپ گروه‌ها با نام.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - اطلاعات مفید را به زبان آدمیزاد چاپ می‌کند.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - پرونده‌های در بسته را فهرست می‌کند\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - حالت ساکت.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - چاپ نسخه و انتشار با نام.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - بسته‌ی بعدی یک بسته‌ی منبع (مانند --src) می‌باشد.\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2883,44 +2939,44 @@ msgid ""
msgstr ""
" -u - برداشتن بسته اگر یک نسخه‌ی جدیدتر قبلاً نصب شده است.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - تحمیل جستجوی فازی (همانند --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -Y - مانند -y, ولی اجبار تطابق کازه اعمال می‌شود.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr "نام‌ها یا پرونده‌های داده شده بر خط فرمان مورد تردید می‌باشند.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes فقط می‌توانند با --parallel استفاده شود"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"توجه: چون هیچ رسانه‌ای با استفاده از hdlists جستجو نگردید، urpmf قادر نبود "
"نتیجه‌ای را بازگرداند\n"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2928,11 +2984,22 @@ msgstr ""
"توجه: چون هیچ رسانه‌ای با استفاده از hdlists جستجو نگردید، urpmf قادر نبود "
"نتیجه‌ای را بازگرداند\n"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "هیچ ثبت تغییری یافت نشد\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "بسته‌های بدنبال آمده امضاهای بد دارند:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "آیا می‌خواهید نصب را ادامه دهید؟"
+
#, fuzzy
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "برای استفاده از این فرمان باید مدیر باشید ! \n"
@@ -3206,9 +3273,6 @@ msgstr "هیچ ثبت تغییری یافت نشد\n"
#~ "بعضی از بسته‌های خواسته شده نمی‌توانند نصب شوند:\n"
#~ "%s"
-#~ msgid "unable to write file [%s]"
-#~ msgstr "نمی‌توان پرونده‌ی [%s] را نوشت"
-
#~ msgid ""
#~ " --distrib-XXX - automatically create a medium for XXX part of a\n"
#~ " distribution, XXX may be main, contrib, updates or\n"
diff --git a/po/fi.po b/po/fi.po
index 5eeb975c..3a7880a6 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-fi - Mandriva 2006 Release\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2005-09-13 20:47+0300\n"
"Last-Translator: Thomas Backlund <tmb@mandriva.org>\n"
"Language-Team: Finnish <fi@li.org>\n"
@@ -23,7 +23,7 @@ msgstr ""
"X-Generator: KBabel 1.10.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "RPM asennus"
@@ -33,7 +33,7 @@ msgstr "RPM asennus"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -99,7 +99,7 @@ msgstr "_Asenna"
msgid "_Save"
msgstr "_Tallenna"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Peruuta"
@@ -121,17 +121,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Komentoa ei annettu"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Odota hetki..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "Pitää olla pääkäyttäjä"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -142,42 +142,42 @@ msgstr ""
"%s\n"
"Jatketaanko?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Varoitus"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (päivitettävä)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (asennettava)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "Pakettivalinta"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Yksi seuraavista paketeista tarvitaan:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Hylkää"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -188,13 +188,13 @@ msgstr ""
"%s\n"
"Jatketaanko?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Riippuvuuksien täyttämiseksi seuraava paketti asennetaan (%d Mt)"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -202,47 +202,49 @@ msgstr ""
"Riippuvuuksien täyttämiseksi seuraavat %d pakettia asennetaan :\n"
"%s\n"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, fuzzy, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "%d pakettia"
msgstr[1] "%d pakettia"
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Pakettien asennus..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "lähteen paketteja ei saada, toiminto keskeytetään"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Valmistellaan..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Asennetaan pakettia `%s' (%s / %s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Aseta media nimeltään \"%s\" laitteeseen [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Ladataan pakettia `%s'..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Seuraavissa paketeissa on virheelliset allekirjoitukset:\n"
-"%s\n"
-"\n"
-"Haluatko jatkaa asennusta?"
+msgid "_Done"
+msgstr "_Valmis"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -253,41 +255,27 @@ msgstr ""
"%s\n"
"Sinun kannattaisi päivittää urpmi-tietokanta"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "poistetaan %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Valmistellaan..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Asennetaan pakettia `%s' (%s / %s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Valmis"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Asennus epäonnistui"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Kaikki on jo asennettu"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Asennus on valmis"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "poistetaan %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -322,7 +310,7 @@ msgstr " -g - tulosta ryhmät nimen lisäksi\n"
msgid " defaults to %s.\n"
msgstr " - oletus on %s\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Vain pääkäyttäjä saa asentaa paketteja"
@@ -332,98 +320,98 @@ msgstr "Vain pääkäyttäjä saa asentaa paketteja"
msgid "Running urpmi in restricted mode..."
msgstr "Suorita urpmi rajoitetussa tilassa..."
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "rpm-tietokantaa ei voitu avata"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "virheellinen rpm-tiedoston nimi [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "noudetaan rpm-tiedostoa [%s]..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...noudettu"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...nouto epäonnistui: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "rpm-tiedostoa [%s] ei voitu käsitellä"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "\"%s\" ei voitu tulkita tiedostossa [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "rpm-tiedoston rekisteröinti ei onnistunut"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "virhe rekisteröitäessä paikallisia paketteja"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, 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:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "virheellinen välityspalvelinmääritys komentorivillä\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: rpm-tiedostoa \"%s\" ei voida lukea\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "rakennetaan median \"%s\" hdlist synthesis -tiedosto"
@@ -613,7 +601,12 @@ msgstr "pakettia %s ei löytynyt."
msgid "malformed URL: [%s]"
msgstr "väärin muodostettu syöte: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "noudetaan rpm-tiedostoja medialta \"%s\"..."
@@ -623,43 +616,48 @@ msgstr "noudetaan rpm-tiedostoja medialta \"%s\"..."
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, 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:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "tapahtumaa ei voitu luoda"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "paketin purkaminen %s delta-rpm paketista ei onnistu"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "lisätään pakettia %s (id=%d, eid=%d, päivitys=%d, tiedosto=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "pakettia %s ei voitu asentaa"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "poistetaan paketti %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "poistetaan paketti %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "asennetaan %s kohteesta %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Lisätietoja paketista %s"
@@ -689,11 +687,103 @@ msgstr "Komentoa ei annettu"
msgid "Cannot connect to ldap uri:"
msgstr "Palvelimeen ei saatu yhteyttä"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "urpmi-tietokanta lukittu"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Varoitus"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "urpmi-tietokanta lukittu"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "Seuraavissa paketeissa on virheelliset allekirjoitukset"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Seuraavissa paketeissa on virheelliset allekirjoitukset"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Haluatko jatkaa asennusta?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Asennus epäonnistui"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "levitetään %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "asennetaan %s kohteesta %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "asennetaan %s"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Yritetään asentaa ilman riippuvuuksia? (k/E) "
+
+#: ../urpm/main_loop.pm:205
+#, fuzzy, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "Yritetään asentaa pakolla (--force)? (k/E) "
+
+#: ../urpm/main_loop.pm:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d asennustoimintoa epäonnistui"
+msgstr[1] "%d asennustoimintoa epäonnistui"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Asennus on mahdollinen"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "Kaikki on jo asennettu"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Kaikki on jo asennettu"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "Kaikki on jo asennettu"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Kaikki on jo asennettu"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -745,7 +835,7 @@ msgstr "yritettiin valita media \"%s\" jota ei ole olemassa"
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "rakennetaan median \"%s\" hdlist synthesis -tiedosto"
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "median \"%s\" hdlist-tiedostoa ei voida käyttää, media ohitettu"
@@ -838,7 +928,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Haun alku: %s loppu: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "suoritetaan toinen kierros riippuvuuksien laskemiseksi\n"
@@ -904,67 +994,72 @@ msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"ensimmäistä asennusmediaa ei voitu käyttää (hdlists-tiedostoa ei löytynyt)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "yritettiin valita media \"%s\" jota ei ole olemassa"
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "valitaan useampi media: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "poistetaan media \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "uudelleenasetetaan urpmi medialle \"%s\""
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...uudelleenasetus epäonnistui"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "uudelleenasetus tehty"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "mediaa \"%s\" ei ole valittu"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "tutkitaan hdlist-tiedostoa [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "tutkitaan synthesis-tiedostoa [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "rakennetaan hdlist-tiedostoa [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -973,78 +1068,78 @@ msgstr ""
"Synthesis tiedoston luonti medialle \"%s\" ei onnistu. Hdlist tiedostosi voi "
"olla virheellinen."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "ongelmia luettaessa hdlist- tai synthesis-tiedostoa medialta \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "kirjoitetaan median \"%s\" list-tiedostoa"
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...kopiointi epäonnistui"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopioidaan \"%s\" kuvaustiedostoa..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...kopiointi valmis"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, 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:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr ""
"lasketaan md5sum lähteestä kopioidulle hdlist- tai synthesis-tiedostolle"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "[%s] kopiointi epäonnistui (md5sum ei täsmää)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "lasketaan md5sum haetulle lähde-hdlist- tai -synthesis-tiedostolle"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...nouto epäonnistui: md5sum ei täsmää"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "rpm-tiedostoja ei löytynyt kohteesta [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "luetaan rpm-tiedostoja kohteesta [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "rpm-tiedostoja ei voitu lukea medialta [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "ei luettuja rpm"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1054,74 +1149,74 @@ msgstr ""
"mediaa \"%s\" ei voitu käyttää,\n"
"tämä voi johtua siitä että liitit hakemiston manuaalisesti kun loit median."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "hdlist-tiedostoa ei löytynyt medialta \"%s\""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "haetaan lähteen hdlist (tai synthesis) kohteesta \"%s\""
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "löydettiin hdlist- tai synthesis-tiedosto nimellä %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "hdlist-tiedostoa ei löytynyt medialta \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "tarkistetaan median \"%s\" pubkey-tiedostoa..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...tuotu avain %s median \"%s\" pubkey-tiedostosta"
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "median \"%s\" pubkey-tiedostoa ei voitu tuoda"
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "kirjoitetaan median \"%s\" list-tiedostoa"
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "media %s lisätty"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "hdlist-tiedostoa \"%s\" ei voitu tulkata"
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "ongelmia luettaessa median \"%s\" synthesis-tiedostoa"
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "luetaan otsikkotietoja medialta \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "EeNn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "KkYy"
@@ -1182,47 +1277,52 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "mediaa \"%s\" ei voitu käyttää"
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Ei pakettia nimeltä %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Seuraavat paketit sisältävät %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "puuttuvan %s takia"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Kaikki on jo asennettu"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "täyttämättömän %s takia"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "yritetään pakottaa %s valinta"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "%s säilyttämiseksi"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "%s asentamiseksi"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "johtuen ristiriidasta %s kanssa"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "ei pyydetty"
@@ -1242,6 +1342,16 @@ msgstr "Virheellinen avain-ID (%s)"
msgid "Missing signature (%s)"
msgstr "Allekirjoitus puuttuu (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "tiedostoon [%s] ei voitu kirjoittaa"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Kopiointi epäonnistui"
+
#: ../urpme:40
#, fuzzy, c-format
msgid ""
@@ -1258,8 +1368,8 @@ msgstr ""
"\n"
"käyttö:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1274,19 +1384,19 @@ msgstr " --auto - valitse automaattisesti paketit tarvittaessa\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - varmista että poisto voidaan hoitaa oikein\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr ""
" --force - pakottaa asennuksen vaikka joitakin paketteja puuttuu\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - urpmi-toiminnot useille alias-koneille\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - tulosta merkintä paketoija: paketoija\n"
@@ -1296,8 +1406,8 @@ msgstr " --packager - tulosta merkintä paketoija: paketoija\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - käytä määriteltyä juurta rpm-poistolle\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - käytä määriteltyä juurta rpm-asennukselle\n"
@@ -1317,17 +1427,17 @@ msgstr ""
"hyödyllinen\n"
" asennettaessa chroot käyttäen --root optiota\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - yritä etsiä ja käyttää synthesis-tiedostoa\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - yritä löytää ja käyttää hdlist-tiedostoa\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - yksityiskohtainen tyyli\n"
@@ -1337,37 +1447,37 @@ msgstr " --verbose, -v - yksityiskohtainen tyyli\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - valitse kaikki lausekkeeseen täsmäävät\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Vain pääkäyttäjä saa poistaa paketteja"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "tuntemattomia paketteja"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "tuntematon paketti"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "paketin %s poisto rikkoisi järjestelmäsi"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Ei mitään poistettavissa"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Suoritetaan tarkistusta seuraavien pakettien poistamiseksi"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1377,24 +1487,24 @@ msgstr[0] ""
msgstr[1] ""
"Riippuvuuksien täyttämiseksi seuraavat %d paketit poistetaan (%d Mt)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr " (%d Mt)"
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "poistetaan paketti %s"
msgstr[1] "poistetaan paketti %s"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (k/E) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Poisto epäonnistui"
@@ -1420,13 +1530,13 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --help - tulosta tämä viesti\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - käytä määrättyä ympäristöä (yleensä virheraportti)\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1438,14 +1548,14 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../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"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1460,7 +1570,7 @@ msgstr ""
" --synthesis - käytä annettua synthesis-tiedostoa urpmi-tietokannan "
"sijasta\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1472,7 +1582,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - älä tulosta identtisiä rivejä\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - käytä ainoastaan päivitysmediaa\n"
@@ -1608,79 +1718,90 @@ msgstr " --group - tulosta merkintä ryhmä: ryhmä\n"
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr " --name - tulosta vain pakettien nimet\n"
#: ../urpmf:73
#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr " --name - tulosta vain pakettien nimet\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr ""
" --obsoletes - tulosta merkintä vanhentaa: kaikki vanhentaa-tiedot\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr " --packager - tulosta merkintä paketoija: paketoija\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, fuzzy, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - tulosta merkintä tarjoaa: kaikki tarjoaa-tiedot\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, fuzzy, c-format
msgid " --requires - requires tags\n"
msgstr ""
" --requires - tulosta merkintä tarvitsee: kaikki tarvitsee-tiedot\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --size - tulosta merkintä koko: koko\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, fuzzy, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - tulosta merkintä lähdekoodi-rpm: lähdekoodi-rpm\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr ""
+" --obsoletes - tulosta merkintä vanhentaa: kaikki vanhentaa-tiedot\n"
+
+#: ../urpmf:81
#, fuzzy, c-format
msgid " --summary - summary\n"
msgstr " --summary, -S - tulosta yhteenveto.\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr " --url - tulosta merkintä url: url\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr " --verbose - yksityiskohtainen tyyli\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -l - listaa paketissa olevat tiedostot\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - tulosta versio, julkaisu ja arkkitehtuuri nimen "
"lisäksi\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "käytetään määrättyä ympäristöä kohteelle %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1689,12 +1810,12 @@ msgstr ""
"Huomio: koska yksikään etsitty media ei käytä hdlist-tiedostoja, urpmf ei "
"voinut palauttaa yhtään tulosta.\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Saatat haluta käyttää --name etsiäksesi pakettien nimistä.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, fuzzy, c-format
msgid ""
"urpmi version %s\n"
@@ -1710,7 +1831,7 @@ msgstr ""
"\n"
"käyttö:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1718,35 +1839,35 @@ msgstr ""
" --searchmedia - käytä ainoastaan annettuja medioita pydetyn (tai "
"päivitetyn) paketin hakemiseen.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr " --auto-select - valitse automaattisesti päivitettävät paketit\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr " --auto-select - valitse automaattisesti päivitettävät paketit\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - poista tiedostojen MD5SUM-tarkistus käytöstä\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - pakota gpg-avaimen päivitys\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1754,12 +1875,12 @@ msgid ""
msgstr ""
" --no-uninstall - älä koskaan kysy paketin poistosta, keskeytä asennus\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - älä asenna paketteja (lataa ainoastaan)\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1768,7 +1889,7 @@ msgstr ""
" --keep - jätä olemassa olevat paketit jos mahdollista, hylkää\n"
" paketit joiden asennus poistaisi muita\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1780,41 +1901,47 @@ msgstr ""
" pakettimäärä aiotaan asentaa tai päivittää,\n"
" oletus on %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - pienen tapahtuman pituus, oletus on %d\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, fuzzy, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy - käytä epätarkkaa hakua (sama kuin -y)\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, fuzzy, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr ""
" --src - seuraava paketti on lähdekoodi-paketti (sama kuin -s)\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
" --install-src - asenna ainoastaan lähdekoodipaketit (ei binääreja)\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr ""
" --clean - poista rpm-paketti välimuistista ennen muita "
"tapahtumia\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - älä poista rpm-paketteja välimuistista\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1823,7 +1950,7 @@ msgstr ""
" --allow-nodeps - salli pakettien asennus ilman riippuvuuksien "
"tarkistusta\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1832,12 +1959,12 @@ msgstr ""
" --allow-force - salli pakettien asennus ilman riippuvuuksien ja\n"
" eheyden tarkistusta\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - käytä määriteltyä juurta rpm-asennukselle\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1847,47 +1974,47 @@ msgstr ""
"hyödyllinen\n"
" asennettaessa chroot käyttäen --root optiota\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - käytä wget:a etätiedostojen noutoon\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - käytä curl:a etätiedostojen noutoon\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, fuzzy, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --curl - käytä curl:a etätiedostojen noutoon\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - rajoita latausnopeutta\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1896,7 +2023,7 @@ msgstr ""
" --resume - jatka osittain noudettujen tiedostojen noutamista\n"
" (--no-resume poistaa käytöstä, vakiona ei käytössä)\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1906,7 +2033,7 @@ msgstr ""
"on\n"
" 1080 (muodossa <välityspalvelin [:portti]>)\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1915,7 +2042,7 @@ msgstr ""
" --proxy-user - määrittele välityspalvelimen todentamisessa käytettävä\n"
" käyttäjä ja salasana (muodossa <käyttäjä:salasana>)\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1924,7 +2051,7 @@ msgstr ""
" --bug - kirjoittaa virheraportin hakemistoon joka määritellään\n"
" seuraavassa argumentissa\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, fuzzy, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1933,47 +2060,52 @@ msgstr ""
" --verify-rpm - varmista rpm-allekirjoitus ennen asennusta\n"
" (--no-verify-rpm poistaa käytöstä, vakiona käytössä)\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, fuzzy, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr " --test - varmista että asennus voidaan hoitaa oikein\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr ""
" --excludepath - jätä asentamatta seuraaviin hakemistoihin\n"
" (hakemistot pilkuilla erotettuna)\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - jätä dokumentaatio pois\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, fuzzy, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --no-uninstall - älä koskaan kysy paketin poistosta, keskeytä asennus\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --url - tulosta merkintä url: url\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - tulosta merkintä kuvaus: kuvaus\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - paketit joiden asennus pitäisi ohittaa\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - paketit joiden asennus pitäisi ohittaa\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1983,63 +2115,63 @@ msgstr ""
"valintoja\n"
" kuin vain oletus\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - älä poista rpm-paketteja välimuistista\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, 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:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - valitse kaikki komentoriviin täsmäävät\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - salli etsiminen tarjoaa-tiedoista paketin löytämiseksi\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - älä etsi tarjoaa-tiedoista paketin löytämiseksi\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - hiljainen tyyli\n"
-#: ../urpmi:157
+#: ../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:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
"Mitä voidaan tehdä binaari rpm -tiedostolle kun käytetään --install-src"
-#: ../urpmi:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2048,7 +2180,7 @@ msgstr ""
"Hakemisto [%s] on jo olemassa. Ole hyvä ja valitse toinen hakemisto "
"virheraportille tai poista se."
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Hakemiston [%s] luominen virheraportille ei onnistu"
@@ -2058,7 +2190,7 @@ msgstr "Hakemiston [%s] luominen virheraportille ei onnistu"
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2067,46 +2199,48 @@ msgstr ""
"Virhe: %s näyttää olevean liitettynä ainoastan lukuoikeuksilla.\n"
"Käytä --allow-force pakottaaksesi toiminnon."
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (päivitettävä)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (päivitettävä)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (asennettava)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (asennettava)"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "Riippuvuuksien täyttämiseksi seuraavat %d paketit poistetaan (%d Mt)"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Mikä on valintasi? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2117,7 +2251,7 @@ msgstr ""
"joita ovat vanhempia kuin nykyhetkellä asennetut paketit:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2128,19 +2262,19 @@ msgstr ""
"joita ovat vanhempia kuin nykyhetkellä asennetut paketit:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Jatka joka tapauksessa?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (K/e) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2149,7 +2283,7 @@ msgstr ""
"Joitakin haluttuja paketteja ei voida asentaa:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2158,7 +2292,7 @@ msgstr ""
"Joitakin haluttuja paketteja ei voida asentaa:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2169,7 +2303,7 @@ msgstr ""
"jotta toiset voidaan päivittää:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2180,7 +2314,7 @@ msgstr ""
"jotta toiset voidaan päivittää:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2189,7 +2323,7 @@ msgstr ""
"Seuraavat paketit on poistettava jotta toiset voidaan päivittää:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2198,12 +2332,17 @@ msgstr ""
"Seuraavat paketit on poistettava jotta toiset voidaan päivittää:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2212,111 +2351,29 @@ msgstr ""
"Sinun pitää olla pääkäyttäjänä asentaaksesi seuraavat riippuvuudet:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, 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:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Paina Enter kun olet valmis..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Peruuta"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "Seuraavissa paketeissa on virheelliset allekirjoitukset"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Seuraavissa paketeissa on virheelliset allekirjoitukset"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Haluatko jatkaa asennusta?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Asennus epäonnistui"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "levitetään %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "asennetaan %s kohteesta %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "asennetaan %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Yritetään asentaa ilman riippuvuuksia? (k/E) "
-
-#: ../urpmi:776
-#, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Yritetään asentaa pakolla (--force)? (k/E) "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d asennustoimintoa epäonnistui"
-msgstr[1] "%d asennustoimintoa epäonnistui"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Asennus on mahdollinen"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Kaikki on jo asennettu"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Kaikki on jo asennettu"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "Kaikki on jo asennettu"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "Kaikki on jo asennettu"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "uudelleenkäynnistetään urpmi"
@@ -2444,51 +2501,51 @@ msgstr " -v - yksityiskohtainen tyyli\n"
msgid "unable to update medium \"%s\"\n"
msgstr "mediaa \"%s\" ei voida päivittää\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Vain pääkäyttäjä saa asentaa paketteja"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "Luodaan asetustiedosto [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "Asetustiedosto [%s] ei voida luoda."
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr ""
"kohtaa <hdlist-tiedoston suhteellinen polku> ei tarvita --distrib -"
"parametrin kanssa"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<hdlist-tiedoston suhteellinen polku> puuttuu\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "mediaa \"%s\" ei voida luoda\n"
@@ -2650,17 +2707,17 @@ msgstr " -a - valitse kaikki mediat\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - täsmää epätarkasti medioiden nimiin\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Vain pääkäyttäjä saa poistaa median"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "ei mitään poistettavaa (käytä urpmi.addmedia lisätäksesi median)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2714,17 +2771,17 @@ msgstr " -a - valitse kaikki ei-siirrettävät mediat\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - pakota hdlist-tiedostojen luominen\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Vain pääkäyttäjä saa päivittää mediat"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "ei mitään päivitettävää (käytä urpmi.addmedia lisätäksesi median)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2733,22 +2790,22 @@ msgstr ""
"Päivitettävä kohta puuttuu\n"
"(jokin seuraavista: %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "Hylätään media %s"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "otetaan käyttöön media %s"
-#: ../urpmq:43
+#: ../urpmq:40
#, fuzzy, c-format
msgid ""
"urpmq version %s\n"
@@ -2764,7 +2821,7 @@ msgstr ""
"\n"
"käyttö:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2773,52 +2830,52 @@ msgstr ""
" --searchmedia - käytä ainoastaan annettuja medioita pydetyn (tai "
"päivitetyn) paketin hakemiseen.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - käytä epätarkkaa hakua (sama kuin -y)\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - listaa käytettävissä olevat paketit\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - listaa käytettävissä olevat mediat\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr ""
" --list-url - listaa käytettävissä olevat mediat ja niiden polut\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
" --list-nodes - listaa käytettävissä olevat noodit --parallel kanssa\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - listaa käytettävissä olevat rinnakkais-aliakset\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
" --dump-config - tulosta asetukset urpmi.addmedia parametrien muodossa\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr ""
" --src - seuraava paketti on lähdekoodi-paketti (sama kuin -s)\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
@@ -2826,12 +2883,12 @@ msgstr ""
" --sources - listaa kaikki lähdekoodipaketit ennen noutamista\n"
" (ainoastaan pääkäyttäjänä)\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --url - tulosta merkintä url: url\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2840,23 +2897,23 @@ msgstr ""
" --use-distrib - aseta urpmi automaattisesti jakelun puusta.\n"
" Tämä sallii etsimisen jakelusta.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - tulosta muutosloki\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - tulosta yhteenveto.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr ""
" --whatrequires - käänteinen etsiminen vaatii-tiedoista paketeissa\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2866,7 +2923,7 @@ msgstr ""
" - laajenna käänteinen etsiminen (sisällytä "
"virituaalipaketit)\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
@@ -2875,52 +2932,52 @@ msgstr ""
" -p - sallii etsimisen tarjoaa-tiedoista paketin "
"löytämiseksi\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - täydellinen tuloste poistettavasta paketista\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr ""
" -d - laajenna haku sisältämään pakettien riippuvuudet\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - tulosta ryhmät nimen lisäksi\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - tulosta hyödyllistä tietoa ihmisen luettavassa "
"muodossa\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - listaa paketissa olevat tiedostot\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - hiljainen tyyli\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - tulosta versio ja julkaisu nimen lisäksi\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - seuraava paketti on lähdekoodi-paketti (sama kuin --"
"src)\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2928,44 +2985,44 @@ msgid ""
msgstr ""
" -u - poista paketti jos uudempi versio on jo asennettu\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - käytä epätarkkaa hakua (sama kuin --fuzzy)\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -Y - kuten -y mutta ei käytä kirjainkokoriippuvuutta\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " komentorivillä syötetyt nimet tai rpm-tiedostot etsitään.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes voi ainoastaan käyttää --parallel kanssa"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"Huomio: koska yksikään etsitty media ei käytä hdlist-tiedostoja, urpmf ei "
"voinut palauttaa yhtään tulosta.\n"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2973,11 +3030,22 @@ msgstr ""
"Huomio: koska yksikään etsitty media ei käytä hdlist-tiedostoja, urpmf ei "
"voinut palauttaa yhtään tulosta.\n"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "muutoslokia ei löytynyt\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Seuraavissa paketeissa on virheelliset allekirjoitukset:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Haluatko jatkaa asennusta?"
+
#, fuzzy
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Tarvitset pääkäyttäjän oikeudet tämän komennon käyttämiseen ! \n"
@@ -3330,9 +3398,6 @@ msgstr "muutoslokia ei löytynyt\n"
#~ "hylkää\n"
#~ " paketit joiden asennus poistaisi muita\n"
-#~ msgid "unable to write file [%s]"
-#~ msgstr "tiedostoon [%s] ei voitu kirjoittaa"
-
#~ msgid ""
#~ " --distrib-XXX - automatically create a medium for XXX part of a\n"
#~ " distribution, XXX may be main, contrib, updates or\n"
diff --git a/po/fr.po b/po/fr.po
index 517ef3d6..06627dde 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2007-08-19 23:24+0200\n"
"Last-Translator: Christophe Berthelé <cpjc@free.fr>\n"
"Language-Team: Français <cooker-i18n@mandrivalinux.org>\n"
@@ -34,7 +34,7 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2;plural=(n>1);\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "Installation du RPM"
@@ -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:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -113,7 +113,7 @@ msgstr "_Installer"
msgid "_Save"
msgstr "_Sauver"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Annuler"
@@ -133,17 +133,17 @@ msgstr "Option « %s » inconnue"
msgid "No packages specified"
msgstr "Pas de paquetage spécifié"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Veuillez patienter ..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "Vous devez être administrateur"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -154,42 +154,42 @@ msgstr ""
"%s\n"
"Continuer quand même l'installation ?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Attention"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (à mettre à jour)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (à installer)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "Choix d'un paquetage"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Un des paquetages suivants est nécessaire :"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Abandonner"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -201,61 +201,63 @@ msgstr ""
"%s\n"
"Continuer quand même l'installation ?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, 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:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, 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:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, 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:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Installation du paquetage ..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "impossible de récupérer les paquetages de sources, abandon"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Préparation ..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Installation du paquetage « %s » (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Veuillez insérer le média nommé « %s » dans le périphérique [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Téléchargement du paquetage %s ..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Les paquetages suivants ont une signature erronée :\n"
-"%s\n"
-"\n"
-"Voulez-vous continuer l'installation ?"
+msgid "_Done"
+msgstr "_Fini"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -266,41 +268,27 @@ msgstr ""
"%s\n"
"Vous devriez mettre à jour votre base de données urpmi."
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "désinstallation de %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Préparation ..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Installation du paquetage « %s » (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Fini"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, c-format
msgid "Installation failed:"
msgstr "L'installation a échoué :"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Tous les paquetages sont déjà installés"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "L'installation est terminée"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "désinstallation de %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -337,7 +325,7 @@ msgstr " -f - afficher le nom complet du paquetage (NVRA)\n"
msgid " defaults to %s.\n"
msgstr " valeur par défaut %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Seul l'administrateur système (root) peut installer des paquetages"
@@ -347,100 +335,100 @@ 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:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "impossible d'ouvrir la base de donnée rpm"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
"il y a %d entêtes de paquetages dans le cache, suppression de %d entêtes "
"obsolètes"
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "le nom du fichier rpm est invalide [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "récupération des fichiers rpm [%s]..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "... récupération effectuée"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "... échec de la récupération : %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "impossible d'accéder au fichier rpm [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "impossible d'analyser le fichier spec %s [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "impossible de référencer le fichier rpm"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Architecture incompatible pour le paquetage [%s]"
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "erreur lors de l'inscription des paquetages locaux"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Cette opération est interdite en mode restreint"
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, 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:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr "le répertoire chroot n'existe pas"
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq : impossible de lire le fichier rpm « %s »\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
+#, c-format
+msgid "chroot directory doesn't exist"
+msgstr "le répertoire chroot n'existe pas"
+
+#: ../urpm/args.pm:424
#, c-format
msgid "Can't use %s without %s"
msgstr "Impossible d'utiliser %s sans %s"
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
#, c-format
msgid "Can't use %s with %s"
msgstr "Impossible d'utiliser %s avec %s"
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr "Trop d'arguments\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "fichier de synthèse créé pour le média « %s »"
@@ -630,7 +618,12 @@ msgstr "paquetage %s non trouvé."
msgid "malformed URL: [%s]"
msgstr "URL incorrecte : [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "récupération des fichiers rpm à partir de « %s »..."
@@ -640,7 +633,7 @@ msgstr "récupération des fichiers rpm à partir de « %s »..."
msgid "[repackaging]"
msgstr "[regénération]"
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -648,37 +641,42 @@ msgstr ""
"transaction créée pour l'installation sur %s (remove=%d, install=%d, upgrade="
"%d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "impossible de créer la transaction"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, 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:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "ajout du paquetage %s (id=%d, eid=%d, update=%d, file=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "impossible d'installer le paquetage %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "désinstallation du paquetage %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "désinstallation du paquetage %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "suppression des paquetages installés (%s) de %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Plus d'information sur le paquetage %s"
@@ -708,11 +706,103 @@ msgstr "Pas de base spécifiée"
msgid "Cannot connect to ldap uri:"
msgstr "Impossible de se connecter à l'uri ldap :"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "base de donnée %s verrouillée"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Attention"
+
+#: ../urpm/lock.pm:65
#, c-format
msgid "%s database locked"
msgstr "base de donnée %s verrouillée"
+#: ../urpm/main_loop.pm:99
+#, c-format
+msgid "The following package has bad signature"
+msgstr "Le paquetage suivant a une signature invalide"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Les paquetages suivants ont des signatures non valides"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Voulez-vous continuer l'installation ?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "L'installation a échoué"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "distribution de %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "installation de %s depuis %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "installation de %s"
+
+#: ../urpm/main_loop.pm:187
+#, 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:205
+#, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "Essayer de forcer l'installation (--force) ? (o/N) "
+
+#: ../urpm/main_loop.pm:247
+#, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d transaction d'installation a échoué"
+msgstr[1] "%d transactions d'installation ont échoué"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "L'installation est possible"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr "Les paquetages sont à jour"
+
+#: ../urpm/main_loop.pm:271
+#, c-format
+msgid "Package %s is already installed"
+msgstr "Le paquetage %s est déjà installé"
+
+#: ../urpm/main_loop.pm:272
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Les paquetages %s sont déjà installés"
+
+#: ../urpm/main_loop.pm:275
+#, c-format
+msgid "Package %s can not be installed"
+msgstr "Le paquetage %s ne peut être installé"
+
+#: ../urpm/main_loop.pm:276
+#, c-format
+msgid "Packages %s can not be installed"
+msgstr "Les paquetages %s ne peuvent être installés"
+
#: ../urpm/md5sum.pm:23
#, c-format
msgid "examining %s file"
@@ -762,7 +852,7 @@ msgstr "\"synthesis\" ne devrait pas être défini (média « %s »)"
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "\"synthesis\" devrait être défini (média « %s »)"
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "impossible d'accéder au fichier hdlist de « %s », média ignoré"
@@ -855,7 +945,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Recherche début : %s fin : %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "seconde exécution pour calculer les dépendances\n"
@@ -922,69 +1012,74 @@ msgstr ""
"impossible d'accéder au média de distribution (pas de fichier media.cfg "
"trouvé)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "essai de sélection du média inexistant « %s »"
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "sélection de plusieurs médias : %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "enlever le média « %s »"
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "reconfiguration de urpmi pour le média « %s »..."
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "... la reconfiguration a échoué"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "reconfiguration effectuée"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Erreur de génération de nom de fichiers : dépendance %d non trouvée"
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
"Erreur de génération de nom de fichiers : impossible d'écrire dans le "
"fichier (%s)"
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "le média « %s » est à jour"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "examen du fichier hdlist [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "examen de la liste de synthèse [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "création du fichier hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -993,81 +1088,81 @@ msgstr ""
"Impossible de créer le fichier de synthèse pour le média « %s ». Votre "
"fichier hdlist est peut-être corrompu."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problème de lecture du fichier hdlist ou de synthèse du média « %s »"
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "copie en cours [%s] pour le média « %s »..."
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "... copie impossible"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "copie du fichier description de « %s »..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "... copie effectuée"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, 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:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr ""
"calcul de la somme de contrôle MD5 du fichier hdlist copié (ou de synthèse)"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "la copie de [%s] a échoué (sommes de contrôle MD5 différentes)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr ""
"calcul de la somme de contrôle MD5 du fichier hdlist (ou de synthèse) "
"téléchargé"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr ""
"... échec de la récupération : la somme de contrôle MD5 ne correspond pas"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "pas de fichier rpm trouvé pour [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "lecture des fichiers rpm à partir de [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "impossible de lire les fichiers rpm à partir de [%s] : %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "aucun rpms lu"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1078,74 +1173,74 @@ msgstr ""
"cela peut arriver si vous avez effectué un montage manuel lors de la "
"création du média."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "fichier hdlist %s invalide pour le média « %s »"
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "récupération du hdlist source (ou de synthèse) de « %s »..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "hdlist source (ou de synthèse) potentiel trouvé en tant que %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "pas de fichier hdlist trouvé pour le média « %s »"
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "examen du fichier de la clé publique de « %s »..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, 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:1553
+#: ../urpm/media.pm:1560
#, 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:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "écriture de la liste des fichiers pour le média « %s »"
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, c-format
msgid "updated medium \"%s\""
msgstr "média « %s » mis à jour"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "impossible d'analyser le fichier hdlist de « %s »"
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, 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:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "lecture des en-têtes du média « %s »"
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "OoYy"
@@ -1205,47 +1300,52 @@ msgstr "média incohérent « %s », marqué amovible mais sans l'être réell
msgid "unable to access medium \"%s\""
msgstr "impossible d'accéder au média « %s »"
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Pas de paquetage nommé %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Les paquetages suivants contiennent %s : %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "en raison du manque de %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Le paquetage %s est déjà installé"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "car %s est non satisfait"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "Tentative de promouvoir %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "afin de garder %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "pour installer le paquetage %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "en raison de conflit avec %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "non demandé"
@@ -1265,6 +1365,16 @@ msgstr "Identifiant de clef incorrect (%s)"
msgid "Missing signature (%s)"
msgstr "Signature absente (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Ne peut créer le fichier de configuration [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "La copie a échoué"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1282,8 +1392,8 @@ msgstr ""
"\n"
"usage : \n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1302,7 +1412,7 @@ msgstr ""
" --test - vérifier si la désinstallation peut être achevée "
"correctement.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
@@ -1311,13 +1421,13 @@ msgstr ""
"n'existent\n"
" pas.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
" --parallel - urpmi distribué sur plusieurs machines de l'alias.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Réempaqueter les fichiers avant effacement\n"
@@ -1329,8 +1439,8 @@ msgstr ""
" --root - utiliser un autre répertoire racine pour la "
"désinstallation.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
@@ -1352,17 +1462,17 @@ msgstr ""
" distribution, utile pour (dés)installer un chroot avec\n"
" l'option --root.\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - utiliser un fichier de synthèse.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - utiliser un fichier hdlist.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - mode verbeux.\n"
@@ -1374,37 +1484,37 @@ msgstr ""
" -a - sélectionner tous les paquetages correspondants à\n"
" l'expression.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Seul l'administrateur système (root) peut enlever des paquetages"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "paquetages inconnus"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "paquetage inconnu"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "La désinstallation du paquetage %s rendra votre système instable"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Rien à désinstaller"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Vérification pour la désinstallation des paquetages suivants"
-#: ../urpme:134
+#: ../urpme:131
#, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1415,24 +1525,24 @@ msgstr[1] ""
"Pour satisfaire les dépendances, les %d paquetages suivants vont être "
"désinstallés"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr " (%d Mo)"
-#: ../urpme:138
+#: ../urpme:135
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "Supprimer %d paquetage ?"
msgstr[1] "Supprimer %d paquetages ?"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (o/N) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Échec de la désinstallation"
@@ -1459,14 +1569,14 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - afficher la version de cet utilitaire\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - utiliser un environment spécifique (en général\n"
" un rapport d'anomalie).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1483,14 +1593,14 @@ msgstr ""
# Les espaces supplémentaires sur la seconde ligne
# sont volontaires
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../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"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1503,7 +1613,7 @@ msgstr ""
msgid " --use-distrib - use the given path to access media\n"
msgstr " --use-distrib - utiliser le chemin spécifié pour accéder au média\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1515,7 +1625,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - ne pas afficher les lignes identiques.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - n'utiliser que les médias de mise à jour.\n"
@@ -1650,80 +1760,90 @@ msgid " --group - group\n"
msgstr " --group - chercher dans le champ « Group »\n"
#: ../urpmf:72
+#, fuzzy, c-format
+msgid " --license - license\n"
+msgstr " --name - chercher dans le nom du paquetage\n"
+
+#: ../urpmf:73
#, c-format
msgid " --name - package name\n"
msgstr " --name - chercher dans le nom du paquetage\n"
-#: ../urpmf:73
+#: ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - chercher dans le champ « obsoletes »\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr " --packager - chercher dans le nom du créateur du paquetage\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - chercher dans le champ « provides »\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - chercher dans la liste des dépendances\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, c-format
msgid " --size - installed size\n"
msgstr " --size - chercher dans le champ taille après installation\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - chercher dans le nom du paquetage source\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - chercher dans le champ « obsoletes »\n"
+
+#: ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr " --summary - chercher dans le résumé\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, c-format
msgid " --url - url\n"
msgstr " --url - chercher dans le champ « Url »\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, c-format
msgid " --vendor - vendor\n"
msgstr " --vendor - chercher dans le nom du fournisseur\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, c-format
msgid " -m - the media in which the package was found\n"
msgstr ""
" -m - chercher dans le média où le paquetage a été trouvé\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - afficher la version, la release et l'architecture\n"
" du paquetage avec le nom.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
"Format incorrect : vous ne pouvez utiliser qu'une seule option multi-valeur"
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "avec environnement spécifique sur %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1732,12 +1852,12 @@ msgstr ""
"Note : comme aucun des médias spécifiés n'utilise de hdlist, urpmf n'a pu "
"retourner de résultat\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Vous pouvez utiliser --name pour rechercher le nom d'un paquetage.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1754,7 +1874,7 @@ msgstr ""
"\n"
"usage :\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1762,7 +1882,7 @@ msgstr ""
" --searchmedia - utiliser seulement le média spécifié pour rechercher\n"
" (ou mettre à jour) les paquetages\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
@@ -1771,31 +1891,31 @@ msgstr ""
" --auto - mode non intéractif, utilisation des paramètres par "
"défaut.\n"
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr ""
" --auto-select - sélection automatique des paquetages à mettre à jour.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
" --auto-update - rafraîchir les média lors de la mise à jour du système.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr ""
" --no-md5sum - ne pas effectuer la vérification du fichier MD5SUM.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - force la mise à jour de la clef gpg.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1804,14 +1924,14 @@ msgstr ""
" --no-uninstall - ne jamais demander de désinstallation, plutôt annuler\n"
" l'installation.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr ""
" --no-install - ne pas installer les paquetages (les télécharger "
"seulement)\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1822,7 +1942,7 @@ msgstr ""
" paquetages demandés qui nécessitent des "
"désinstallations.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1834,40 +1954,46 @@ msgstr ""
" de paquetages doivent être installés ou mis à jour.\n"
" (%d par défaut).\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - longueur minimale de transaction (%d par défaut).\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy, -y - imposer la recherche floue.\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src, -s - le prochain paquetage est un paquetage de sources\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
" --install-src - n'installer que les paquetages de sources (pas les\n"
" binaires).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr ""
" --clean - enlever tous les rpm du cache avant toute opération.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - ne supprime aucun paquetage du cache.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1876,7 +2002,7 @@ msgstr ""
" --allow-nodeps - autoriser l'installation des paquetages sans\n"
" vérifier les dépendances.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1885,13 +2011,13 @@ msgstr ""
" --allow-force - autoriser l'installation des paquetages sans vérifier\n"
" ni les dépendances ni l'intégrité.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr ""
" --root - utiliser un autre répertoire racine pour l'installation.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1901,50 +2027,50 @@ msgstr ""
" distribution; utile pour (dés)installer un chroot avec\n"
" l'option --root.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr ""
" --wget - utiliser wget pour récupérer les fichiers distants.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr ""
" --curl - utiliser curl pour récupérer les fichiers distants.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr ""
" --prozilla - utiliser prozilla pour récupérer les fichiers distants.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr " --curl-options - options supplémentaires à passer à curl\n"
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr " --rsync-options- options supplémentaires à passer à rsync\n"
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr " --wget-options - options supplémentaires à passer à wget\n"
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr " --prozilla-options - options supplémentaires à passer à prozilla\n"
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - limiter la vitesse de téléchargement.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1953,7 +2079,7 @@ msgstr ""
" --resume - reprendre le transfert des fichiers incomplets\n"
" (--no-resume le désactive, il est désactivé par défaut).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1963,7 +2089,7 @@ msgstr ""
" étant 1080 à défaut d'indication (format <proxy[:port]"
">).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1973,7 +2099,7 @@ msgstr ""
" l'authentification sur le proxy (<utilisateur:"
"motdepasse>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1982,7 +2108,7 @@ msgstr ""
" --bug - générer un rapport d'anomalie dans le répertoire\n"
" indiqué en second argument.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1991,7 +2117,7 @@ msgstr ""
" --verify-rpm - vérifier la signature du rpm avant l'installation.\n"
" (--no-verify-rpm le désactive, activé par défaut).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
@@ -2000,24 +2126,24 @@ msgstr ""
" --test - vérifier si l'installation peut se dérouler "
"correctement.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr ""
" --excludepath - exclure les chemins indiqués, séparés par des virgules.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - exclure les fichiers de documentation.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --ignoresize - ne pas vérifier la place disque avant installation.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr ""
@@ -2025,17 +2151,22 @@ msgstr ""
"d'autres\n"
" architectures.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - ne pas exécuter les scripts d'installation\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - paquetages dont l'installation doit être ignorée\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - paquetages dont l'installation doit être ignorée\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2045,57 +2176,57 @@ msgstr ""
"plus\n"
" de choix que par défaut.\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - ne pas verrouiller la base rpm.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, 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:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, 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:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - cherche dans les apports pour trouver le paquetage.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
" -P - ne pas chercher dans les apports pour trouver un "
"paquetage.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - mode silencieux.\n"
-#: ../urpmi:157
+#: ../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:186
+#: ../urpmi:184
#, 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:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2104,13 +2235,13 @@ 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:220
+#: ../urpmi:218
#, 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:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2119,7 +2250,7 @@ msgstr ""
"Le répertoire [%s] existe déjà, merci d'en utiliser un autre pour le rapport "
"d'anomalie, ou de l'effacer."
-#: ../urpmi:244
+#: ../urpmi:242
#, 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"
@@ -2129,7 +2260,7 @@ msgstr "Impossible de créer le répertoire [%s] pour le rapport d'anomalie"
msgid "Environment directory %s does not exist"
msgstr "Le répertoire d'environnement %s n'existe pas"
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2138,34 +2269,36 @@ msgstr ""
"Erreur : %s semble être monté en lecture seule.\n"
"Utilisez --allow-force afin de forcer l'opération."
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr "Mise à jour des médias...\n"
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s : %s (à mettre à jour)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (à mettre à jour)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, c-format
msgid "%s: %s (to install)"
msgstr "%s :%s (à installer)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, c-format
msgid "%s (to install)"
msgstr "%s (à installer)"
-#: ../urpmi:447
+#: ../urpmi:454
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2174,12 +2307,12 @@ msgstr ""
"Afin de satisfaire les dépendances de « %s », un des paquetages suivants est "
"nécessaire :"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Que choisissez-vous ? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2190,7 +2323,7 @@ msgstr ""
"de paquetage qui sont plus anciens que la version installée :\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2201,7 +2334,7 @@ msgstr ""
"de paquetages qui sont plus anciens que les versions installées :\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, c-format
msgid ""
"\n"
@@ -2210,12 +2343,12 @@ msgstr ""
"\n"
"Désirez-vous tout de même continuer ?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (O/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2224,7 +2357,7 @@ msgstr ""
"Le paquetage demandé ne peut pas être installé :\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2233,7 +2366,7 @@ msgstr ""
"Certains paquetages demandés ne peuvent pas être installés :\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2244,7 +2377,7 @@ msgstr ""
"doit être désinstallé :\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2255,7 +2388,7 @@ msgstr ""
"doivent être désinstallés :\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2265,7 +2398,7 @@ msgstr ""
"désinstallé :\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2275,12 +2408,17 @@ msgstr ""
"désinstallés :\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(test uniquement, la suppression ne sera pas effectuée)"
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2289,111 +2427,29 @@ msgstr ""
"Vous devez être root pour installer les dépendances suivantes :\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(test uniquement, l'installation ne sera pas effectuée)"
-#: ../urpmi:597
+#: ../urpmi:617
#, 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:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Appuyez sur la touche Entrée quand vous êtes prêt..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Annuler"
-#: ../urpmi:671
-#, c-format
-msgid "The following package has bad signature"
-msgstr "Le paquetage suivant a une signature invalide"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Les paquetages suivants ont des signatures non valides"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Voulez-vous continuer l'installation ?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "L'installation a échoué"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "distribution de %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "installation de %s depuis %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "installation de %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Essayer d'installer sans vérifier les dépendances ? (o/N) "
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Essayer de forcer l'installation (--force) ? (o/N) "
-
-#: ../urpmi:815
-#, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d transaction d'installation a échoué"
-msgstr[1] "%d transactions d'installation ont échoué"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "L'installation est possible"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr "Les paquetages sont à jour"
-
-#: ../urpmi:838
-#, c-format
-msgid "Package %s is already installed"
-msgstr "Le paquetage %s est déjà installé"
-
-#: ../urpmi:839
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Les paquetages %s sont déjà installés"
-
-#: ../urpmi:842
-#, c-format
-msgid "Package %s can not be installed"
-msgstr "Le paquetage %s ne peut être installé"
-
-#: ../urpmi:843
-#, c-format
-msgid "Packages %s can not be installed"
-msgstr "Les paquetages %s ne peuvent être installés"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "Redémarrage de urpmi"
@@ -2530,33 +2586,33 @@ msgstr " -v - mode verbeux.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "impossible de mettre à jour le média « %s »\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
"<url> incorrecte (pour un répertoire local, le chemin doit être absolu)"
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Seul l'administrateur système (root) peut ajouter un média"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, c-format
msgid "creating config file [%s]"
msgstr "création du fichier de configuration [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "Ne peut créer le fichier de configuration [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "inutile de spécifier le <chemin relatif de hdlist> avec --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
@@ -2565,17 +2621,17 @@ msgstr ""
"\n"
"Voulez-vous ajouter le média '%s'"
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<chemin relatif de hdlist> manquant\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr "Impossible d'utiliser %s avec un média distant"
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "impossible de créer le média « %s »\n"
@@ -2746,17 +2802,17 @@ msgstr " -a - sélectionner tous les médias\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - imposer la recherche floue sur les noms de média.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Seul l'administrateur système (root) peut enlever un média"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "rien à retirer (utiliser urpmi.addmedia pour ajouter un média)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2815,17 +2871,17 @@ msgid " -f - force updating synthesis/hdlist\n"
msgstr ""
" -f - forcer la mise à jour des fichiers hdlist/synthèse.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Seul l'administrateur système (root) peut mettre à jour un média"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "rien à mettre à jour (utiliser urpmi.addmedia pour ajouter un média)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2834,22 +2890,22 @@ msgstr ""
"l'entrée à mettre à jour est manquante\n"
"(un parmi %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "« %s »"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "média %s ignoré"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "activation du média %s"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2866,7 +2922,7 @@ msgstr ""
"\n"
"usage :\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2875,39 +2931,39 @@ msgstr ""
" --searchmedia - utiliser seulement le média spécifié pour rechercher\n"
" (ou mettre à jour) les paquetages\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - imposer la recherche floue (identique à -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - montrer tous les paquetages disponibles.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - montrer tous les médias disponibles.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - montrer tous les médias disponibles et leurs URL.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
" --list-nodes - montrer tous les noeuds disponibles en\n"
" utilisant --parallel.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - lister les alias parallèles disponibles.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
@@ -2915,14 +2971,14 @@ msgstr ""
" --dump-config - afficher la configuration sous forme d'un argument\n"
" pour urpmi.addmedia.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr ""
" --src - le prochain paquetage est un paquetage de sources\n"
" (identique à -s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
@@ -2930,14 +2986,14 @@ msgstr ""
" --sources - donner tous les paquetages de sources avant de\n"
" télécharger (administrateur seulement).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr ""
" --ignorearch - autoriser la recherche de paquets pour d'autres\n"
" architectures.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2946,23 +3002,23 @@ msgstr ""
" --use-distrib - configure urpmi à la volée d'après l'arbre d'une\n"
" distribution, permettant d'interroger une distribution.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - afficher le changelog.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - afficher le résumé.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr ""
" --whatrequires - recherche inversée des items nécessitant ce paquetage.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2972,7 +3028,7 @@ msgstr ""
" - recherche inversée étendue (paquetages virtuels "
"compris).\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, c-format
msgid ""
" --whatprovides, -p\n"
@@ -2981,53 +3037,53 @@ msgstr ""
" --whatprovides, -p\n"
" - chercher dans les apports pour trouver le paquetage.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr ""
" -c - sortie sur la ligne de commande avec les\n"
" noms des paquetages à désinstaller.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - étendre la requête aux dépendances du paquetage.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - afficher les groupes ainsi que les noms.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - afficher les informations utiles de manière plus "
"lisible.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - lister les fichiers d'un paquetage.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, c-format
msgid " -m - equivalent to -du\n"
msgstr " -m - équivalent à -du.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - afficher la version détaillée ainsi que le nom.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - le prochain paquetage est un paquetage de sources\n"
" (identique à --src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -3037,50 +3093,50 @@ msgstr ""
"déjà\n"
" installée.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - imposer la recherche floue (identique à --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -Y - comme -y mais n'est pas sensible à la casse\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
" les noms ou fichiers rpm indiqués sur la ligne de commande sont "
"interrogés.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes peut seulement être utilisé avec --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
"pas de hdlist pour le média « %s », uniquement un résultat partiel pour le "
"paquetage %s"
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"pas de hdlist pour le média « %s », uniquement un résultat partiel pour les "
"paquetages %s"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
"pas de hdlist pour le média « %s », impossible de retourner un résultat pour "
"le paquetage %s"
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -3088,7 +3144,18 @@ msgstr ""
"pas de hdlist pour le média « %s », impossible de retourner un résultat pour "
"les paquetages %s"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Aucun Changelog trouvé\n"
+
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Les paquetages suivants ont une signature erronée :\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Voulez-vous continuer l'installation ?"
diff --git a/po/fur.po b/po/fur.po
index 780b237b..6858f780 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+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"
@@ -19,7 +19,7 @@ msgstr ""
"X-Generator: KBabel 1.3\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, fuzzy, c-format
msgid "RPM installation"
msgstr "Instalazion dal pachet..."
@@ -29,7 +29,7 @@ msgstr "Instalazion dal pachet..."
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -95,7 +95,7 @@ msgstr "Instale"
msgid "_Save"
msgstr "Salve"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Scancele"
@@ -117,17 +117,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Nissun comant specificât"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, fuzzy, c-format
msgid "Please wait..."
msgstr "Par plasè spiete."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr ""
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -137,42 +137,42 @@ msgstr ""
"Cualchidun dai pachets domandâts no puedin sedi instalât:\n"
"%s"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Avertence"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr ""
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, fuzzy, c-format
msgid " (to install)"
msgstr "Instalazion Automatiche"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Al covente un di chiscj pachets:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, fuzzy, c-format
msgid "_Abort"
msgstr "Informazions"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -182,62 +182,63 @@ msgstr ""
"I pachets listâts e an di sedi rimovûts par podê atualizâ altris:\n"
"%s"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, 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:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, 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:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Instalazion dal pachet..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "no rivi a recuperâ i pachets sorzint, o fermi"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "In preparazion..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instalazion dal pachet `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Par plasè insede le font clamade \"%s\" te periferiche [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "O stoi scjariant il pachet '%s'..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Chiscj pachets e an firmis no valevulis:\n"
-"\n"
-"%s\n"
-"\n"
-"Vuelistu continuâ le instalazion?"
+msgid "_Done"
+msgstr "Fat"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -248,41 +249,27 @@ msgstr ""
"%s\n"
"Tu podaressis ve voe di atualizâ il to database urpmi"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "rimozion di %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "In preparazion..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instalazion dal pachet `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, fuzzy, c-format
-msgid "_Done"
-msgstr "Fat"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Instalazion falade"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Al è dut dizà instalât"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Instalazion finide"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "rimozion di %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -318,7 +305,7 @@ msgstr " -g - stampe grops ancje cul non\n"
msgid " defaults to %s.\n"
msgstr " il valôr predefinît al è %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Dome il superutent al po instalâ pachets"
@@ -328,98 +315,98 @@ msgstr "Dome il superutent al po instalâ pachets"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "no rivi a vierzi il database rpm"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "non dal file rpm no valevul [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "o recuperi il file rpm [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...copie finide"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...copie falade: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "no rivi a acedi al file rpm [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "no rivi a analizâ \"%s\" tal file [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "no rivi a regjstrâ il file rpm"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "fal te regjistrazion dai pachets locâi"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "declarazion di proxy falade doprant le rie di comant\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: no rivi a lei il file rpm \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "o ai creât il file synthesis pe font \"%s\""
@@ -608,7 +595,12 @@ msgstr "il pachet %s no l'è stât cjatât."
msgid "malformed URL: [%s]"
msgstr "input malformât: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "o recuperi il file rpm de font \"%s\"..."
@@ -618,7 +610,7 @@ msgstr "o recuperi il file rpm de font \"%s\"..."
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -626,37 +618,42 @@ msgstr ""
"e je stade creade le transazion par instalâ su %s (rimôf=%d, instale=%d, "
"atualize=%d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "no rivi a creâ le transazion"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "no rivi a rimovi il pachet %s"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "zonte dal pachet %s (id=%d, eid=%d, atualizazion=%d, file=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "no rivi a instalâ il pachet %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "rimozion dal pachet %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "rimozion dal pachet %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "instalazion di %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, fuzzy, c-format
msgid "More information on package %s"
msgstr "Plui informazions sul pachet..."
@@ -686,11 +683,105 @@ msgstr "Nissun comant specificât"
msgid "Cannot connect to ldap uri:"
msgstr ""
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "database urpmi blocât"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Avertence"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "database urpmi blocât"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "Chiscj pachets e an firmis no valevulis"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Chiscj pachets e an firmis no valevulis"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Âstu voie di continuâ le instalazion?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Instalazion falade"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "distribuzion di %s"
+
+#: ../urpm/main_loop.pm:148
+#, fuzzy, c-format
+msgid "installing %s from %s"
+msgstr "instalazion di %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "instalazion di %s"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Provjo a instalâ cence controlâ les dipendencis? (s/N) "
+
+#: ../urpm/main_loop.pm:205
+#, 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:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d stramudis de instalazion faladis"
+msgstr[1] "%d stramudis de instalazion faladis"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Le instalazion e je pussibil"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "Al è dut dizà instalât"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Al è dut dizà instalât"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "Al è dut dizà instalât"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Al è dut dizà instalât"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -740,7 +831,7 @@ msgstr "o cîr di selezionâ une font che no esist \"%s\""
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "o ai creât il file synthesis pe font \"%s\""
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "no rivi a acedi al file hdlist di \"%s\", font ignorade"
@@ -831,7 +922,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr ""
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "o passi a le seconde fase par valutâ les dipindincis\n"
@@ -898,144 +989,149 @@ msgstr ""
"no rivi a acedi a le prime font di instalazion (no ai cjatât nissun file "
"hdlists)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "o cîr di selezionâ une font che no esist \"%s\""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "o stoi selezionant plui fonts: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "o rimôf le font \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "o recuperi il file rpm de font \"%s\"..."
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "Configurazion dal menu salvade"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "Configurazion Server"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "le font \"%s\" no je selezionade"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "o esamini il file hdlist [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "o esamini il file synthesis [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "creant hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "probleme leint il file hdlist/synthesis del font \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "o scrîf le liste pe font \"%s\""
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...copie falade"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "o copii il file di descrizion di \"%s\"..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...copie finide"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, 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:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "control md5sum dal file hdlist (o synthesis) copiât"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "copie di [%s] falade (md5sum no valevul)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "o calcoli md5sum dal file hdlist (o synthesis) scjariât"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...copie falade: md5sum no corispondent"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "nissun file rpm cjatât di [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "o stoi leint i file rpm di [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "no rivi a lei i file rpm di [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1046,74 +1142,74 @@ msgstr ""
"chest al po intravignî se tu âs montât manualmentri le cartele dilunc de "
"creazion de font."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "nissun file hdlist cjatât pe font \"%s\""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "o recuperi il file hdlist (o synthesis) di \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "o ai cjatât le hdlist (o synthesis) analizade sicu %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "nissun file hdlist cjatât pe font \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "o controli il file pubkey di \"%s\"..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, 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:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "no rivi a impuartâ il file pubkey di \"%s\""
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "o scrîf le liste pe font \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "font zontade %s"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "no rivi a analizâ il file hdllist di \"%s\""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "probleme leint il file synthesis o le font \"%s\""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "o stoi leint les intestaduris de font \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "SsYy"
@@ -1173,47 +1269,52 @@ msgstr "font \"%s\" no coerente segnade come rimovibil ma no tâl"
msgid "unable to access medium \"%s\""
msgstr "no rivi a acedi a le font \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Nissun pachet clamât %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "I pachets seguints e contegnin %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "cause cal mancje %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Al è dut dizà instalât"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "cause che %s no l'è sodisfat"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "ricercje dal miôr pachet %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "par tignî %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "par instalâ %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "cause di conflits cun %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "no domandât"
@@ -1233,6 +1334,16 @@ msgstr "Clâf ID (%s) no valevule"
msgid "Missing signature (%s)"
msgstr "Firme mancjant (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "no rivi a scrivi tal file di configurazion [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Copie falade"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1250,8 +1361,8 @@ msgstr ""
"\n"
"ûs:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1267,19 +1378,19 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - verifiche se le instalazion e po sedi fate coretementri.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr ""
" --force - sfuarçe le esecuzion ancje se cualchi pachet no l'esist.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - urpmi distribuît tra diferentis machinis.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - mostre le clâf packager: assembladôr dal pachet.\n"
@@ -1290,8 +1401,8 @@ msgid " --root - use another root for rpm removal.\n"
msgstr ""
" --root - dopre une altre cartele di root par instalâ i file rpm.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
@@ -1311,17 +1422,17 @@ 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:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - cîr e dopre il file synthesis.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - prove a cirî e doprâ un file hdlist.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - modalitât fetôse.\n"
@@ -1331,37 +1442,37 @@ msgstr " --verbose, -v - modalitât fetôse.\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - sielç ducj i pachets che cuadrin te espression.\n"
-#: ../urpme:76
+#: ../urpme:73
#, fuzzy, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Dome il superutent al po instalâ pachets"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "pachets no cognossûts"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "pachet no cognossût"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "rimovi il pachet %s al prejudicarâ il to sisteme"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Nuie di rimovi"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "O controli le rimozion dai pachets seguints"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1371,24 +1482,24 @@ msgstr[0] ""
msgstr[1] ""
"Par sodisfâ les dipendencis, e saran rimovûts chescj pachets (%d MB)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr " (%d MB)"
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "rimozion dal pachet %s"
msgstr[1] "rimozion dal pachet %s"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (s/N) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Rimozion falade"
@@ -1415,13 +1526,13 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --help - stampe chist mes di jutori.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - dopre un ambient specific (di solit un rapuart di bug).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1434,13 +1545,13 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../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"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1454,7 +1565,7 @@ msgid " --use-distrib - use the given path to access media\n"
msgstr ""
" --synthesis - dopre il file synthesis specificât invezit dal db urpmi\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1465,7 +1576,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - no sta a stampâ riis compagnis.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - dopre dome fonts di atualizazion.\n"
@@ -1606,79 +1717,91 @@ msgstr " --group - stampe il tag group: grop.\n"
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr " --all - stampe ducj i tag.\n"
#: ../urpmf:73
#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr " --all - stampe ducj i tag.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr ""
" --obsoletes - stampe il tag obsolete: dut chel fat deventâ vieli dal "
"pachet.\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr " --packager - mostre le clâf packager: assembladôr dal pachet.\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, fuzzy, c-format
msgid " --provides - provides tags\n"
msgstr ""
" --provides - stampe il tag provides: elements furnîts dal pachet.\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, fuzzy, c-format
msgid " --requires - requires tags\n"
msgstr ""
" --requires - stampe il tag requires: dutis les pretesis dal pachet.\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --size - stampe le tag size: dimension.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, fuzzy, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - stampe il tag sourcerpm: pachets rpm sorzint.\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr ""
+" --obsoletes - stampe il tag obsolete: dut chel fat deventâ vieli dal "
+"pachet.\n"
+
+#: ../urpmf:81
#, fuzzy, c-format
msgid " --summary - summary\n"
msgstr " --summary - stampe il tag summary: sumari dal pachet.\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr " --url - stampe il tag url: url.\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr " --verbose - modalitât fetôse.\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -l - liste i file presints int'un pachet.\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - stampe version, release e architeture cun non.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "o dopri les variabilis di ambient su %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1687,12 +1810,12 @@ msgstr ""
"Note: fin che nissune font cirude e dopre hdlists, urpmf nol podarà dâ "
"nissun risultât\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1709,21 +1832,21 @@ msgstr ""
"\n"
"ûs:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
" --media - dopre dome les fonts te liste, disseparadis di virgulis.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
@@ -1731,24 +1854,24 @@ msgstr ""
" --auto-select - selezione automatichementri i pachets par atualizâ il "
"sisteme.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
" --auto-select - selezione automatichementri i pachets par atualizâ il "
"sisteme.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - disabilite il control MD5SUM.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - sfuarçe le atualizazion de clâf gpg.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1757,12 +1880,12 @@ msgstr ""
" --no-uninstall - no sta mai a domandâ di rimovi un pachet, ferme le "
"instalazion.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, fuzzy, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --install-src - instale dome il pachet sorzint (no i binaris).\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1771,7 +1894,7 @@ msgstr ""
" --keep - dopre i pachets esistints se possibil, dinee\n"
" i pacchets domandâts se son di rimovi.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1782,41 +1905,47 @@ msgstr ""
" un pachet al stâ par sedi instalât o\n"
" atualizât, il valôr predefinît al è %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr ""
" --split-length - par vê transazions plui piçulis, il valôr predefinît al è "
"%d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, fuzzy, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy - impon une ricercje fuzzy (sicu -y).\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, fuzzy, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr ""
" --src - il prossim pachet al è un pachet sorzint (sicu -s).\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr " --install-src - instale dome il pachet sorzint (no i binaris).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr ""
" --clean - al rimôf i rpm de cache prin di fâ cualsisei altre robe.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, fuzzy, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - ten i rpm no doprâs te cache.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1825,7 +1954,7 @@ msgstr ""
" --allow-nodeps - permet di domandâ al utent se al ûl instalâ\n"
" dai pachets cence controlâ les dipendencis.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1834,13 +1963,13 @@ msgstr ""
" --allow-force - permet di domandâ al utent di instalâ i pachets cence\n"
" controlâ dipendencis e integritât.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr ""
" --root - dopre une altre cartele di root par instalâ i file rpm.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1849,47 +1978,47 @@ msgstr ""
" --use-distrib - configure urpmi dal lamp di un arbul distribuît, zovevul\n"
" par instalâ un pachet chroot cun opzion --root.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - dopre wget par recuperâ file rimîs.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - dopre curl par recuperâ i file rimîs.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, fuzzy, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --curl - dopre curl par recuperâ i file rimîs.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - limite le velocitât di scjariament.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1898,7 +2027,7 @@ msgstr ""
" --resume - ripie le stramude dai faile parzialmentri scjariâts\n"
" (--no-resume lu disabilite, disabilitât predefinît).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1907,7 +2036,7 @@ msgstr ""
" --proxy - dopre il proxy HTTP specificât, il numar di puarte\n"
" predefinît al è1080 (formât: <proxyhost[:port]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1916,7 +2045,7 @@ msgstr ""
" --proxy-user - specifiche utent e password di doprâ par\n"
" le autenticazion cul proxy (formât: <utent:password>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1925,7 +2054,7 @@ msgstr ""
" --bug - stampe un rapuart di bug te cartele specificade dal\n"
" argoment seguitîf.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, fuzzy, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1934,7 +2063,7 @@ msgstr ""
" --verify-rpm - verifiche le firme RPM prin de instalazion\n"
" (--no-verify-rpm le disabilite, predefinide abilitade).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, fuzzy, c-format
msgid ""
" --test - only verify if the installation can be achieved "
@@ -1942,102 +2071,108 @@ msgid ""
msgstr ""
" --test - verifiche se le instalazion e po sedi fate coretementri.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - trate di gjavâ fûr, disseparâs di virgulis.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - esclût i file di documentazion.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, fuzzy, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --no-uninstall - no sta mai a domandâ di rimovi un pachet, ferme le "
"instalazion.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --url - stampe il tag url: url.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - stampe il tag description: descrizion dal pachet.\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, 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:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr ""
+" --test - verifiche se le instalazion e po sedi fate coretementri.\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:150
+#: ../urpmi:148
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - ten i rpm no doprâs te cache.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
" -a - selezione dutis les corispondencis te rie di comant.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - consint le ricercje tra i provides dal pachet.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, 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"
-#: ../urpmi:155
+#: ../urpmi:153
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - maniere cidine.\n"
-#: ../urpmi:157
+#: ../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:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, 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:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2046,7 +2181,7 @@ msgstr ""
"Le cartele [%s] e esist dizà, par plasè dopre une altre cartele par il bug "
"report o scancelile"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "no rivi a creâ le cartele [%s] par il bug report"
@@ -2056,53 +2191,55 @@ msgstr "no rivi a creâ le cartele [%s] par il bug report"
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, c-format
msgid "%s: %s (to upgrade)"
msgstr ""
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, c-format
msgid "%s (to upgrade)"
msgstr ""
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "Instalazion Automatiche"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "Instalazion Automatiche"
-#: ../urpmi:447
+#: ../urpmi:454
#, 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:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Cuale ise le to sielte? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2110,7 +2247,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2118,19 +2255,19 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Continue distès?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (s/N) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2139,7 +2276,7 @@ msgstr ""
"Cualchidun dai pachets domandâts no puedin sedi instalât:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2148,7 +2285,7 @@ msgstr ""
"Cualchidun dai pachets domandâts no puedin sedi instalât:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2159,7 +2296,7 @@ msgstr ""
"e an di sedi rimovûts par atualizâ altris:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2170,7 +2307,7 @@ msgstr ""
"e an di sedi rimovûts par atualizâ altris:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2179,7 +2316,7 @@ msgstr ""
"I pachets listâts e an di sedi rimovûts par podê atualizâ altris:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2188,12 +2325,17 @@ msgstr ""
"I pachets listâts e an di sedi rimovûts par podê atualizâ altris:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2202,113 +2344,29 @@ msgstr ""
"Tu âs di sedi root par podê instalâ chestis dipendencis: \n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, 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:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Frache Enter cuant che tu sês pront..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Scancele"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "Chiscj pachets e an firmis no valevulis"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Chiscj pachets e an firmis no valevulis"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Âstu voie di continuâ le instalazion?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Instalazion falade"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "distribuzion di %s"
-
-#: ../urpmi:726
-#, fuzzy, c-format
-msgid "installing %s from %s"
-msgstr "instalazion di %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "instalazion di %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Provjo a instalâ cence controlâ les dipendencis? (s/N) "
-
-#: ../urpmi:776
-#, 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) "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d stramudis de instalazion faladis"
-msgstr[1] "%d stramudis de instalazion faladis"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Le instalazion e je pussibil"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Al è dut dizà instalât"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Al è dut dizà instalât"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "Al è dut dizà instalât"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "Al è dut dizà instalât"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "rinviament di urpmi"
@@ -2436,49 +2494,49 @@ msgstr " -v - maniere fetôse.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "no rivi a atualizâ le font \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, fuzzy, c-format
msgid "Only superuser is allowed to add media"
msgstr "Dome il superutent al po instalâ pachets"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "scrîf il file di configurazion [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, fuzzy, c-format
msgid "Can't create config file [%s]"
msgstr "scrîf il file di configurazion [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "no l'è di bisugne di furnî <percors relatîf di hdlist> cun --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<percors relatîf di hdlist> mancjant\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "no rivi a creâ le font \"%s\"\n"
@@ -2640,17 +2698,17 @@ msgid " -y - fuzzy match on media names.\n"
msgstr ""
" -a - selezione dutis les corispondencis te rie di comant.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, fuzzy, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Dome il superutent al po instalâ pachets"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "nuie di rimovi (dopre urpmi.addmedia par zontâ une gnove font)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2706,17 +2764,17 @@ msgstr " -a - selezione une font no rimovibil.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - sfuarçe gjenerazion di file hdlist.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, fuzzy, c-format
msgid "Only superuser is allowed to update media"
msgstr "Dome il superutent al po instalâ pachets"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "nuie di atualizâ (dopre urpmi.addmedia par zontâ une font)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2725,22 +2783,22 @@ msgstr ""
"le vôs di atualizâ e mancje\n"
"(une di %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "ignoring media %s"
msgstr "Modifiche de font \"%s\":"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "enabling media %s"
msgstr "o rimôf le font \"%s\""
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2757,7 +2815,7 @@ msgstr ""
"\n"
"ûs:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2765,38 +2823,38 @@ msgid ""
msgstr ""
" --media - dopre dome les fonts te liste, disseparadis di virgulis.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - impon une ricercje fuzzy (sicu -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - liste i pachets disponibii.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - liste les fonts disponibilis.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - liste les fonts disponibilis e i lôr url.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
" --list-nodes - liste i grops disponibii cuant che si dopre --parallel.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - liste i alias paralei disponibii.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
@@ -2804,13 +2862,13 @@ msgstr ""
" --dump-config - mostre le configuraizon te maniere doprade di urpmi."
"addmedia.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr ""
" --src - il prossim pachet al è un pachet sorzint (sicu -s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
@@ -2818,12 +2876,12 @@ msgstr ""
" --sources - liste ducj i pachets sorzint prin di scjariâ (dome "
"root).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --url - stampe il tag url: url.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2832,78 +2890,78 @@ msgstr ""
" --use-distrib - configure urpmi dal lamp di un arbul distribuît.\n"
" Chest a ti permet di interogâ une distribuzion.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - stampe le liste des modifichis.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - stampe il tag summary: sumari dal pachet.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whaterquires - ricercje ledrôse sui recuisîts dal pachet.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, fuzzy, c-format
msgid ""
" --whatrequires-recursive\n"
" - extended reverse search (includes virtual packages).\n"
msgstr " --whaterquires - ricercje ledrôse sui recuisîts dal pachet.\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -p - consint le ricercje tra i provides dal pachet.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - risultâts complets cui pachets di rimovi.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - slargje le ricercje a lis dipendencis dal pachet.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - stampe grops ancje cul non\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - stampe informazions utilis in forme leibile.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - liste i file presints int'un pachet.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - maniere cidine.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - stampe le version e le release ancje cui nons.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - il prossim pachet al è un pachet sorzint (compagn di --"
"src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2912,45 +2970,45 @@ msgstr ""
" -u - rimôf il pachet se une version plui atualizade e je dizà "
"instalade.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - impon une ricercje fuzzy (sicu --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, fuzzy, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -a - selezione dutis les corispondencis te rie di comant.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " i nons o file rpm scrits te rie di comant e vegnin interogâs.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes al po sedi doprât dome cun --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"Note: fin che nissune font cirude e dopre hdlists, urpmf nol podarà dâ "
"nissun risultât\n"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2958,12 +3016,25 @@ msgstr ""
"Note: fin che nissune font cirude e dopre hdlists, urpmf nol podarà dâ "
"nissun risultât\n"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Nissun changelog cjatât\n"
#, fuzzy
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Chiscj pachets e an firmis no valevulis:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Vuelistu continuâ le instalazion?"
+
+#, fuzzy
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Tu âs bisugne di sedi aministratôr par doprâ chest comant ! \n"
@@ -3309,10 +3380,6 @@ msgstr "Nissun changelog cjatât\n"
#~ " --keep - dopre i pachets esistints se possibil, dinee\n"
#~ " i pacchets domandâts se son di rimovi.\n"
-#, fuzzy
-#~ msgid "unable to write file [%s]"
-#~ msgstr "no rivi a scrivi tal file di configurazion [%s]"
-
#~ msgid ""
#~ " --distrib-XXX - automatically create a medium for XXX part of a\n"
#~ " distribution, XXX may be main, contrib, updates or\n"
diff --git a/po/ga.po b/po/ga.po
index cdbd26c2..3876f28d 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+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"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, fuzzy, c-format
msgid "RPM installation"
msgstr "Ag Ullmhaigh feistiú"
@@ -27,7 +27,7 @@ msgstr "Ag Ullmhaigh feistiú"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, fuzzy, c-format
msgid "_Ok"
msgstr "Ceart go Leor"
@@ -75,7 +75,7 @@ msgstr "Ag Feistiú:"
msgid "_Save"
msgstr "_Sábháil"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Cealaigh"
@@ -95,17 +95,17 @@ msgstr "Cód earraidh gan aithne %d\n"
msgid "No packages specified"
msgstr "pacáiste ar bith den ainm %s"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Fan go fóill, le do thoil..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, fuzzy, c-format
msgid "Must be root"
msgstr "Gaireas luchóige"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -113,42 +113,42 @@ msgid ""
"Continue installation anyway?"
msgstr "tá gach rud ann cheana féin"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Rabhadh"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Ceart go Leor"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr ""
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, fuzzy, c-format
msgid " (to install)"
msgstr "Eirigh as Feistiú"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Tá ceann de na pacáistí seo de dhíth:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, fuzzy, c-format
msgid "_Abort"
msgstr "Tobscoir"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -156,55 +156,63 @@ msgid ""
"Continue installation anyway?"
msgstr "Tá %s ins na pacáistí a leanas: %s \n"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, 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:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, 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:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, 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:225
+#: ../gurpmi2:226
#, fuzzy, c-format
msgid "Package installation..."
msgstr "Ag Ullmhaigh feistiú"
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr ""
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Á Ullmhú..."
+
+#: ../gurpmi2:246
+#, fuzzy, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr ""
+"Ag feisteáil pacáiste %s\n"
+"%d%%"
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr ""
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, fuzzy, c-format
msgid "Downloading package `%s'..."
msgstr "Ag feistiál pacáiste %s"
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr "Tá %s ins na pacáistí a leanas: %s \n"
+msgid "_Done"
+msgstr "Críochnithe"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -212,43 +220,27 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../gurpmi2:292 ../urpme:142
-#, fuzzy, c-format
-msgid "removing %s"
-msgstr "ag feistiú %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Á Ullmhú..."
-
-#: ../gurpmi2:302
-#, fuzzy, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr ""
-"Ag feisteáil pacáiste %s\n"
-"%d%%"
-
-#: ../gurpmi2:334
-#, fuzzy, c-format
-msgid "_Done"
-msgstr "Críochnithe"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Theip ag feistiú"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "tá gach rud ann cheana féin"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, fuzzy, c-format
msgid "Installation finished"
msgstr "Theip ag feistiú"
+#: ../gurpmi2:312 ../urpme:139
+#, fuzzy, c-format
+msgid "removing %s"
+msgstr "ag feistiú %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -281,7 +273,7 @@ msgstr ""
msgid " defaults to %s.\n"
msgstr ""
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr ""
@@ -291,98 +283,98 @@ msgstr ""
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, fuzzy, c-format
msgid "unable to open rpmdb"
msgstr "Téip ag oscailt comhad: %s\n"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "Tá droch ainmchomad rpm [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, fuzzy, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "Tá droch ainmchomad rpm [%s]"
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr ""
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, fuzzy, c-format
msgid "...retrieving failed: %s"
msgstr "Theip ar uathathmhéadú FAT: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, fuzzy, c-format
msgid "unable to access rpm file [%s]"
msgstr "Téip ag oscailt comhad: %s\n"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "Téip ag oscailt comhad: %s\n"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, fuzzy, c-format
msgid "unable to register rpm file"
msgstr "Téip ag oscailt comhad: %s\n"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr ""
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr ""
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, fuzzy, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "Teip ag leámh comhad chlár: %s"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, fuzzy, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "léamh depslist comhad [%s]"
@@ -569,7 +561,12 @@ msgstr "tá gach rud ann cheana féin"
msgid "malformed URL: [%s]"
msgstr ""
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, fuzzy, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "léamh depslist comhad [%s]"
@@ -579,43 +576,48 @@ msgstr "léamh depslist comhad [%s]"
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, fuzzy, c-format
msgid "unable to create transaction"
msgstr "Tá droch ainmchomad rpm [%s]"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "Téip ag oscailt comhad: %s\n"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr ""
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, fuzzy, c-format
msgid "unable to install package %s"
msgstr "Ag feistiál pacáiste %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "Ag feistiál pacáiste %s"
+
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing package %s"
msgstr "Ag feistiál pacáiste %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "ag feistiú %s\n"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, fuzzy, c-format
msgid "More information on package %s"
msgstr "Eolais Cuimhne"
@@ -645,11 +647,103 @@ msgstr "pacáiste ar bith den ainm %s"
msgid "Cannot connect to ldap uri:"
msgstr ""
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, c-format
+msgid "%s database locked. waiting..."
+msgstr ""
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Rabhadh"
+
+#: ../urpm/lock.pm:65
#, c-format
msgid "%s database locked"
msgstr ""
+#: ../urpm/main_loop.pm:99
+#, 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:100
+#, 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:101
+#, 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:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Theip ag feistiú"
+
+#: ../urpm/main_loop.pm:133
+#, fuzzy, c-format
+msgid "distributing %s"
+msgstr "ag feistiú %s\n"
+
+#: ../urpm/main_loop.pm:148
+#, fuzzy, c-format
+msgid "installing %s from %s"
+msgstr "ag feistiú %s\n"
+
+#: ../urpm/main_loop.pm:150
+#, fuzzy, c-format
+msgid "installing %s"
+msgstr "ag feistiú %s\n"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr ""
+
+#: ../urpm/main_loop.pm:205
+#, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr ""
+
+#: ../urpm/main_loop.pm:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "Theip ag feistiú"
+msgstr[1] "Theip ag feistiú"
+
+#: ../urpm/main_loop.pm:258
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "Theip ag feistiú"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "tá gach rud ann cheana féin"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "tá gach rud ann cheana féin"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "tá gach rud ann cheana féin"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "tá gach rud ann cheana féin"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -697,7 +791,7 @@ msgstr "léamh depslist comhad [%s]"
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, fuzzy, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "léamh depslist comhad [%s]"
@@ -784,7 +878,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr ""
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr ""
@@ -849,144 +943,149 @@ msgstr "Téip ag oscailt comhad: %s\n"
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "Tá droch ainmchomad rpm [%s]"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, fuzzy, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, fuzzy, c-format
msgid "selecting multiple media: %s"
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, fuzzy, c-format
msgid "removing medium \"%s\""
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "Cumraigh 'fetchmail'"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "Cumraíocht Xorg"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr ""
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, fuzzy, c-format
msgid "examining hdlist file [%s]"
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, fuzzy, c-format
msgid "examining synthesis file [%s]"
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, fuzzy, c-format
msgid "building hdlist [%s]"
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, fuzzy, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, fuzzy, c-format
msgid "...copying failed"
msgstr "Theip ar feistiú"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, fuzzy, c-format
msgid "copying description file of \"%s\"..."
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, fuzzy, c-format
msgid "...copying done"
msgstr "Theip ar feistiú"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "Téip cóip do [%s]"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, fuzzy, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, fuzzy, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "Téip cóip do [%s]"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, fuzzy, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, fuzzy, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "Theip ar uathathmhéadú FAT: %s"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, fuzzy, c-format
msgid "no rpm files found from [%s]"
msgstr "Tá droch ainmchomad rpm [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, fuzzy, c-format
msgid "reading rpm files from [%s]"
msgstr "Tá droch ainmchomad rpm [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, fuzzy, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "Tá droch ainmchomad rpm [%s]"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -994,74 +1093,74 @@ msgid ""
"medium."
msgstr ""
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, fuzzy, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, fuzzy, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, fuzzy, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, fuzzy, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, fuzzy, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "Tá droch ainmchomad rpm [%s]"
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, fuzzy, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "Téip ag oscailt comhad: %s\n"
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, fuzzy, c-format
msgid "writing list file for medium \"%s\""
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "Téip ag oscailt comhad: %s\n"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, fuzzy, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "Téip ag oscailt comhad: %s\n"
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, fuzzy, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, fuzzy, c-format
msgid "reading headers from medium \"%s\""
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "TtYy"
@@ -1121,47 +1220,52 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "Téip ag oscailt comhad: %s\n"
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Pacáiste ar bith den ainm %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, fuzzy, c-format
msgid "The following packages contain %s: %s"
msgstr "Tá ceann de na pacáistí seo de dhíth:"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "kdesu ar iarraidh"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "tá gach rud ann cheana féin"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, fuzzy, c-format
msgid "due to unsatisfied %s"
msgstr "kdesu ar iarraidh"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr ""
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, fuzzy, c-format
msgid "in order to keep %s"
msgstr "téama le haighaidh taobh an fuinneog"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "téama le haighaidh taobh an fuinneog"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "kdesu ar iarraidh"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, fuzzy, c-format
msgid "unrequested"
msgstr "Konquest"
@@ -1181,6 +1285,16 @@ msgstr ""
msgid "Missing signature (%s)"
msgstr ""
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Téip ag oscailt comhad: %s\n"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "theip ar feistiú"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1192,8 +1306,8 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr ""
@@ -1208,18 +1322,18 @@ msgstr ""
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr ""
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr ""
@@ -1229,8 +1343,8 @@ msgstr ""
msgid " --root - use another root for rpm removal.\n"
msgstr ""
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
@@ -1247,17 +1361,17 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr ""
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr ""
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr ""
@@ -1267,37 +1381,37 @@ msgstr ""
msgid " -a - select all packages matching expression.\n"
msgstr ""
-#: ../urpme:76
+#: ../urpme:73
#, fuzzy, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Téip ag oscailt comhad: %s\n"
-#: ../urpme:107
+#: ../urpme:104
#, fuzzy, c-format
msgid "unknown packages"
msgstr "%d pacáistí"
-#: ../urpme:107
+#: ../urpme:104
#, fuzzy, c-format
msgid "unknown package"
msgstr "gan aithne"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr ""
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr ""
-#: ../urpme:126
+#: ../urpme:123
#, fuzzy, c-format
msgid "Checking to remove the following packages"
msgstr "Tá ceann de na pacáistí seo de dhíth:"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1305,24 +1419,24 @@ msgid_plural ""
msgstr[0] "Tá ceann de na pacáistí seo de dhíth:"
msgstr[1] "Tá ceann de na pacáistí seo de dhíth:"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "Ag feistiál pacáiste %s"
msgstr[1] "Ag feistiál pacáiste %s"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, fuzzy, c-format
msgid " (y/N) "
msgstr " (T/n) "
-#: ../urpme:160
+#: ../urpme:157
#, fuzzy, c-format
msgid "Removal failed"
msgstr "Scríos modúil"
@@ -1343,12 +1457,12 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr ""
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1359,12 +1473,12 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1375,7 +1489,7 @@ msgstr ""
msgid " --use-distrib - use the given path to access media\n"
msgstr ""
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1385,7 +1499,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr ""
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr ""
@@ -1517,87 +1631,97 @@ msgstr ""
#: ../urpmf:72
#, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr ""
#: ../urpmf:73
#, c-format
-msgid " --obsoletes - obsoletes tags\n"
+msgid " --name - package name\n"
msgstr ""
#: ../urpmf:74
#, c-format
-msgid " --packager - packager\n"
+msgid " --obsoletes - obsoletes tags\n"
msgstr ""
#: ../urpmf:75
#, c-format
-msgid " --provides - provides tags\n"
+msgid " --packager - packager\n"
msgstr ""
#: ../urpmf:76
#, c-format
-msgid " --requires - requires tags\n"
+msgid " --provides - provides tags\n"
msgstr ""
#: ../urpmf:77
#, c-format
-msgid " --size - installed size\n"
+msgid " --requires - requires tags\n"
msgstr ""
#: ../urpmf:78
#, c-format
-msgid " --sourcerpm - source rpm name\n"
+msgid " --size - installed size\n"
msgstr ""
#: ../urpmf:79
#, c-format
-msgid " --summary - summary\n"
+msgid " --sourcerpm - source rpm name\n"
msgstr ""
#: ../urpmf:80
#, c-format
-msgid " --url - url\n"
+msgid " --suggests - suggests tags\n"
msgstr ""
#: ../urpmf:81
#, c-format
-msgid " --vendor - vendor\n"
+msgid " --summary - summary\n"
msgstr ""
#: ../urpmf:82
#, c-format
+msgid " --url - url\n"
+msgstr ""
+
+#: ../urpmf:83
+#, c-format
+msgid " --vendor - vendor\n"
+msgstr ""
+
+#: ../urpmf:84
+#, c-format
msgid " -m - the media in which the package was found\n"
msgstr ""
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1608,60 +1732,60 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpmi:88
+#: ../urpmi:84
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr ""
-#: ../urpmi:93
+#: ../urpmi:89
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr ""
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr ""
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
"installation.\n"
msgstr ""
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr ""
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
" packages that lead to removals.\n"
msgstr ""
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1669,241 +1793,252 @@ msgid ""
" default is %d.\n"
msgstr ""
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr ""
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr ""
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr ""
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr ""
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr ""
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
" dependencies checking.\n"
msgstr ""
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
" dependencies checking and integrity.\n"
msgstr ""
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr ""
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
" to install a chroot with --root option.\n"
msgstr ""
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr ""
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr ""
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr ""
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr ""
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
" (--no-resume disables it, default is disabled).\n"
msgstr ""
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../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 ""
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
" authentication (format is <user:password>).\n"
msgstr ""
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
" next arg.\n"
msgstr ""
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
" (--no-verify-rpm disables it, default is enabled).\n"
msgstr ""
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr ""
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr ""
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr ""
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
-#: ../urpmi:144
+#: ../urpmi:141
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr ""
-#: ../urpmi:145
+#: ../urpmi:142
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr ""
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
-#: ../urpmi:148
+#: ../urpmi:145
+#, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr ""
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:150
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr ""
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
-#: ../urpmi:155
+#: ../urpmi:153
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr ""
-#: ../urpmi:157
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
-#: ../urpmi:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr ""
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr ""
@@ -1913,53 +2048,55 @@ msgstr ""
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, c-format
msgid "%s: %s (to upgrade)"
msgstr ""
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, c-format
msgid "%s (to upgrade)"
msgstr ""
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "Eirigh as Feistiú"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "Eirigh as Feistiú"
-#: ../urpmi:447
+#: ../urpmi:454
#, 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:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Céard é do rogha? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -1967,7 +2104,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -1975,33 +2112,33 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Lean ar aghaidh ar aon nós?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (T/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
"%s"
msgstr "tá gach rud ann cheana féin"
-#: ../urpmi:504
+#: ../urpmi:521
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s"
msgstr "tá gach rud ann cheana féin"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2009,7 +2146,7 @@ msgid ""
"%s\n"
msgstr "Tá %s ins na pacáistí a leanas: %s \n"
-#: ../urpmi:537
+#: ../urpmi:554
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2017,137 +2154,60 @@ msgid ""
"%s\n"
msgstr "Tá %s ins na pacáistí a leanas: %s \n"
-#: ../urpmi:544
+#: ../urpmi:561
#, 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:545
+#: ../urpmi:562
#, 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:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
"%s\n"
msgstr ""
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, 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:623
+#: ../urpmi:632
#, fuzzy, c-format
msgid "Press Enter when ready..."
msgstr "Brú Enter nuair atá sin déanta agat..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Cealaigh"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "Tá ceann de na pacáistí seo de dhíth:"
-
-#: ../urpmi:672
-#, fuzzy, c-format
-msgid "The following packages have bad signatures"
-msgstr "Tá ceann de na pacáistí seo de dhíth:"
-
-#: ../urpmi:673
-#, fuzzy, c-format
-msgid "Do you want to continue installation ?"
-msgstr "An bhfuil tú ag iarraidh an cumraíocht a thrial?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Theip ag feistiú"
-
-#: ../urpmi:711
-#, fuzzy, c-format
-msgid "distributing %s"
-msgstr "ag feistiú %s\n"
-
-#: ../urpmi:726
-#, fuzzy, c-format
-msgid "installing %s from %s"
-msgstr "ag feistiú %s\n"
-
-#: ../urpmi:728
-#, fuzzy, c-format
-msgid "installing %s"
-msgstr "ag feistiú %s\n"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr ""
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr ""
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "Theip ag feistiú"
-msgstr[1] "Theip ag feistiú"
-
-#: ../urpmi:825
-#, fuzzy, c-format
-msgid "Installation is possible"
-msgstr "Theip ag feistiú"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "tá gach rud ann cheana féin"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "tá gach rud ann cheana féin"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "tá gach rud ann cheana féin"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "tá gach rud ann cheana féin"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr ""
@@ -2259,49 +2319,49 @@ msgstr ""
msgid "unable to update medium \"%s\"\n"
msgstr "Téip ag oscailt comhad: %s\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr ""
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "Téip ag cruthaigh comhad: %s"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, fuzzy, c-format
msgid "Can't create config file [%s]"
msgstr "Téip ag cruthaigh comhad: %s"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr ""
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr ""
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, fuzzy, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "Téip ag oscailt comhad: %s\n"
@@ -2454,17 +2514,17 @@ msgstr ""
msgid " -y - fuzzy match on media names.\n"
msgstr ""
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr ""
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr ""
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2514,39 +2574,39 @@ msgstr ""
msgid " -f - force updating synthesis/hdlist\n"
msgstr ""
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr ""
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
"(one of %s)\n"
msgstr ""
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "ignoring media %s"
msgstr "léamh depslist comhad [%s]"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "enabling media %s"
msgstr "léamh depslist comhad [%s]"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2557,195 +2617,203 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
"packages.\n"
msgstr ""
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr ""
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr ""
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr ""
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr ""
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr ""
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr ""
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr ""
-#: ../urpmq:68
+#: ../urpmq:65
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr ""
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
" This permit to querying a distro.\n"
msgstr ""
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr ""
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr ""
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr ""
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
" - extended reverse search (includes virtual packages).\n"
msgstr ""
-#: ../urpmq:90
+#: ../urpmq:87
#, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr ""
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr ""
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr ""
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr ""
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr ""
-#: ../urpmq:99
+#: ../urpmq:96
#, c-format
msgid " -m - equivalent to -du\n"
msgstr ""
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr ""
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
msgstr ""
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr ""
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr ""
#, fuzzy
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr "Tá %s ins na pacáistí a leanas: %s \n"
+
+#, fuzzy
#~ msgid "unable to remove package %s"
#~ msgstr "Téip ag oscailt comhad: %s\n"
@@ -2844,9 +2912,5 @@ msgstr ""
#~ msgstr "Lean"
#, fuzzy
-#~ msgid "unable to write file [%s]"
-#~ msgstr "Téip ag oscailt comhad: %s\n"
-
-#, fuzzy
#~ msgid "retrieving mirrors at %s ..."
#~ msgstr "léamh depslist comhad [%s]"
diff --git a/po/gl.po b/po/gl.po
index 61d62307..d606ee43 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2006-09-10 00:34+0100\n"
"Last-Translator: Leandro Regueiro <leandro.regueiro@gmail.com>\n"
"Language-Team: Galician <<gpul-traduccion@ceu.fi.udc.es>>\n"
@@ -21,7 +21,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.9.1\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "Instalación de RPMs"
@@ -31,7 +31,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:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Aceptar"
@@ -98,7 +98,7 @@ msgstr "_Instalar"
msgid "_Save"
msgstr "_Gardar"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Cancelar"
@@ -118,17 +118,17 @@ msgstr "Opción descoñecida %s"
msgid "No packages specified"
msgstr "Non especificou ningún paquete"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Agarde..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "Debe ser root"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -139,42 +139,42 @@ msgstr ""
"%s\n"
"Desexa continua-la instalación de tódolos xeitos?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Advertencia"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Aceptar"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr "(para actualizar)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr "(para instalar)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, fuzzy, c-format
msgid "Package choice"
msgstr "Selección de paquetes"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Necesítase un dos seguintes paquetes:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Abortar"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -185,59 +185,61 @@ msgstr ""
"%s\n"
"Desexa continuar a instalación de tódolos xeitos?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, 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:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, 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:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, 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:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Instalación de paquetes..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "Non foi posible consegui-los paquetes fonte, abortando"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Preparando..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instalando o paquete `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Insira o soporte que se chama \"%s\" no dispositivo [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Descargando o paquete `%s'..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Os seguintes paquetes teñen sinaturas incorrectas:\n"
-"%s\n"
-"\n"
-"Desexa continuar ca instalación?"
+msgid "_Done"
+msgstr "_Feito"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -248,41 +250,27 @@ msgstr ""
"%s\n"
"Pode ser que desexe actualizar a base de datos do seu urpmi"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "eliminando %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Preparando..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instalando o paquete `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Feito"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, c-format
msgid "Installation failed:"
msgstr "A instalación fallou:"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Xa está todo instalado"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Instalación rematada"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "eliminando %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -317,7 +305,7 @@ msgstr " ! - NOT unario.\n"
msgid " defaults to %s.\n"
msgstr " por defecto é %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Só o superusuario pode instalar paquetes"
@@ -327,98 +315,98 @@ msgstr "Só o superusuario pode instalar paquetes"
msgid "Running urpmi in restricted mode..."
msgstr "Executando urpmi en modo restrinxido..."
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "non foi posible abrir rpmdb"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nome de ficheiro rpm incorrecto [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "recuperando o ficheiro rpm [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...recuperación rematada"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...fallo ó recuperar: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "non foi posible acceder ó ficheiro rpm [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "non foi posible analisar o ficheiro spec %s [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "non foi posible rexistrar o ficheiro rpm"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "erro ó rexistra-los paquetes locais"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, 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:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, 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:135
-#, fuzzy, c-format
-msgid "chroot directory doesn't exist"
-msgstr "O directorio de ambiente %s non existe"
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: non se puido ler o ficheiro rpm \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
+#, fuzzy, c-format
+msgid "chroot directory doesn't exist"
+msgstr "O directorio de ambiente %s non existe"
+
+#: ../urpm/args.pm:424
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr "Demasiados argumentos\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, fuzzy, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "problema ó ler o ficheiro hdlist ou synthesis do soporte \"%s\""
@@ -610,7 +598,12 @@ msgstr "non se atopou o paquete %s."
msgid "malformed URL: [%s]"
msgstr "URL deformado: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "recuperando ficheiros rpm do medio \"%s\"..."
@@ -620,7 +613,7 @@ msgstr "recuperando ficheiros rpm do medio \"%s\"..."
msgid "[repackaging]"
msgstr "[reempaquetando]"
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -628,37 +621,42 @@ msgstr ""
"creouse unha transacción para instalar en %s (eliminar=%d, instalar=%d, "
"actualizar=%d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "non se puido crear a transacción"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, 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:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr ""
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "non foi posible instalar o paquete %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "eliminando o paquete %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "eliminando o paquete %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "instalando %s dende %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Máis información no paquete %s"
@@ -688,11 +686,103 @@ msgstr "Non especificou ningún paquete"
msgid "Cannot connect to ldap uri:"
msgstr "Non se poden asignar as entradas do mapa de cores"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "a base de datos de urpmi está bloqueada"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Advertencia"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "a base de datos de urpmi está bloqueada"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "Os seguintes paquetes teñen sinaturas incorrectas"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Os seguintes paquetes teñen sinaturas incorrectas"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "¿Desexa continuar ca instalación?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "A instalación fallou"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "distribuíndo %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "instalando %s dende %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "instalando %s"
+
+#: ../urpm/main_loop.pm:187
+#, 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:205
+#, 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:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "fallaron %d transaccións de instalación"
+msgstr[1] "fallaron %d transaccións de instalación"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "A instalación é viable"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "Xa está todo instalado"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Xa está todo instalado"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "Xa está todo instalado"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Xa está todo instalado"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -743,7 +833,7 @@ msgstr "intentando seleccionar o soporte inexistente \"%s\""
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr ""
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "non foi posible acceder ó ficheiro hdlist de \"%s\", soporte ignorado"
@@ -838,7 +928,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Comezo da busca: %s final: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "levando a cabo unha segunda pasada para calcular as dependencias\n"
@@ -905,68 +995,73 @@ msgstr ""
"non foi posible acceder ó primeiro soporte de instalación (non se atopou o "
"ficheiro hdlist)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "intentando seleccionar o soporte inexistente \"%s\""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "seleccionando varios soportes: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "eliminando o soporte \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "reconfigurando urpmi para o soporte \"%s\""
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...fallo ó reconfigurar"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "...fallo ó reconfigurar"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, 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:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
"Erro ó xerar o ficheiro de nomes: Non se puido escribir no ficheiro (%s)"
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "o soporte \"%s\" non está seleccionado"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "examinando o ficheiro hdlist [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "examinando o ficheiro synthesis [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "construindo hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -975,77 +1070,77 @@ msgstr ""
"Non foi posible construir o ficheiro synthesis para o soporte \"%s\". O "
"ficheiro hdlist podería estar corrompido."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problema ó ler o ficheiro hdlist ou synthesis do soporte \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "escribindo a lista de ficheiros do soporte \"%s\""
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...fallo ó copiar"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "copiando o ficheiro de descrición de \"%s\"..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...copiado"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "fallo ó copiar [%s] (o ficheiro é sospeitosamente pequeno)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "calculando o md5sum do hdlist fonte (ou synthesis) copiado"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "fallo ó copiar [%s] (os md5sum non coinciden)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "calculando o md5sum do hdlist (ou synthesis) fonte recuperado"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...fallo ó recuperar: o md5sum non coincide"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, fuzzy, c-format
msgid "no rpm files found from [%s]"
msgstr "lendo ficheiros rpm dende [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "lendo ficheiros rpm dende [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "non foi posible ler os ficheiros rpm dende [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "non se leron rpms"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1055,74 +1150,74 @@ msgstr ""
"non foi posible acceder ó soporte \"%s\",\n"
"isto pode ocorrer se montou a man o directorio cando creou o soporte."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "non se atopou o ficheiro hdlist para o soporte \"%s\""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "recuperando o hdlist (ou synthesis) fonte de \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, fuzzy, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "copiando o hdlist (ou synthesis) fonte de \"%s\"..."
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "non se atopou o ficheiro hdlist para o soporte \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "examinando o ficheiro pubkey de \"%s\"..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, 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:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "non foi posible importar o ficheiro pubkey de \"%s\""
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "escribindo a lista de ficheiros do soporte \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "engadiuse o soporte %s"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "non foi posible analisar o ficheiro hdlist de \"%s\""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problema ó ler o ficheiro synthesis do soporte \"%s\""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, fuzzy, c-format
msgid "reading headers from medium \"%s\""
msgstr "lendo as cabeceiras do soporte \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "SsYy"
@@ -1182,47 +1277,52 @@ msgstr "soporte inconsistente \"%s\" marcado coma extraíble pero non o é"
msgid "unable to access medium \"%s\""
msgstr "non foi posible acceder ó soporte \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Non hai ningún paquete que se chame %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Os seguintes paquetes conteñen %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "debido a que falta %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Xa está todo instalado"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "debido a %s non satisfeitas"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, fuzzy, c-format
msgid "trying to promote %s"
msgstr "Non hai nada que eliminar"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, fuzzy, c-format
msgid "in order to keep %s"
msgstr "para manter %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "para instalar %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "debido a conflictos con %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "non solicitado"
@@ -1242,6 +1342,16 @@ msgstr "Sinatura incorrecta (%s)"
msgid "Missing signature (%s)"
msgstr "Falta a sinatura (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Non se puido crear o ficheiro de configuración [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Fallo ó copiar"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1258,8 +1368,8 @@ msgstr ""
"\n"
"uso:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1277,19 +1387,19 @@ msgstr ""
" --test - verifica se a eliminación se pode facer de xeito "
"correcto.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr ""
" --force - forzar a invocación incluso se algún paquete non existe.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Reempaquetar os ficheiros antes de eliminar\n"
@@ -1299,8 +1409,8 @@ msgstr " --repackage - Reempaquetar os ficheiros antes de eliminar\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - usar outra raíz para a eliminación de rpms.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - usar outra raíz para a instalación de rpms.\n"
@@ -1317,17 +1427,17 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - usar o ficheiro synthesis.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - usar o ficheiro hdlist.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - modo detallado.\n"
@@ -1338,37 +1448,37 @@ msgid " -a - select all packages matching expression.\n"
msgstr ""
" -a - selecciona tódolos paquetes que concordan ca expresión.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Só o superusuario pode eliminar paquetes"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "paquetes descoñecidos"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "paquete descoñecido"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "Se se elimina o paquete %s o sistema estropearase"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Non hai nada que eliminar"
-#: ../urpme:126
+#: ../urpme:123
#, fuzzy, c-format
msgid "Checking to remove the following packages"
msgstr "Comprobando para eliminar os seguintes paquetes"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1380,24 +1490,24 @@ msgstr[1] ""
"Para satisfacer as dependencias, vanse eliminar os seguintes %d paquetes (%d "
"MB)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "Desexa eliminar %d paquete?"
msgstr[1] "Desexa eliminar %d paquetes?"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (s/N) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Fallo ó eliminar"
@@ -1423,12 +1533,12 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - amosa o número de versión desta ferramenta.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr " --excludemedia - non usar os soportes dados, separados por comas.\n"
@@ -1439,12 +1549,12 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../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"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1459,7 +1569,7 @@ msgstr ""
" --synthesis - usar o ficheiro synthesis proporcionado no\n"
" canto da base de datos de urpmi.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1471,7 +1581,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - non amosa as liñas idénticas.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - usar só soportes de actualización.\n"
@@ -1607,76 +1717,86 @@ msgid " --group - group\n"
msgstr " --group - grupo\n"
#: ../urpmf:72
+#, fuzzy, c-format
+msgid " --license - license\n"
+msgstr " --name - nome do paquete\n"
+
+#: ../urpmf:73
#, c-format
msgid " --name - package name\n"
msgstr " --name - nome do paquete\n"
-#: ../urpmf:73
+#: ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr ""
-#: ../urpmf:74
+#: ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr " --packager - empaquetador\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr ""
-#: ../urpmf:76
+#: ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr ""
-#: ../urpmf:77
+#: ../urpmf:78
#, c-format
msgid " --size - installed size\n"
msgstr " --size - tamaño despois de instalar\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - nome do rpm fonte\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, c-format
+msgid " --suggests - suggests tags\n"
+msgstr ""
+
+#: ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr " --summary - resumo\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, c-format
msgid " --url - url\n"
msgstr " --url - url\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, c-format
msgid " --vendor - vendor\n"
msgstr " --vendor - vendedor\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -m - o soporte no que se atopou o paquete\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "usando ambiente específico en %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1685,12 +1805,12 @@ msgstr ""
"Nota: xa que ningún dos soportes nos que se buscou usa hdlists, urpmf non "
"puido devolver ningún resultado\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Podería querer usar --name para buscar polo nome do paquete.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1706,7 +1826,7 @@ msgstr ""
"\n"
"uso:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1714,7 +1834,7 @@ msgstr ""
" --searchmedia - usar só o soporte dado para buscar os paquetes "
"solicitados.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
@@ -1723,7 +1843,7 @@ msgstr ""
" --auto - modo non-interactivo, tómanse as respostas "
"predeterminadas para as preguntas.\n"
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
@@ -1731,25 +1851,25 @@ msgstr ""
" --auto-select - seleccionar automáticamente os paquetes para actualizar o "
"sistema.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
" --auto-select - seleccionar automáticamente os paquetes para actualizar o "
"sistema.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr ""
" --no-md5sum - deshabilitar a comprobación de ficheiros MD5SUM.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - forzar a actualización da clave gpg.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1758,12 +1878,12 @@ msgstr ""
" --no-uninstall - nunca preguntar pola desinstalación dun paquete, abortar "
"a instalación.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - non instalar os paquetes (só descargalos)\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1772,7 +1892,7 @@ msgstr ""
" --keep - manten os paquetes existentes se é posible, rexeita\n"
" os paquetes solicitados que provocan eliminacións.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1783,38 +1903,44 @@ msgstr ""
" actualizar máis paquetes dos dados polo usuario,\n"
" por defecto é %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - tamaño mínimo de transacción, por defecto é %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr ""
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src, -s - o seguinte paquete é un paquete de fontes.\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
" --install-src - instalar só o paquete de fontes (non os binarios).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, fuzzy, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - eliminar os rpms da caché antes de facer nada.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, fuzzy, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - non eliminar os rpms da caché.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1823,66 +1949,66 @@ msgstr ""
" --allow-nodeps - permitirlle ó usuario instalar paquetes sen\n"
" comprobar as dependencias.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
" dependencies checking and integrity.\n"
msgstr ""
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - usar outra raíz para a instalación de rpms.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
" to install a chroot with --root option.\n"
msgstr ""
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - usar wget para descargar ficheiros distantes.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - usar curl para descargar ficheiros distantes.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --prozilla - usar prozilla para descargar ficheiros distantes.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr " --curl-options - opcións adicionais para pasarlle a curl\n"
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr " --rsync-options- opcións adicionais para pasarlle a rsync\n"
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr " --wget-options - opcións adicionais para pasarlle a wget\n"
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr " --prozilla-options - opcións adicionais para pasarlle a prozilla\n"
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - limita a velocidade de descarga.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1892,7 +2018,7 @@ msgstr ""
" descargados parcialmente (--no-resume\n"
" desactívaa, por defecto está desactivada).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1902,7 +2028,7 @@ msgstr ""
" número de porto é o 1080 por defecto (o formato é\n"
" <máquinaproxy[:porto]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1912,7 +2038,7 @@ msgstr ""
" usará para autenticarse no proxy (o formato é\n"
" <usuario:contrasinal>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1921,7 +2047,7 @@ msgstr ""
" --bug - crear un informe de erro no directorio indicado\n"
" polo seguinte argumento.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1931,7 +2057,7 @@ msgstr ""
" instalalo (--no-verify-rpm desactívaa, por\n"
" defecto está activada).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
@@ -1940,39 +2066,44 @@ msgstr ""
" --test - só verifica se se pode conseguir instalar de maneira "
"correcta.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - excluir as rutas separadas por comas.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - exclúe os ficheiros da documentación.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --ignoresize - non verificar o espacio baleiro do disco antes\n"
" de instalar.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --arch - arquitectura\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - descrición do paquete\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - omitir a instalación destes paquetes.\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - omitir a instalación destes paquetes.\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1981,60 +2112,60 @@ msgstr ""
" --more-choices - cando se atopan varios paquetes, propoñer máis eleccións\n"
" ademais da predeterminada.\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - non bloquear a base de datos rpm.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - actualizar só paquetes ca mesma arquitectura.\n"
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - permite buscar en proporciona para atopar o paquete.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - non buscar en proporciona para atopar o paquete.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -v - modo abreviado.\n"
-#: ../urpmi:157
+#: ../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:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, 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:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2043,7 +2174,7 @@ msgstr ""
"O directorio [%s] xa existe, use outro directorio para a comunicación de "
"erros ou elimíneo"
-#: ../urpmi:244
+#: ../urpmi:242
#, 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"
@@ -2053,7 +2184,7 @@ msgstr "Non foi posible crear o directorio [%s] para a comunicación de erros"
msgid "Environment directory %s does not exist"
msgstr "O directorio de ambiente %s non existe"
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2062,34 +2193,36 @@ msgstr ""
"Erro: semella que %s se montou coma de só lectura.\n"
"Use --allow-force para forzar a operación."
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr "Actualizando soporte...\n"
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (para actualizar)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (para actualizar)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (para instalar)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, c-format
msgid "%s (to install)"
msgstr "%s (para instalar)"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2098,12 +2231,12 @@ msgstr ""
"Para satisfacer as dependencias, vanse eliminar os seguintes %d paquetes (%d "
"MB)"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "¿Cal é a súa elección? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2114,7 +2247,7 @@ msgstr ""
"que son máis antigos cós instalados:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2125,7 +2258,7 @@ msgstr ""
"que son máis antigos cós instalados:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, c-format
msgid ""
"\n"
@@ -2134,12 +2267,12 @@ msgstr ""
"\n"
"¿Continuar a instalación de tódolos xeitos?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (S/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2148,7 +2281,7 @@ msgstr ""
"Algún dos paquetes solicitados non se puido instalar:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2157,7 +2290,7 @@ msgstr ""
"Algún dos paquetes solicitados non se puido instalar:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2168,7 +2301,7 @@ msgstr ""
"paquete para para poder actualizar outros:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2179,7 +2312,7 @@ msgstr ""
"paquetes para para poder actualizar outros:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2188,7 +2321,7 @@ msgstr ""
"Teñe que eliminarse o seguinte paquete para poder actualizar outros:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2197,12 +2330,17 @@ msgstr ""
"Teñen que eliminarse os seguintes paquetes para poder actualizar outros:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(só probar, a eliminación non se fará agora mesmo)"
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2211,111 +2349,29 @@ msgstr ""
"Necesita ser root para instalar as seguintes dependencias:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(só probar, a instalación non se fará agora mesmo)"
-#: ../urpmi:597
+#: ../urpmi:617
#, fuzzy, 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 dos %d paquetes? (%d MB)"
msgstr[1] "Continuar ca instalación dos %d paquetes? (%d MB)"
-#: ../urpmi:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Prema Enter cando estea preparado..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Cancelar"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "Os seguintes paquetes teñen sinaturas incorrectas"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Os seguintes paquetes teñen sinaturas incorrectas"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "¿Desexa continuar ca instalación?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "A instalación fallou"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "distribuíndo %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "instalando %s dende %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "instalando %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "¿Probar a instalación sen comprobar as dependencias? (s/N) "
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "¿Probar a instalación con menos comprobacións (--force)? (s/N) "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "fallaron %d transaccións de instalación"
-msgstr[1] "fallaron %d transaccións de instalación"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "A instalación é viable"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Xa está todo instalado"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Xa está todo instalado"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "Xa está todo instalado"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "Xa está todo instalado"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "reiniciando urpmi"
@@ -2437,32 +2493,32 @@ msgstr " -v - modo detallado.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "non foi posible actualizar o soporte \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Só o superusuario pode engadir soportes"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "Crearase o ficheiro de configuración [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "Non se puido crear o ficheiro de configuración [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "non cómpre dar a <ruta relativa a hdlist> con --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
@@ -2471,17 +2527,17 @@ msgstr ""
"\n"
"Desexa engadir o soporte '%s'"
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr ""
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "non foi posible crear o soporte \"%s\"\n"
@@ -2643,18 +2699,18 @@ msgstr " -a - selecciona tódolos soportes.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr ""
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Só o superusuario pode eliminar soportes"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr ""
"non hai nada que eliminar (use urpmi.addmedia para engadir un soporte)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2710,18 +2766,18 @@ msgstr " -a - selecciona tódolos soportes non extraíbles.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - forzar a xeración de ficheiros hdlist.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Só o superusuario pode actualizar soportes"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
"non hai nada que actualizar (use urpmi.addmedia para engadir un soporte)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2730,22 +2786,22 @@ msgstr ""
"falta a entrada a actualizar\n"
"(unha de %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "ignorando o soporte %s"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "habilitando o soporte %s"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2761,7 +2817,7 @@ msgstr ""
"\n"
"uso:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2770,38 +2826,38 @@ msgstr ""
" --searchmedia - usar só o soporte dado para buscar os paquetes "
"solicitados (ou a actualizar).\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr ""
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - listar os paquetes dispoñibles.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - lista os soportes dispoñibles.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - lista os soportes dispoñibles e o seu url.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
" --list-nodes - lista os nodos dispoñibles cando se usa --parallel.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr ""
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
@@ -2809,102 +2865,102 @@ msgstr ""
" --dump-config - devolve a configuración en forma de argumento de urpmi."
"addmedia.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr ""
" --src - o seguinte paquete é un paquete de fontes (igual ca -s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr ""
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --arch - arquitectura\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
" This permit to querying a distro.\n"
msgstr ""
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - amosa o changelog.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - amosar o resumo.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr ""
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
" - extended reverse search (includes virtual packages).\n"
msgstr ""
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -p - buscar en proporciona para atopar o paquete.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - saída completa co paquete que se vai eliminar.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - extender a solicitude ás dependencias do paquete.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr ""
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - amosa información útil en forma lexible.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - lista os ficheiros do paquete.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -v - modo abreviado.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr ""
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - o seguinte paquete é un paquete de fontes (igual ca --"
"src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2913,44 +2969,44 @@ msgstr ""
" -u - elimina o paquete se xa está instalada unha versión máis "
"nova.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes só se pode usar con --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"Nota: xa que ningún dos soportes nos que se buscou usa hdlists, urpmf non "
"puido devolver ningún resultado\n"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2958,11 +3014,22 @@ msgstr ""
"Nota: xa que ningún dos soportes nos que se buscou usa hdlists, urpmf non "
"puido devolver ningún resultado\n"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Non se atopou o changelog\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Os seguintes paquetes teñen sinaturas incorrectas:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Desexa continuar ca instalación?"
+
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Necesita ser root para usar --use-distrib"
diff --git a/po/he.po b/po/he.po
index 8a42bdbd..bf50ccde 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2007-08-22 02:57+0300\n"
"Last-Translator: Dotan Kamber <kamberd@yahoo.com>\n"
"Language-Team: Hebrew\n"
@@ -24,7 +24,7 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "התקנת חבילות תוכנה"
@@ -34,7 +34,7 @@ msgstr "התקנת חבילות תוכנה"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "שגיאה: לא ניתן למצוא את הקובץ %s, הפעולה תבוטל"
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_המשך"
@@ -100,7 +100,7 @@ msgstr "_התקנה"
msgid "_Save"
msgstr "_שמירה"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_ביטול"
@@ -120,17 +120,17 @@ msgstr "אפשרות לא מוכרת %s"
msgid "No packages specified"
msgstr "לא צוינו חבילות"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "נא להמתין..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "עליך להיות בעל הרשאות מנהל מערכת"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -141,42 +141,42 @@ msgstr ""
"%s\n"
"האם להמשיך בכל זאת?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "אזהרה"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "אישור"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (לשדרג)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (להתקין)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "בחירת חבילות"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "אחת החבילות הבאות נדרשת:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_בטל"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -187,57 +187,61 @@ msgstr ""
"%s\n"
"האם להמשיך בכל זאת?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, 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:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, 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:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(חבילה %d, %d MB)"
msgstr[1] "(%d חבילות, %d MB)"
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "התקנת חבילה..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "אין אפשרות לקרוא חבילות מהמאגר, הפעולה מתבטלת"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "הכנה..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "מתקין חבילה `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "נא להכניס את המדיה הנקראת \"%s\" להתקן [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "מוריד חבילה `%s'..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"לחבילות הללו יש חתימה לא תקינה:\n"
-"%s\n"
-"\n"
-"האם להמשיך את ההתקנה?"
+msgid "_Done"
+msgstr "_סיום"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -248,41 +252,27 @@ msgstr ""
"%s\n"
"יתכן ועליך לעדכן את מאגר הנתונים של urpmi"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "מסיר %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "הכנה..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "מתקין חבילה `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_סיום"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, c-format
msgid "Installation failed:"
msgstr "ההתקנה כשלה:"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "הכל כבר מותקן"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "ההתקנה הסתיימה"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "מסיר %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -317,7 +307,7 @@ msgstr " -f - הצג שם מלא של ה-RPM (NVRA).\n"
msgid " defaults to %s.\n"
msgstr " ברירת המחדל היא %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "רק מנהל מערכת מורשה להתקין חבילות"
@@ -327,98 +317,98 @@ msgstr "רק מנהל מערכת מורשה להתקין חבילות"
msgid "Running urpmi in restricted mode..."
msgstr "הפעלת urpmi באופן עבודה מוגבל..."
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "אין אפשרות לפתוח את בסיס הנתונים של החבילות rpmdb"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr "נמצאו %d כותרי חבילות תוכנה בזכרון המטמון, מסיר %d כותרים מיושנים"
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "שם החבילה [%s] אינו תקין"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "מאחזר קובץ RPM [%s]..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...האחזור הסתיים"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...האיחזור נכשל: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "הגישה לחבילה [%s] נכשלה"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "אין אפשרות לפענח את קובץ המפרט %s [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "אין אפשרות לבצע רישום של החבילה"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "האריכטקטורה אינה תואמת את חבילת התוכנה [%s]"
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "חלה שגיאה בעת רישום חבילות מקומיות"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "פעולה זו אינה מותרת באופן עבודה מוגבל"
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "הכרזת proxy לא תקנית בשורת הפקודה\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr "ספרית ה-chroot אינה קיימת"
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: לא יכול קובץ RPM \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
+#, c-format
+msgid "chroot directory doesn't exist"
+msgstr "ספרית ה-chroot אינה קיימת"
+
+#: ../urpm/args.pm:424
#, c-format
msgid "Can't use %s without %s"
msgstr "לא ניתן להשתמש ב-%s ללא %s"
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
#, c-format
msgid "Can't use %s with %s"
msgstr "לא ניתן להשתמש ב-%s עם %s"
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr "יותר מדי משתנים\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "קובץ hdlist synthesis עבור המקור \"%s\" נבנה"
@@ -469,8 +459,7 @@ msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
#: ../urpm/download.pm:194
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
msgid "%s failed: exited with signal %d"
msgstr "%s כשל: הסתיים עם אות %d"
@@ -608,7 +597,12 @@ msgstr "החבילה %s לא נמצאה."
msgid "malformed URL: [%s]"
msgstr "URL לא תקין: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "מעתיק חבילות תוכנה מהמקור \"%s\"..."
@@ -618,42 +612,48 @@ msgstr "מעתיק חבילות תוכנה מהמקור \"%s\"..."
msgid "[repackaging]"
msgstr "[אורז מחדש]"
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, 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:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "בלתי אפשרי לעשות עסקה"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "אין אפשרות לחלץ rpm מתוך חבילת delta-rpm ששמה %s"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "מוסיף חבילה %s (id=%d, eid=%d, עדכון=%d, קובץ=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "התקנת החבילה %s נכשלה"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "מסיר חבילה %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "מסיר חבילה %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "מסיר חבילות מותקנות (%s) מתוך %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "מידע נוסף על החבילה %s"
@@ -683,11 +683,103 @@ msgstr "לא הוגדר בסיס"
msgid "Cannot connect to ldap uri:"
msgstr "לא ניתן להתחבר אל ה-URI של ldap:"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "בסיס הנתונים %s נעול"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "אזהרה"
+
+#: ../urpm/lock.pm:65
#, c-format
msgid "%s database locked"
msgstr "בסיס הנתונים %s נעול"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "לחבילות הבאות יש בעיה בחתימות"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "לחבילות הבאות יש בעיה בחתימות"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "האם להמשיך בתהליך ההתקנה?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "ההתקנה נכשלה"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "מפיץ %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "מתקין את %s מתוך %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "מתקין %s"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "האם לנסות להתקין ללא בדיקת תלויות? (כן/*לא)"
+
+#: ../urpm/main_loop.pm:205
+#, fuzzy, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "האם לנסות להתקין תוך אילוץ תלויות (--force)? (כן/לא) "
+
+#: ../urpm/main_loop.pm:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d עסקת התקנה נכשלה"
+msgstr[1] "%d עסקת התקנה נכשלה"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Installation is possible"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "הכל כבר מותקן"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "הכל כבר מותקן"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "הכל כבר מותקן"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "הכל כבר מותקן"
+
#: ../urpm/md5sum.pm:23
#, c-format
msgid "examining %s file"
@@ -735,7 +827,7 @@ msgstr "אין לכוון את \"synthesis\" (מקור \"%s\")"
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "יש לכוון את \"synthesis\" (מקור \"%s\")"
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "אין אפשרות לגשת לקובץ hdlist של \"%s\", מדיה זו לא תהיה בשימוש"
@@ -826,7 +918,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "תחילת חיפוש: %s סיום: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "מבצע מעבר שני בכדי לחשב תלויות\n"
@@ -891,144 +983,150 @@ msgstr "אין אפשרות לפתוח את בסיס הנתונים של החב
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "גישה להתקנה הראשונה של המאגר בלתי אפשרות (הקובץ hdlists לא נמצא)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "ניסיון לבחור במאגר שאינו קיים \"%s\""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "בוחר הרבה מדיה:%s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "מסיר מאגר \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "מגדיר מחדש את urpmi למקור \"%s\""
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...ההגדרה מחדש נכשלה"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "ההגדרה מחדש הושלמה"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "מאגר \"%s\" לא נבחר"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "בודק את הקובץ hdlist [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "בודק את קובץ הsynthesis [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "בונה hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
-msgstr "יצירת קובץ synthesis עבור המקור \"%s\" נכשלה. קובץ hdlist עלול להיות פגום."
+msgstr ""
+"יצירת קובץ synthesis עבור המקור \"%s\" נכשלה. קובץ hdlist עלול להיות פגום."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "בעיה בקריאת hdlist או קובץ מיזוג של המאגר \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "כותב קובץ רשימה עבור מאגר \"%s\""
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...ההעתקה נכשלה"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "מעתיק תיאור קובץ של \"%s\"..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...ההעתקה הסתיימה"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "העתקת [%s] נכשלה (הקובץ קטן מהמצופה)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "חישוב md5sum של מקור hdlist (או synthesis) מועתקים"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "העתקת [%s] נכשלה (חתימת md5sum אינה תואמת)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "מחשב חתימות md5sum של קובץ hdlist (או synthesis)"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...האיחזור נכשל: אי התאמה של md5sum"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "לא נמצאו חבילות מ [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "מייבא חבילות מ [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "אין אפשרות לקרוא את קובצי ה-RPM מ [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "לא נקראו חבילות תוכנה"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1038,74 +1136,74 @@ msgstr ""
"אין אפשרות לגשת למאגר \"%s\",\n"
"זה יכול לקרות אם היית מחובר ידנית לספרייה בזמן יצירת המאגר."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "לא נמצאו קובצי hdlist עבור מאגר \"%s\""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "מוריד את קובץ המקור hdlist (או synthesis) של \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "נמצא hdlist (או מיזוג) בחון כ-%s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "לא נמצאו קובצי hdlist עבור מאגר \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "בודק קובץ מפתחות ציבורי של \"%s\"..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr ".. מפתח %s מיובא מתוך קובץ ציבורי של \"%s\""
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "לא יכול לייבוא קובץ של מפתח ציבורי של \"%s\""
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "כותב קובץ רשימה עבור מאגר \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "מאגר %s הוסף"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "אין אפשרות לפענח את קובץ ה-hdlist של \"%s\""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "בעיה בקריאת קובץ מיזוג של מאגר \"%s\""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "קורא כותרות מתוך מאגר \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "לkKמnN"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "כfFטyY"
@@ -1165,47 +1263,52 @@ msgstr "מאגר לא רציף \"%s\" מסומן כניתן למחיקה אבל
msgid "unable to access medium \"%s\""
msgstr "הגישה למדיה \"%s\" נכשלה"
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "לא נמצאה חבילה בשם %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "The following packages contain %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "עקב %s חסר"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "הכל כבר מותקן"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "עקב תלות %s שלא מולאה"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "מנסה לקדם %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "בכדי לשמור %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "בכדי להתקין %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "עקב התנגשות עם %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "לא התבקש"
@@ -1225,6 +1328,16 @@ msgstr "מפתח זהות לא תקין (%s)"
msgid "Missing signature (%s)"
msgstr "חתימה חסרה (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "אין אפשרות ליצור את קובץ ההגדרות [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "ההעתקה נכשלה"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1242,8 +1355,8 @@ msgstr ""
"\n"
"שימוש:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - הצגת הודעת עזרה זו.\n"
@@ -1258,17 +1371,18 @@ msgstr " --auto - בחירה אוטומטית של חבילה מהאפ
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - בדיקה האם הסרת החבילה יכולה להסתיים בהצלחה.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, 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"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - הפעלה מבוזרת מול מספר מכונות שתוכנן זהה.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - הדפסת אורז התג: אורז.\n"
@@ -1278,8 +1392,8 @@ msgstr " --packager - הדפסת אורז התג: אורז.\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - שימוש בשורש אחר לצורך הסרת חבילות תוכנה.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - השתמש בשורש מערכת קבצים אחר להתקנת חבילות.\n"
@@ -1298,17 +1412,17 @@ msgstr ""
" --use-distrib - הגדרת urpmi בזמן ריצה לפי עץ ההפצה, שימושי\n"
" להוסיף/להסיר מערכת chroot עם האופציה --root.\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - נסה לחפש ולהשתמש בקובץ synthesis.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - נסה למצוא ולהשתמש בקובץ hdlist.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - verbose mode.\n"
@@ -1318,61 +1432,62 @@ msgstr " --verbose, -v - verbose mode.\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - בחירת כל החבילות עם ביטוי מתאים.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "רק מנהל מערכת מורשה להסיר חבילות תוכנה"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "חבילות לא מוכרות"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "חבילה לא מוכרת"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "הסרת החבילה %s תגרום נזק למערכת"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "שום-דבר למחיקה"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "בדיקה להסרה של החבילות הבאות"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, 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 החבילות הבאות יימחקו (%d MB)"
msgstr[1] "בכדי לענות על התלויות, %d החבילות הבאות יימחקו (%d MB)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "מסיר חבילה %s"
msgstr[1] "מסיר חבילה %s"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (כן/*לא) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "ההסרה נכשלה"
@@ -1399,29 +1514,31 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --help - הצגת הודעת עזרה זו.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr " --env - השתמש בסביבה מסויימת (בדרך כלל דיווח על בעיה).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr " --excludemedia - do not use the given media, separated by comma.\n"
#: ../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 ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - שימוש ברשימת המקורות המופרדים ע\"י פסיק בלבד\n"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../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"
#: ../urpmf:43
@@ -1431,7 +1548,7 @@ msgstr ""
" --synthesis - השתמש בקובץ synthesis המוגדר במקום בסיס הנתונים של "
"urpmi.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1443,7 +1560,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - לא מדפיס שורות זהות.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update -שימוש במאגר העדכונים בלבד.\n"
@@ -1577,75 +1694,85 @@ msgstr " --group - הדפסת קבוצת התג: קבוצה.\n"
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr " --name - הצגת שמות חבילות בלבד.\n"
#: ../urpmf:73
#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr " --name - הצגת שמות חבילות בלבד.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - print tag obsoletes: all obsoletes.\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr " --packager - הדפסת אורז התג: אורז.\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, fuzzy, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - print tag provides: all provides.\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, fuzzy, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - הדפסת דרישות התג: כל הדרישות.\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --size - הדפסת גודל התג: גודל.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, fuzzy, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - הדפסת תג חבילות קוד מקור: source rpm.\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - print tag obsoletes: all obsoletes.\n"
+
+#: ../urpmf:81
#, fuzzy, c-format
msgid " --summary - summary\n"
msgstr " --summary, -S - הצג מידע תמציתי.\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr " --url - print tag url: url.\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr " --verbose - verbose mode.\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -l - הצגת רשימת הקבצים בחבילה.\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - הדפסת גרסה, שחרור וארכיון עם שם.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "שימוש בסביבה מסוימת על %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1654,12 +1781,12 @@ msgstr ""
"Note: מאחר ואף אחד מהמקורות הזמינים לא משתמש ב-hdlists, urpmf לא הצליח למצוא "
"אף תוצאה רלונטית\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "באפשרותך להשתמש ב --name לחפש אחר שמות חבילות.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1676,53 +1803,58 @@ msgstr ""
"\n"
"שימוש:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, fuzzy, 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"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - automatically select packages to upgrade the system.\n"
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - automatically select packages to upgrade the system.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
-msgstr " --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - automatically select packages to upgrade the system.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - נטרל בדיקת חתימת MD5SUM של הקובץ.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - אלץ עדכון מפתח gpg.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
"installation.\n"
-msgstr " --no-uninstall - לעולם אל תבקש להסיר התקנה של חבילה, בטל את ההתקנה.\n"
+msgstr ""
+" --no-uninstall - לעולם אל תבקש להסיר התקנה של חבילה, בטל את ההתקנה.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - אל תתקין חבילות (הורדה בלבד)\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1731,7 +1863,7 @@ msgstr ""
" --keep - keep existing packages if possible, reject requested\n"
" packages that lead to removals.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1742,37 +1874,43 @@ msgstr ""
" are going to be installed or upgraded,\n"
" default is %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - אורך טרנזקציה קצרה, ברירת המחדל היא %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy, -y - מפעיל חיפוש מקורב.\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src, -s - החבילה הבאה היא חבילת מקור.\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr " --install-src - install only source package (no binaries).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - remove rpm from cache before anything else.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - אל תמחק חבילות מהמטמון.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1781,7 +1919,7 @@ msgstr ""
" --allow-nodeps - allow asking user to install packages without\n"
" dependencies checking.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1790,12 +1928,12 @@ msgstr ""
" --allow-force - מאפשר לתשאל את המשתמש אודות התקנת חבילות\n"
" בלי בדיקת תלויות.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - השתמש בשורש מערכת קבצים אחר להתקנת חבילות.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1804,47 +1942,47 @@ msgstr ""
" --use-distrib - הגדר את urpmi בזמן ריצה מעץ חבילות ההפצה, שימושי\n"
" להתקנת chroot עם האפשרות --root.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - use wget to retrieve distant files.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - use curl to retrieve distant files.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, fuzzy, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --curl - use curl to retrieve distant files.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - limit the download speed.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1853,7 +1991,7 @@ msgstr ""
" --resume - המשך בהורדת קבצים שהורדו חלקית מנקודת ההפסקה\n"
" (--no-resume מנטרל זאת, ברירת המחדל היא \"מנוטרל\").\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1862,7 +2000,7 @@ msgstr ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
" to be 1080 by default (format is <proxyhost[:port]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1871,7 +2009,7 @@ msgstr ""
" --proxy-user - specify user and password to use for proxy\n"
" authentication (format is <user:password>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1880,7 +2018,7 @@ msgstr ""
" --bug - ייצר קובץ שגיאות בספריה הנתונה על ידי\n"
" המשתנה הבא.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, fuzzy, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1889,44 +2027,50 @@ msgstr ""
" --verify-rpm - בדוק את חתימת החבילה לפני ההתקנה\n"
" (--no-verify-rpm מנטרל זאת, ברירת המחדל היא \"מאופשר\").\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, fuzzy, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr " --test - וידוי שהתקנת החבילה יכולה להסתיים בהצלחה.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - exclude path separated by comma.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - למעט קבצי מסמכים.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, fuzzy, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
-msgstr " --no-uninstall - לעולם אל תבקש להסיר התקנה של חבילה, בטל את ההתקנה.\n"
+msgstr ""
+" --no-uninstall - לעולם אל תבקש להסיר התקנה של חבילה, בטל את ההתקנה.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --url - print tag url: url.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - הדפסת תיאור התג: תיאור.\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - חבילות שיש לדלג על ההתקנה שלהן\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - חבילות שיש לדלג על ההתקנה שלהן\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1935,66 +2079,67 @@ msgstr ""
" --more-choices - כאשר קיימות מספר חבילות מתאימות, הצע מגוון אפשרויות\n"
" ולא רק את ברירת המחדל.\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - אל תמחק חבילות מהמטמון.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - עדכן רק חבילות בעלות אותה ארכיטקטורה.\n"
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - select all matches on command line.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - allow search in provides to find package.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - do not search in provides to find package.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - מצב שקט.\n"
-#: ../urpmi:157
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " שמות או קובצי RPM שניתנו בשורת הפקודה יותקנו.\n"
-#: ../urpmi:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "מה יכול להיעשות עם קובצי RPM כשמשתמשים --install-src"
-#: ../urpmi:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
-msgstr "הספרייה [%s] כבר קיימת, עליך לבחור ספרייה אחרת לדיווח על תקלה או למחוק אותה"
+msgstr ""
+"הספרייה [%s] כבר קיימת, עליך לבחור ספרייה אחרת לדיווח על תקלה או למחוק אותה"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "יצירת הספרייה. [%s] עבור דיווחי תקלות נכשלה"
@@ -2004,7 +2149,7 @@ msgstr "יצירת הספרייה. [%s] עבור דיווחי תקלות נכש
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2013,46 +2158,48 @@ msgstr ""
"שגיאה: נראה ו-%s עוגן לקריאה בלבד.\n"
"עליך להשתמש ב --allow-force לאלץ פעולה זו."
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (לשדרג)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (לשדרג)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (להתקין)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (להתקין)"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "בכדי לענות על התלויות, %d החבילות הבאות יימחקו (%d MB)"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "מה היא בחירתך? (1-%d)"
-#: ../urpmi:481
+#: ../urpmi:498
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2063,7 +2210,7 @@ msgstr ""
"מגרסאות קודמות מאלו המותקנות במחשבך:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2074,19 +2221,19 @@ msgstr ""
"מגרסאות קודמות מאלו המותקנות במחשבך:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "האם להמשיך בכל זאת?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr "אישור/ביטול (*כ/ל) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2095,7 +2242,7 @@ msgstr ""
"לא יכול להתקין כמה חבילות מבוקשות:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2104,7 +2251,7 @@ msgstr ""
"לא יכול להתקין כמה חבילות מבוקשות:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2115,7 +2262,7 @@ msgstr ""
"יש צורך להסיר אותן, בכדי לשדרג את האחרות:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2126,7 +2273,7 @@ msgstr ""
"יש צורך להסיר אותן, בכדי לשדרג את האחרות:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2135,7 +2282,7 @@ msgstr ""
"החבילות הבאות עומדות להימחק בכדי שניתן יהיה לשדרג חבילות אחרות: \n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2144,12 +2291,17 @@ msgstr ""
"החבילות הבאות עומדות להימחק בכדי שניתן יהיה לשדרג חבילות אחרות: \n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2158,111 +2310,29 @@ msgstr ""
"יש צורך בהרשאות מנהל מערכת בכדי להתקין את התלויות הבאות: \n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, fuzzy, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "נכשלה התקנת החבילות (%s)!"
msgstr[1] "נכשלה התקנת החבילות (%s)!"
-#: ../urpmi:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "נא להקיש Enter"
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "ביטול"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "לחבילות הבאות יש בעיה בחתימות"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "לחבילות הבאות יש בעיה בחתימות"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "האם להמשיך בתהליך ההתקנה?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "ההתקנה נכשלה"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "מפיץ %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "מתקין את %s מתוך %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "מתקין %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "האם לנסות להתקין ללא בדיקת תלויות? (כן/*לא)"
-
-#: ../urpmi:776
-#, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "האם לנסות להתקין תוך אילוץ תלויות (--force)? (כן/לא) "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d עסקת התקנה נכשלה"
-msgstr[1] "%d עסקת התקנה נכשלה"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Installation is possible"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "הכל כבר מותקן"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "הכל כבר מותקן"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "הכל כבר מותקן"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "הכל כבר מותקן"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "מפעיל מחדש את urpmi"
@@ -2367,7 +2437,8 @@ msgstr " --nopubkey - אל תייבא את מפתח האימות של המ
#: ../urpmi.addmedia:69
#, c-format
msgid " --raw - add the media in config, but don't update it.\n"
-msgstr " --raw - הוסף את המקור לרשימה, אבל אל תעדכן את רשימת הקבצים.\n"
+msgstr ""
+" --raw - הוסף את המקור לרשימה, אבל אל תעדכן את רשימת הקבצים.\n"
#: ../urpmi.addmedia:70 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
@@ -2389,49 +2460,49 @@ msgstr " -v - verbose mode.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "עדכון המאגר \"%s\" נכשל\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "רק מנהל מערכת מורשה להוסיף מקור תוכנה"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "יוצר את קובץ ההגדרות [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "אין אפשרות ליצור את קובץ ההגדרות [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "no need to give <relative path of hdlist> with --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "חסר <relative path of hdlist>\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "הוספת המאגר \"%s\" נכשל\n"
@@ -2465,7 +2536,8 @@ msgstr " --noclean - אל תמחק חבילות מהמטמון.\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 ""
#: ../urpmi.recover:38
@@ -2591,17 +2663,17 @@ msgstr " -a - select all media.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - זיהוי מקורב של שמות מקורות.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "רק מנהל מערכת מורשה להסיר מקור תוכנה"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "אין מה להסיר (יש להשתמש ב urpmi.addmedia לצורך הוספת מאגר)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2641,7 +2713,8 @@ msgstr " --no-ignore - אל תעדכן, סמן מקור זה כמאופשר.
#: ../urpmi.update:47
#, fuzzy, c-format
-msgid " --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
msgstr ""
" --no-probe - do not try to find any synthesis or\n"
" hdlist file.\n"
@@ -2656,17 +2729,17 @@ msgstr " -a - בחירת כל המדיות שאינן ניתנות
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - אלץ חילול קבצי hdlist.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "רק מנהל מערכת מורשה לעדכן מקור תוכנה"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "אין מה לעדכן (יש להשתמש ב urpmi.addmedia לצורך הוספת מאגר)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2675,22 +2748,22 @@ msgstr ""
"לא חסרה שום כניסה המיועדת לעדכון\n"
"(אחד מ %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "מתעלם ממקור \"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "מאפשר את המקור %s"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2706,7 +2779,7 @@ msgstr ""
"\n"
"שימוש:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2715,57 +2788,59 @@ msgstr ""
" --searchmedia - השתמש רק במקור הנתון לחיפוש החבילות המבוקשות (או עדכון "
"שלהן).\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - מפעיל חיפוש מקורב (זהה ל -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - list available packages.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - list available media.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - הצגת מאגרי עדכון זמינים ואת כתובתם.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr " --list-nodes - list available nodes when using --parallel.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - list available parallel aliases.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, 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 - ייצא את ההגדרות במבנה של משתני urpmi.addmedia.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr " --src - החבילה הבאה היא חבילת מקור (אותו הדבר כמו -s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, 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"
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --url - print tag url: url.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2774,22 +2849,23 @@ msgstr ""
" --use-distrib - הגדר את urpmi בזמן ריצה מעץ חבילות ההפצה.\n"
" דבר זה מאפשר להפעיל שאילתות על הפצה.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - הדפס דו\"ח שינויים.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - הצג מידע תמציתי.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
-msgstr " --whaterquires - בצע חיפוש הפוך אחר חבילות הדורשות את החבילה המוגדרת.\n"
+msgstr ""
+" --whaterquires - בצע חיפוש הפוך אחר חבילות הדורשות את החבילה המוגדרת.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2798,106 +2874,117 @@ msgstr ""
" --whatrequires-recursive\n"
" - חיפוש הפוך מורחב (כולל חבילות וירטואליות).\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -p - search in provides to find package.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -a - בחירת כל החבילות עם ביטוי מתאים.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - הרחב את השאילתה לתלויות החבילות.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - הצג גם קבוצות עם שם זה.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - הדפס מידע שימושי באופן המובן לבני-אנוש.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - הצגת רשימת הקבצים בחבילה.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - מצב שקט.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - print version and release with name also.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - החבילה הבאה היא חבילת מקור (אותו הדבר כמו --src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
msgstr " -u - הסרת חבילה אם גרסה מאוחרת יותר כבר מותקנת.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - impose fuzzy search (same as --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -Y - כמו -y, אבל מאלץ בדיקה תלויית רישיות.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " שמות או קובצי RPM שניתנו בשורת הפקודה נמצאים בסימן שאלה.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes ניתן לשימוש רק ביחד עם --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"Note: מאחר ואף אחד מהמקורות הזמינים לא משתמש ב-hdlists, urpmf לא הצליח למצוא "
"אף תוצאה רלונטית\n"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, fuzzy, c-format
-msgid "no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
"Note: מאחר ואף אחד מהמקורות הזמינים לא משתמש ב-hdlists, urpmf לא הצליח למצוא "
"אף תוצאה רלונטית\n"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "לא נמצאה רשימת שינויים\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "לחבילות הללו יש חתימה לא תקינה:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "האם להמשיך את ההתקנה?"
diff --git a/po/hi.po b/po/hi.po
index 2361f9fc..227f5040 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2005-08-23 20:11+0530\n"
"Last-Translator: धनञ्जय शर्मा (Dhananjaya Sharma)\n"
"Language-Team: Hindi, India\n"
@@ -18,7 +18,7 @@ msgstr ""
"X-Generator: KBabel 1.10\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "आरपीएम संसाधन"
@@ -28,7 +28,7 @@ msgstr "आरपीएम संसाधन"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "ठीक (_O)"
@@ -94,7 +94,7 @@ msgstr "संसाधन (_I)"
msgid "_Save"
msgstr "सुरक्षित (_S)"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "खत्म करें (_C)"
@@ -116,17 +116,17 @@ msgstr ""
msgid "No packages specified"
msgstr "%s नाम का कोई पैकेज नहीं है"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "कृपया प्रतीक्षा करें..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "रूट होना चाहिए"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -136,42 +136,42 @@ msgstr ""
"निवेदित किये हुए कुछ पैकेज संसाधित नहीं किये जा सके:\n"
"%sजारी रहा जाएँ?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "चेतावनी"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "ओ०के०"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr "(अपग्रेड के लिए)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr "(संसाधन के लिए)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "पैकेज चयन"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "निम्नलिखित पैकेजों में से एक की आवश्यकता है:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "निष्फ़ल (_A)"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -181,14 +181,14 @@ msgstr ""
"अन्य पैकजों को उन्नयन करने के लिए, निम्नलिखित पैकेजों हटाना होगा:\n"
"%sजारी रहा जाएँ?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
"आधीनताओं को सन्तुष्ट करने के लिए, निम्नलिखित पैकेज का संसाधन होने जा रहा है(%d एमबी)"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -196,47 +196,49 @@ msgstr ""
"अधीनताओं को सन्तुष्ट करने के लिए, निम्नलिखित %d पैकेजों का संसाधन होने जा रहा है:\n"
"%s\n"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, fuzzy, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "%d पैकेज"
msgstr[1] "%d पैकेज"
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "पैकेज संसाधित हो रहा है..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "स्रोत्र पैकेजों को पाने में असमर्थ, कार्यक्रम विफ़ल किया जा रहा है"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "तैयारी की जा रही है..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "`%s' (%s/%s) पैकेज को संसाधित किया जा रहा है..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "कृपया \"%s\" नामक माध्यम को [%s] साधन पर प्रवेश करें"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "`%s' पैकेज को डॉउनलोड किया जा रहा है..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"निम्नलिखित पैकेजों के हस्ताक्षर खराब है:\n"
-"%s\n"
-"\n"
-"क्या आप संसाधन जारी रखना चाहते है?"
+msgid "_Done"
+msgstr "किया गया(_D)"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -247,41 +249,27 @@ msgstr ""
"%s\n"
"आपको अपना यू०आर०पी०एम०आई० डाटाबेस को अपडेट करना चाहिए"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "%s को हटाया जा रहा है"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "तैयारी की जा रही है..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "`%s' (%s/%s) पैकेज को संसाधित किया जा रहा है..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "किया गया(_D)"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "संसाधन असफ़ल"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "सभी कुछ पहिले से ही संसाधित है"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "संसाधन समाप्त"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "%s को हटाया जा रहा है"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -316,7 +304,7 @@ msgstr " -g - समूहों को नाम के साथ
msgid " defaults to %s.\n"
msgstr " %s डिफ़ाल्ट है ।\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "सिर्फ़ महाउपयोगकर्ता को ही पैकेजों को संसाधित करने की अनुमति है"
@@ -326,98 +314,98 @@ msgstr "सिर्फ़ महाउपयोगकर्ता को ही
msgid "Running urpmi in restricted mode..."
msgstr "यूआरपीएमआई सीमित विधा में चल रही है..."
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "आर०पी०एम०डी०बी० को खोलने में असमर्थ"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "अवैध आर०पी०एम० संचिका नाम [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "आर०पी०एम० संचिका [%s] को पुनः प्राप्त किया जा रहा है..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...पुनः प्राप्त करने की क्रिया संपन्न"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...पुनः प्राप्त करने में असफ़लता: %s "
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "आर०पी०एम० संचिका [%s] को पाने में असमर्थ"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "\"%s\" का पदभंजन [%s] संचिका में करने में असमर्थ"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "आर०पी०एम० संचिका का पंजीकरण में असमर्थ"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "स्थानीय पैकेजों का पंजीकरण करने में त्रुटि"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "सीमित विधा में चलते समय, इस संक्रिया को मनाही है"
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "निर्देश वाक्य पर निकृष्ट प्रोक्सी की घोषणा\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: आर०पी०एम० संचिका \"%s\" को नहीं पढ़ सकता है\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "\"%s\" माध्यम के लिए हार्डडिस्क-सूची की कृत्रिम संचिका बनायें"
@@ -607,7 +595,12 @@ msgstr "%s पैकेज नहीं मिला"
msgid "malformed URL: [%s]"
msgstr "भ्रष्ट इन्पुट: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "\"%s\" माध्यम से आर०पी०एम० संचिकाऐं पुनः प्राप्त की जा रही है..."
@@ -617,7 +610,7 @@ msgstr "\"%s\" माध्यम से आर०पी०एम० संच
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -625,37 +618,42 @@ msgstr ""
"%s पर संसाधन करने के लिए कार्य-संपादन का निर्माण किया गया (हटाना=%d, संसाधन=%d, "
"उन्नयन=%d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "कार्य संपादन का निर्माण करने में असमर्थ"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "delta-rpm पैकेज %s से आरपीएम को बाहर निकालने में असमर्थ"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "%s पैकेज को जोड़ा जा रहा है (आई०डी०=%d, ई०आई०डी०=%d, उन्नयन=%d, संचिका=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "%s पैकेज को संसाधन करने में असमर्थ"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "%s पैकेज को हटाया जा रहा है"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "%s पैकेज को हटाया जा रहा है"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "%s को %s से संसाधित किया जा रहा है"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "%s पैकेज के बारे में और अधिक सूचना"
@@ -685,11 +683,103 @@ msgstr "%s नाम का कोई पैकेज नहीं है"
msgid "Cannot connect to ldap uri:"
msgstr "रंगमैप प्रविष्टियां आवंटित नहीं की जा सकती है"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "यू०आर०पी०एम०आई० डाटाबेस बंद है"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "चेतावनी"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "यू०आर०पी०एम०आई० डाटाबेस बंद है"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "निम्नलिखित पैकेजों पर खराब हस्ताक्षार है"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "निम्नलिखित पैकेजों पर खराब हस्ताक्षार है"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "क्या आप संसाधन जारी रखना चाहते है ?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "संसाधन असफ़ल"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "%s वितिरण किया जा रहा है"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "%s को %s से संसाधित किया जा रहा है"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "%s का संसाधन किया जा रहा है"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "संसाधन का प्रयास बिना आधिनताओं की जाँच किये हुए किया जाये? (हाँ/ना)(y/N) "
+
+#: ../urpm/main_loop.pm:205
+#, fuzzy, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "संसाधन का प्रयास और जोर से (बलपूर्वक) किया जाये (--force)? (हाँ/ना)(y/N) "
+
+#: ../urpm/main_loop.pm:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d संसाधन क्रिया-कलाप असफ़ल"
+msgstr[1] "%d संसाधन क्रिया-कलाप असफ़ल"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "संसाधन संभव है"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "सभी कुछ पहिले से ही संसाधित है"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "सभी कुछ पहिले से ही संसाधित है"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "सभी कुछ पहिले से ही संसाधित है"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "सभी कुछ पहिले से ही संसाधित है"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -742,7 +832,7 @@ msgstr "अविद्यमान माध्यम \"%s\" को चयन
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "\"%s\" माध्यम के लिए हार्डडिस्क-सूची की कृत्रिम संचिका बनायें"
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "\"%s\" की हार्डडिस्क संचिका-सूची को पाने में असमर्थ, माध्यम स्वीकार नहीं है"
@@ -837,7 +927,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "खोज आरम्भ: %s समाप्त: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "आधीनताओं की गणना का द्वितीय चरण पूरा किया जा रहा है\n"
@@ -902,67 +992,72 @@ msgstr "आर०पी०एम०डी०बी० को खोलने म
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "प्रथम संसाधन माध्यम को पाने में असमर्थ (कोई हार्डडिस्क सूची संचिका नहीं मिली)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "अविद्यमान माध्यम \"%s\" को चयन का प्रयास किया जा रहा है"
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "बहुत सारे माध्यमों का चयन हो रहा है: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "\"%s\" माध्यम को हटाया जा रहा है"
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "\"%s\" माध्यम हेतु यू०आर०पी०एम०आई० को पुनः संरचित किया जा रहा है"
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...पुनःसंरचना प्रक्रिया असफ़ल"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "पुनःसंरचना प्रक्रिया सम्पन्न हुई"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "माध्यम \"%s\" का चयन नहीं किया गया है"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "हार्डडिस्क-सूची संचिका [%s] का निरीक्षण किया जा रहा है"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "कृत्रिम संचिका [%s] का निरीक्षण किया जा रहा है"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "हार्डडिस्क-सूची [%s] का निर्माण किया जा रहा है"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -971,81 +1066,81 @@ msgstr ""
"\"%s\" माध्यम के लिए कृत्रिम संचिका का निर्माण करने में असमर्थ । सम्भवता आपकी हार्डडिस्क-"
"सूची भ्रष्ट हो गयी है ।"
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "\"%s\" माध्यम की हार्डडिस्क सूची संचिका या कृत्रिम संचिका को पढ़ने में सामस्या"
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "\"%s\" माध्यम के लिए संचिका-सूची लिखी जा रही है"
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...प्रतिलिपि बनना असफ़ल"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "\"%s\" संचिका के विवरण की प्रतिलिपि बनायी जा रहीं है..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...प्रतिलिपि बनना सम्पन्न हुआ"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "[%s] की प्रतिलिपि असफ़ल रही (संचिका सन्देहात्मक ढ़ग से छोटी है)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr ""
"स्रोत्र हार्डडिस्क सूची (या कृत्रिम रचनाओं) की प्रतिलिपियों की एम०डी०५सम (md5sum) की "
"गणना की जा रही है"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "[%s] की प्रतिलिपि अयोग्य है (एमडी५सम बेमेल है)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr ""
"पुनः प्राप्त की हुई स्रोत्र हार्डडिस्क सूची (या कृत्रिम रचना) के एम०डी०५सम (md5sum) की "
"गणना की जा रही है"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...पुनः प्राप्त करने में असफ़लता: एम०डी०५सम (md5sum) बेमेल "
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "[%s] कि लिए कोई आर०पी०एम० संचिकाऐं नहीं मिली"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "[%s] से आर०पी०एम० संचिकाओं को पढ़ा जा रहा है"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "आर०पी०एम० संचिकाओं को [%s] से पढ़ने में असमर्थ: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "कोई आरपीएमएस नहीं पढ़ा गया"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1055,74 +1150,74 @@ msgstr ""
"\"%s\" माध्यम की पहुँच में असमर्थ,\n"
"यह सम्भव है जब आपने माध्यम का निर्माण करते समय, निर्देशिका कोस्वंम ही आरोहित किया हो।"
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "\"%s\" माध्यम के लिए कोई हार्डडिस्क सूची संचिका नहीं मिली"
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "\"%s\" की मूल (या कृत्रिम) हार्डडिस्क सूची पुनः प्राप्त की जा रही है..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "खोजी हुई हार्डडिस्क सूची (या कृत्रिम रचना)%s के रूप में मिली"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "\"%s\" माध्यम के लिए कोई हार्डडिस्क सूची संचिका नहीं मिली"
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "\"%s\" की सामान्यजन कूंजी संचिका का निरीक्षण किया जा रहा है..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...\"%s\" की पब्लिककुंजी संचिका से %s कुंजी आयातित कर ली गई है"
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "\"%s\" की सामान्यजनकुंजी संचिका को आयात करने में असमर्थ"
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "\"%s\" माध्यम के लिए संचिका-सूची लिखी जा रही है"
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "%s माध्यम को जोड़ा गया"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "\"%s\" की हार्डडिस्क संचिका का पदभंजन करने में असमर्थ"
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "\"%s\" माध्यम की कृत्रिम संचिका को पढ़ने में समस्या"
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "\"%s\" माध्यम से शीर्षक पढ़े जा रहे है"
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "Yy"
@@ -1182,47 +1277,52 @@ msgstr "बेमेल माध्यम \"%s\" को हटानेयो
msgid "unable to access medium \"%s\""
msgstr "\"%s\" माध्यम को पाने में असमर्थ"
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "%s नाम का कोई पैकेज नहीं है"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "निम्नलिखित पैकेज %s को समाहित करते है: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "%s के ना मिलने के कारण"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "सभी कुछ पहिले से ही संसाधित है"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "असन्तुष्ट %s के कारण"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "%s को प्रोत्साहित करने का प्रयास किया जा रहा है"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "%s को रखने के लिए"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "%s को संसाधित के लिए"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "%s के साथ विरोधाभास के कारण"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "बिना निवेदन किया हुआ"
@@ -1242,6 +1342,16 @@ msgstr "अवैध कुंजी आई०डी० (%s)"
msgid "Missing signature (%s)"
msgstr "विलुप्त हस्ताक्षर (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "संरचना-संचिका [%s] को निर्माण नहीं कर सकता है"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "प्रतिलिपि बनना असफ़ल"
+
#: ../urpme:40
#, fuzzy, c-format
msgid ""
@@ -1259,8 +1369,8 @@ msgstr ""
"\n"
"उपयोग विधि:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - यह सहायता संदेश मुद्रित करें\n"
@@ -1275,7 +1385,7 @@ msgstr " --auto - इच्छित पैकेजों में
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - जाँच करें कि सही-सही तरीके से हटाया जा सकता है\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
@@ -1283,13 +1393,13 @@ msgstr ""
" --force - यद्यपि कुछ पैकेज ना विद्यमान हो, तो भी इनवोकेशन को बल-पूर्वक लागू "
"करें \n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
" --parallel - वितरित यू०आर०पी०एम०आई०, उपनाम वाली प्रणालीयों के बीच में\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - टैग पैकेजर को मुद्रित करना: पैकेजर\n"
@@ -1299,8 +1409,8 @@ msgstr " --packager - टैग पैकेजर को मुद्र
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - आरपीएम को हटाने के अन्य रूट का उपयोग\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - आरपीएम संसाधन के लिए अन्य रूट का उपयोग\n"
@@ -1320,17 +1430,17 @@ msgstr ""
" एक सीएचरूट को --root विकल्प के साथ संसाधित (असंसाधित) करने में "
"उपयोगी।\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - कृत्रिम संचिका को खोजने और उपयोग करने के प्रयास\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - हार्डडिस्क सूची संचिका को खोजना और उपयोग करना\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - शब्दों का वॄथा प्रयोगिक विधि\n"
@@ -1340,37 +1450,37 @@ msgstr " --verbose - शब्दों का वॄथा प्रय
msgid " -a - select all packages matching expression.\n"
msgstr " -a - मिलती हुई अभिव्यक्तियों वाले सभी पैकेजों का चयन करें\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "सिर्फ़ रूट यूज़र को ही पैकेजों को हटाने की अनुमति है"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "पैकेजों का प्रकार अज्ञात"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "अज्ञात पैकेज"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "%s पैकेज को हटाने से आपकी प्रणाली नष्ट हो जायेगी"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "हटाने को कुछ भी नहीं"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "निम्नलिखित पैकेजों को हटाने जाने के लिए जाँच हो रही है"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1380,24 +1490,24 @@ msgstr[0] ""
msgstr[1] ""
"अधिनताओं को सन्तुष्ट करने के लिए, निम्नलिखित पैकेजों %d को हटाया जायेगा (%d एमबी)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "%s पैकेज को हटाया जा रहा है"
msgstr[1] "%s पैकेज को हटाया जा रहा है"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr "(हाँ/ना:y/N)"
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "हटाना असफ़ल"
@@ -1424,12 +1534,12 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --help - यह सहायता संदेश मुद्रित करें\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr " --env - विशिष्ट वातावरण का उपयोग (आदर्श रूप में एक दोष रिपोर्ट)\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1442,14 +1552,14 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - सिर्फ़ दिए गए माध्यम का उपयोग करें, छोटे विराम चिह्न के द्वारा अलग "
"किये हुए\n"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1463,7 +1573,7 @@ msgid " --use-distrib - use the given path to access media\n"
msgstr ""
" --synthesis - यू०आर०पी०एन०आई० डी०बी० के बजाय, दी हुई कृत्रिमता का उपयोग करें\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1474,7 +1584,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - एक जैसे वाक्यों को मुद्रित ना करें\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - सिर्फ़ अपडेट माध्यम का ही उपयोग करें\n"
@@ -1608,75 +1718,85 @@ msgstr " --group - टैग समूह को मुद्रित
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr " --name - सिर्फ़ पैकेजों के नामों को मुद्रित करें\n"
#: ../urpmf:73
#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr " --name - सिर्फ़ पैकेजों के नामों को मुद्रित करें\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - टैग के अप्रचलितों को मुद्रित करें: सभी लुप्तप्रयोग\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr " --packager - टैग पैकेजर को मुद्रित करना: पैकेजर\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, fuzzy, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - टैग की उपलब्धियां मुद्रित करें: सभी उपलब्धियां\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, fuzzy, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - टैग की आवश्यकताऐं मुद्रित करें: सभी आवश्यकताऐं (बहु-वाक्य)\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --size - टैग आकार को मुद्रित करें: आकार\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, fuzzy, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - टैग स्रोत्र आर०पी०एम० को मुद्रित करें: स्रोत्र आर०पी०एम०\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - टैग के अप्रचलितों को मुद्रित करें: सभी लुप्तप्रयोग\n"
+
+#: ../urpmf:81
#, fuzzy, c-format
msgid " --summary - summary\n"
msgstr " --summary, -S - सारांश को मुद्रित करना।\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr " --url - टैग यू०आर०एल० को मुद्रित करें:यू०आर०एल०\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr " --verbose - शब्दों का वॄथा प्रयोगिक विधि\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -l - पैकेज में स्थित संचिकाओं की सूची।\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - \tमुद्रित संस्मरण, विमोचन और आर्च नाम के साथ\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "%s पर विशिष्ट वातावरण का उपयोग करते हुए\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1685,12 +1805,12 @@ msgstr ""
"सूचना: क्योंकि खोज किये गये माध्यम ने एचडीसूचियों का उपयोग किया, अतैव यूआरपीएमएफ़ किसी "
"परिणाम को बताने में असमर्थ रहा था\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "पैकेज के नामों की खोज हेतु आप --name का उपयोग करना चाहेगें।\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, fuzzy, c-format
msgid ""
"urpmi version %s\n"
@@ -1707,7 +1827,7 @@ msgstr ""
"\n"
"उपयोग विधि:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1715,35 +1835,35 @@ msgstr ""
" --searchmedia - निवेदित (या अपडेट किये हुए) पैकेजों की खोज के लिए, सिर्फ़ दिए गए "
"माध्यम का उपयोग करें ।\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr " --auto-select - प्रणाली को उन्नयन बनाने के लिए, स्वतः पैकेजों का चयन करें\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr " --auto-select - प्रणाली को उन्नयन बनाने के लिए, स्वतः पैकेजों का चयन करें\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, fuzzy, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - एम०डी०-५ सम संचिका की जाँच निष्क्रिय ।\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, fuzzy, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - जीपीजी कुँजी का बलपूर्वक उन्नयन ।\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1751,12 +1871,12 @@ msgid ""
msgstr ""
" --no-uninstall - एक पैकेज को असंसाधित करने के लिए कभी ना पूछेना,संसाधन को रोकना\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - पैकेजों को संसाधित ना करना (सिर्फ़ डॉउनलोड करना)\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1766,7 +1886,7 @@ msgstr ""
"अस्वीकार करें,\n"
" जिनके कारण से हटाना पड़ रहा है।\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1777,37 +1897,43 @@ msgstr ""
"को संसाधित या उन्नयत किया जाना है,\n"
" सामान्य संख्या %d है।\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - लघु क्रिया-कलाप लंबाई, सामान्य संख्या %d है।\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, fuzzy, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy - अस्पष्ट खोज को लागू करें (-y जैसा)\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, fuzzy, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src - अगला पैकेज एक स्रोत्र पैकेज है (-s जैसा)\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr " --install-src - सिर्फ़ स्रोत्र पैकेज को संसाधित करें (कोई बॉयनरी नहीं)\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - कुछ भी करने कि पहिले आर०पी०एम० को कैश से हटाना\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - कैश में से आरपीएमों की सफ़ाई ना करना\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1816,7 +1942,7 @@ msgstr ""
" --allow-nodeps - उपयोगकर्ता को, पैकेजों को बिना अधिनताओं की जाँच करें,\n"
" संसाधित करने के लिए प्रश्न पूछने की अनुमति प्रदान करें\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1825,12 +1951,12 @@ msgstr ""
" --allow-force - उपयोगकर्ता को, पैकेजों को बिना अधिनताओं और अखंडता की जाँच करें,\n"
" संसाधित करने के लिए प्रश्न पूछने की अनुमति प्रदान करें\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - आरपीएम संसाधन के लिए अन्य रूट का उपयोग\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1840,48 +1966,48 @@ msgstr ""
" एक सीएचरूट को --root विकल्प के साथ संसाधित (असंसाधित) करने में "
"उपयोगी।\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr ""
" --wget - डबलू०गेट का उपयोग दूर स्थित संचिकाओं को प्राप्त करने के लिए करें\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - कर्ल का उपयोग दूर स्थित संचिकाओं को प्राप्त करने के लिए करें\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, fuzzy, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --curl - कर्ल का उपयोग दूर स्थित संचिकाओं को प्राप्त करने के लिए करें\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - डॉउनलोड के वेग को सीमित करें\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1890,7 +2016,7 @@ msgstr ""
" --resume - अधूरी-डॉउनलोड-की-हुई संचिकाओं के स्थानान्तरण का पुनः आरम्भ\n"
" (--no-resume इसे असक्रिय करता है, डिफ़ॉल्ट असक्रिय है)।\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1900,7 +2026,7 @@ msgstr ""
"डिफ़ॉल्ट कल्पना १०८० के रूप में\n"
" कर ली गई है (निर्देश देने का तरीका <प्रोक्सी होस्ट[:पोर्ट]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1909,7 +2035,7 @@ msgstr ""
" --proxy-user - प्रोक्सी प्रमाणीकरण के लिए उपयोगकर्ता और कूटशब्द बतायें\n"
" (निर्देश देने का तरीका <उपयोगकर्ता:कूटशब्द>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1918,7 +2044,7 @@ msgstr ""
" --bug - एक दोष रिपोर्ट को अगले मान के द्वारा बताई गयी निर्देशिका में\n"
" निर्गम करें\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, fuzzy, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1927,45 +2053,50 @@ msgstr ""
" --verify-rpm - संसाधन के पहिले, आर०पी०एम० हस्ताक्षर की जाँच करें\n"
" (--no-verify-rpm इसे अयोग्य करता है, डिफ़ॉल्ट जाँच के साथ है).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, fuzzy, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr " --test - जाँच करें कि संसाधन सफ़लता-पूर्वक किया जा सकता है\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - पथ को अलग करें, छोटे विराम चिह्न के द्वारा अलग किये हुए\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - प्रलेखन संचिकाओं को अलग करके।\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, fuzzy, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --no-uninstall - एक पैकेज को असंसाधित करने के लिए कभी ना पूछेना,संसाधन को रोकना\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --url - टैग यू०आर०एल० को मुद्रित करें:यू०आर०एल०\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - टैग विवरण मुद्रित करें: विवरण\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - पैकेजों जिनका संसाधन छोड़ा जाना चाहिए\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - पैकेजों जिनका संसाधन छोड़ा जाना चाहिए\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1974,62 +2105,62 @@ msgstr ""
" --more-choices - जब अनेको पैकेज मिल जाते है, तब डिफ़ाल्ट के स्थान पर अनेको "
"विकल्प चयन हेतु प्रस्तावित होते है ।\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - कैश में से आरपीएमों की सफ़ाई ना करना\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - समान संरचना वाले पैकेजों को ही अपग्रेड करें।\n"
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - निर्देश वाक्य पर सभी मिलानों को चयन करें\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - पूर्वनिर्दिष्टों में पैकेज को पाने के लिए खोज की अनुमति प्रदान करें\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - पूर्वनिर्दिष्टों में पैकेज को पाने के लिए ना खोजे\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - शांत विधि\n"
-#: ../urpmi:157
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr "निर्देश वाक्य पर दिये हुए नाम या आर०पी०एम० संचिकाऐं संसाधित की जायेगी\n"
-#: ../urpmi:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
"द्विआधारी आर०पी०एम० संचिकाओं के साथ क्या किया जा सकता है, जब --install-src निर्देश "
"का उपयोग किया जा रहा हो"
-#: ../urpmi:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2038,7 +2169,7 @@ msgstr ""
"[%s] निर्देशिका पहिले से विद्यमान है, कृपया दोष रिपोर्ट के लिए अन्य निर्देशिका का उपयोग "
"करेंया इसे हटा दें ।"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "दोष रिपोर्ट के लिए, [%s] निर्देशिका का निर्माण करने में असमर्थ"
@@ -2048,7 +2179,7 @@ msgstr "दोष रिपोर्ट के लिए, [%s] निर्द
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2057,46 +2188,48 @@ msgstr ""
"त्रुटि: सम्भवता %s को सिर्फ़-पढ़ने-के लिए माउन्ट किया गया लगता है ।\n"
"इस प्रक्रिया को बल-पूर्वक करने के लिए --allow-force विकल्प का उपयोग करें ।"
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "(अपग्रेड के लिए)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "(अपग्रेड के लिए)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "(संसाधन के लिए)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "(संसाधन के लिए)"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "अधिनताओं को सन्तुष्ट करने के लिए, निम्नलिखित पैकेजों %d को हटाया जायेगा (%d एमबी)"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "आपकी क्या इच्छा है? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2107,7 +2240,7 @@ msgstr ""
"संसाधित किये जा चुके पैकेजो से पहिले के है:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2118,19 +2251,19 @@ msgstr ""
"संसाधित किये जा चुके पैकेजो से पहिले के है:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "कुछ भी हो जारी रहा जायें?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr "(हाँ/ना:Y/n)"
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2139,7 +2272,7 @@ msgstr ""
"निवेदन किये हुए कुछ पैकेज संसाधित नहीं किये जा सके:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2148,7 +2281,7 @@ msgstr ""
"निवेदन किये हुए कुछ पैकेज संसाधित नहीं किये जा सके:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2159,7 +2292,7 @@ msgstr ""
"निम्नलिखित पैकेजों को हटाना पड़ेगा:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2170,7 +2303,7 @@ msgstr ""
"निम्नलिखित पैकेजों को हटाना पड़ेगा:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2179,7 +2312,7 @@ msgstr ""
"अन्य पैकजों को उन्नयन करने के लिए, निम्नलिखित पैकेजों हटाना होगा:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2188,12 +2321,17 @@ msgstr ""
"अन्य पैकजों को उन्नयन करने के लिए, निम्नलिखित पैकेजों हटाना होगा:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2202,111 +2340,29 @@ msgstr ""
"निम्नलिखित आधिनताओं को संसाधित करने लिए, आपको महाउपयोगकर्ता होना चाहिए:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, 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:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "तैयार होने पर इन्टर (Enter) कुंजी को दबायें..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "निरस्त"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "निम्नलिखित पैकेजों पर खराब हस्ताक्षार है"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "निम्नलिखित पैकेजों पर खराब हस्ताक्षार है"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "क्या आप संसाधन जारी रखना चाहते है ?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "संसाधन असफ़ल"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "%s वितिरण किया जा रहा है"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "%s को %s से संसाधित किया जा रहा है"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "%s का संसाधन किया जा रहा है"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "संसाधन का प्रयास बिना आधिनताओं की जाँच किये हुए किया जाये? (हाँ/ना)(y/N) "
-
-#: ../urpmi:776
-#, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "संसाधन का प्रयास और जोर से (बलपूर्वक) किया जाये (--force)? (हाँ/ना)(y/N) "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d संसाधन क्रिया-कलाप असफ़ल"
-msgstr[1] "%d संसाधन क्रिया-कलाप असफ़ल"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "संसाधन संभव है"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "सभी कुछ पहिले से ही संसाधित है"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "सभी कुछ पहिले से ही संसाधित है"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "सभी कुछ पहिले से ही संसाधित है"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "सभी कुछ पहिले से ही संसाधित है"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "यू०आर०पी०एम०आई० को पुनः आरम्भ किया जा रहा है"
@@ -2437,49 +2493,49 @@ msgstr " -v - शब्दों का वॄथा प्रय
msgid "unable to update medium \"%s\"\n"
msgstr "\"%s\" माध्यम को अपडेट करने में असमर्थ\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "सिर्फ़ महाउपयोगकर्ता को ही माध्यम को जोड़ने की अनुमति है"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "संरचना-संचिका [%s] का निर्माण करेगा"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "संरचना-संचिका [%s] को निर्माण नहीं कर सकता है"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "<हार्डडिस्क सूची का सापेक्ष पथ> --distrib के साथ देने की कोई आवश्यकता नहीं है"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<हार्डडिस्क सूची का सापेक्ष पथ> लुप्त है\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "\"%s\" माध्यम का निर्माण करने में असमर्थ\n"
@@ -2640,18 +2696,18 @@ msgstr " -a - सभी माध्यमों का चयन
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - माध्यम नामों में अस्पष्ट मेल\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "सिर्फ़ महाउपयोगकर्ता को ही माध्यम को हटाने की अनुमति है"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr ""
"हटाने को कुछ भी नहीं (urpmi.addmedia निर्देश का उपयोग एक माध्यम को जोड़ने के लिए करें)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2708,19 +2764,19 @@ msgstr " -a - सभी स्थिर माध्यमों
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - हार्डडिस्क सूची संचिकाओं का बल-पूर्वक निर्माण\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "सिर्फ़ महाउपयोगकर्ता को ही माध्यम को अपडेट करने की अनुमति है"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
"अपडेट करने को कुछ भी नहीं (urpmi.addmedia निर्देश का उपयोग एक माध्यम को जोड़ने के लिए "
"करें)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2729,22 +2785,22 @@ msgstr ""
"अपडेट की जाने वाली प्रविष्टि लुप्त है\n"
"(%s में से एक)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "\"%s\" माध्यम की ओर ध्यान नहीं दिया जा रहा है"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "\"%s\" माध्यम को सक्रिय किया जा रहा है"
-#: ../urpmq:43
+#: ../urpmq:40
#, fuzzy, c-format
msgid ""
"urpmq version %s\n"
@@ -2761,7 +2817,7 @@ msgstr ""
"\n"
"उपयोग विधि:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2770,39 +2826,39 @@ msgstr ""
" --searchmedia - निवेदित (या अपडेट किये हुए) पैकेजों की खोज के लिए, सिर्फ़ दिए गए "
"माध्यम का उपयोग करें ।\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - अस्पष्ट खोज को लागू करें (-y जैसा)\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - उपलब्ध पैकेजों को दिखायें\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - उपलब्ध माध्यमों को दिखायें\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - उपलब्ध माध्यमों और उनके यूआरएल को दिखायें\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
" --list-nodes - उपलब्ध नोडस को दिखायें, जब --parallel विकल्प का उपयोग किया जा "
"रहा हो\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - उपलब्ध समान्तर नामों को दिखायें\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
@@ -2810,24 +2866,24 @@ msgstr ""
" --dump-config - यूआरपीएमआई.एडमीडीया.आर्गूमेन्ट (urpmi.addmedia argument) के "
"प्रारुप में संरचना को डम्प करना।\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr " --src - अगला पैकेज एक स्रोत्र पैकेज है (-s जैसा)\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr ""
" --sources - सभी स्रोत्र पैकेजों को डॉउनलोड के पहिले दें (सिर्फ़ महाउपयोगकर्ता)\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --url - टैग यू०आर०एल० को मुद्रित करें:यू०आर०एल०\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2836,22 +2892,22 @@ msgstr ""
" --use-distrib - एक वितरित वृक्ष के लिए यूआरपीएमआई की देखते-देखते संरचना।\n"
" यह एक वितरण की पूछ-ताछ करने की अनुमति देता है।\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " -changelog - परिवर्तन लॉग का मुद्रण\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - सारांश को मुद्रित करना।\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - पैकेजों की जो आवश्यक है उससे विपरीत खोज करें\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2860,100 +2916,100 @@ msgstr ""
" --whatrequires-recursive\n"
" - विपरीत खोज को विस्तृत करना (काल्पनिक पैकेजों को शामिल करके)।\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -p - पूर्वनिर्दिष्टों में पैकेज पाने के लिए खोज ।\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - सम्पूर्ण आउटपुट को पैकेज के साथ हटायें\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - जाँच को पैकेज की अधिनताओं तक ले जायें\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - समूहों को नाम के साथ मुद्रित करें\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - उपयोगी सूचनाओं का पठनीय रूप में मुद्रण\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - पैकेज में स्थित संचिकाओं की सूची।\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - शांत विधि\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - संस्मरण और विमोचन संख्या को नाम के साथ मुद्रित करें\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - अगला पैकेज एक स्रोत्र पैकेज है (--src जैसा)\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
msgstr "-u - पैकेज को हटायें यदि एक अत्यधिक नवीन संस्मरण पहिले सेसंसाधित है\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - अस्पष्ट खोज को लागू करें (--fuzzy जैसा)\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - -y जैसा, परन्तु बिना छोटे-बड़े शब्दों के आधार पर मिलान करने को "
"बांधित करता है\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " निर्देश वाक्य पर दिये हुए नामों या आर०पी०एम० संचिकाओं की जाँच की गई है\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes को सिर्फ़ --parallel के साथ उपयोग किया जा सकता है"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"सूचना: क्योंकि खोज किये गये माध्यम ने एचडीसूचियों का उपयोग किया, अतैव यूआरपीएमएफ़ किसी "
"परिणाम को बताने में असमर्थ रहा था\n"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2961,11 +3017,22 @@ msgstr ""
"सूचना: क्योंकि खोज किये गये माध्यम ने एचडीसूचियों का उपयोग किया, अतैव यूआरपीएमएफ़ किसी "
"परिणाम को बताने में असमर्थ रहा था\n"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "कोई परिवर्तनलॉग नहीं मिला\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "निम्नलिखित पैकेजों के हस्ताक्षर खराब है:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "क्या आप संसाधन जारी रखना चाहते है?"
+
#, fuzzy
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "इस निर्देश को उपयोग करने के लिए आपको महा-उपयोगकर्ता होना चाहिए !\n"
diff --git a/po/hr.po b/po/hr.po
index 333e567e..5b77118d 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2005-01-04 21:27+CET\n"
"Last-Translator: auto\n"
"Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -16,7 +16,7 @@ msgstr ""
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;;\n"
"X-Generator: TransDict server\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, fuzzy, c-format
msgid "RPM installation"
msgstr "Pripremam instalaciju"
@@ -26,7 +26,7 @@ msgstr "Pripremam instalaciju"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_U redu"
@@ -76,7 +76,7 @@ msgstr "Instaliraj"
msgid "_Save"
msgstr "_Spremi"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Odustani"
@@ -98,17 +98,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Naredba nije specificirana"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Molim pričekajte..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, fuzzy, c-format
msgid "Must be root"
msgstr "Port miša"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -118,42 +118,42 @@ msgstr ""
"Naki traženi paketi ne mogu biti instalirani:\n"
"%s"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Upozorenje"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "U redu"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "Dogradnja"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, fuzzy, c-format
msgid " (to install)"
msgstr "Izlaz iz instalacije"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Jedan od slijedećih paketa je potreban:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Prekini"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -161,21 +161,21 @@ msgid ""
"Continue installation anyway?"
msgstr "Slijedeći paketi će biti uklonjeni"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, 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:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, 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:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, fuzzy, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
@@ -183,36 +183,42 @@ msgstr[0] "%d paketa"
msgstr[1] "%d paketa"
msgstr[2] "%d paketa"
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Pripremam se za instalaciju"
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "ne mogu dohvatiti izvorne (source) pakete, prekidam"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Pripremam..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instaliram paket `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Molim umetnite medij pod nazivom \"%s\" u uređaj [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, fuzzy, c-format
msgid "Downloading package `%s'..."
msgstr "Instaliram pakete..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr "Slijedeći paketi će biti instalirani"
+msgid "_Done"
+msgstr "Gotov"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -222,41 +228,27 @@ msgstr ""
"Instalacija neuspješna, neke datoteke nedostaju.\n"
"Možda ćete poželjeti dograditi vašu urpmi bazu"
-#: ../gurpmi2:292 ../urpme:142
-#, fuzzy, c-format
-msgid "removing %s"
-msgstr "Uklanjam %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Pripremam..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instaliram paket `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, fuzzy, c-format
-msgid "_Done"
-msgstr "Gotov"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Instalacija nije uspjela"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "sve je već instalirano"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Instalirano"
+#: ../gurpmi2:312 ../urpme:139
+#, fuzzy, c-format
+msgid "removing %s"
+msgstr "Uklanjam %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -293,7 +285,7 @@ msgstr ""
"\n"
"\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Samo je administratoru dozvoljeno da instalira pakete"
@@ -303,98 +295,98 @@ msgstr "Samo je administratoru dozvoljeno da instalira pakete"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, fuzzy, c-format
msgid "unable to open rpmdb"
msgstr "Ne mogu otvoriti datoteku %s\n"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nepravilno ime rpm datoteke [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, fuzzy, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "dohvaćam hdlists datoteku..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...dohvat završen"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...dohvaćanje neuspješno: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "ne mogu pristupiti rpm datoteci [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "ne mogu pristupiti rpm datoteci [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "ne mogu registrirati rpm datoteku"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "greška prilikom registriranja lokalnih paketa"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "pogrešna deklaracija proxyja u komandnom retku\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: ne mogu pročitati rpm datoteku \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "napravljen hdlist sintezna datoteka za medij \"%s\""
@@ -584,7 +576,12 @@ msgstr "paket %s nije pronađen."
msgid "malformed URL: [%s]"
msgstr "nepravilan unos: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, fuzzy, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "ne mogu pročitati rpm datoteku [%s] sa medija \"%s\""
@@ -594,7 +591,7 @@ msgstr "ne mogu pročitati rpm datoteku [%s] sa medija \"%s\""
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -602,37 +599,42 @@ msgstr ""
"Napravljena razmjena za instalaciju na %s (makni=%d, instaliraj=%d, "
"unaprijedi=%d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, fuzzy, c-format
msgid "unable to create transaction"
msgstr "Ne mogu napraviti ssh identitet"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "Izaberite vaše pakete"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "dodajem paket %s (id=%d, eid=%d, update=%d, file=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, fuzzy, c-format
msgid "unable to install package %s"
msgstr "Problem prilikom instaliranja paketa %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "Instaliram paket %s"
+
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing package %s"
msgstr "Instaliram paket %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "instaliram %s\n"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, fuzzy, c-format
msgid "More information on package %s"
msgstr "Izaberite vaše pakete"
@@ -662,11 +664,104 @@ msgstr "Naredba nije specificirana"
msgid "Cannot connect to ldap uri:"
msgstr "Ne mogu se spojiti na poslužitelj"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "urpmi baza zaključana"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Upozorenje"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "urpmi baza zaključana"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "Slijedeći paketi će biti instalirani"
+
+#: ../urpm/main_loop.pm:100
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
+msgstr "Slijedeći paketi će biti instalirani"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Želite li nastaviti instalaciju?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Instalacija nije uspjela"
+
+#: ../urpm/main_loop.pm:133
+#, fuzzy, c-format
+msgid "distributing %s"
+msgstr "instaliram %s\n"
+
+#: ../urpm/main_loop.pm:148
+#, fuzzy, c-format
+msgid "installing %s from %s"
+msgstr "instaliram %s\n"
+
+#: ../urpm/main_loop.pm:150
+#, fuzzy, c-format
+msgid "installing %s"
+msgstr "instaliram %s\n"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Pokušati instalaciju bez provjere ovisnosti (d/N) "
+
+#: ../urpm/main_loop.pm:205
+#, 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:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "instalacijske intrukcije"
+msgstr[1] "instalacijske intrukcije"
+msgstr[2] "instalacijske intrukcije"
+
+#: ../urpm/main_loop.pm:258
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "Problem u instalaciji"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "sve je već instalirano"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "sve je već instalirano"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "sve je već instalirano"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "sve je već instalirano"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -714,7 +809,7 @@ msgstr "pokušavam zaobiči postojeći medij \"%s\", izbjegavam"
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "napravljen hdlist sintezna datoteka za medij \"%s\""
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "ne mogu pristupiti hdlist datoteci od \"%s\", medij ignoriran"
@@ -801,7 +896,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Traži instalirane fontove"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "izvršavam drugi prolaz da proračunam ovisnosti\n"
@@ -866,144 +961,149 @@ msgstr "Ne mogu otvoriti datoteku %s\n"
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:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, fuzzy, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "pokušavam zaobiči postojeći medij \"%s\", izbjegavam"
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, fuzzy, c-format
msgid "selecting multiple media: %s"
msgstr "pokušavam izabrati višestruki medij: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "uklanjam medij \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "Proxy postavke za medij \"%s\""
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "Postavke meni-a spremljene"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "Podešavanje poslužitelja"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "medij \"%s\" nije izabran"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "ispitujem hdlist datoteku [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "ispitujem synthesis datoteku [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "izgrađujem hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, fuzzy, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr "ne mogu napraviti sinteznu(synthesis) datoteku za medij \"%s\""
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, fuzzy, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "napravljen hdlist sintezna datoteka za medij \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...kopiranje neuspješno"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopiranje opisne datoteke od \"%s\"..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...kopiranje završeno"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopiranje [%s] neuspješno"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, fuzzy, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "kopiram hdlist (ili synthesis) izvor od \"%s\"..."
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, fuzzy, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "kopiranje [%s] neuspješno"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, fuzzy, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "dohvaćanje hdlist (ili synthesis) izvora neuspješno"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...dohvaćanje neuspješno: md5sum nije u skladu"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "nisu pronađene rpm datoteke u [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, fuzzy, c-format
msgid "reading rpm files from [%s]"
msgstr "nisu pronađene rpm datoteke u [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, fuzzy, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "ne mogu pročitati rpm datoteku [%s] sa medija \"%s\""
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1013,74 +1113,74 @@ msgstr ""
"nije moguće pristupiti mediju\"%s\",\n"
"ovo se moglo desiti ako ste montirali ručno mapu kad ste kreirali medij."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "dohvaćam hdlist (ili synthesis) izvor od \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "pronašao sam ispitani hdlist (ili synthesis) kao %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, fuzzy, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "kopiranje opisne datoteke od \"%s\"..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, fuzzy, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "ne mogu zapisati list datoteku za \"%s\""
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, fuzzy, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "ne mogu zapisati list datoteku za \"%s\""
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, fuzzy, c-format
msgid "writing list file for medium \"%s\""
msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "dodan medij %s"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "ne mogu obraditi hdlist datoteku od \"%s\""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, fuzzy, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "napravljen hdlist sintezna datoteka za medij \"%s\""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, fuzzy, c-format
msgid "reading headers from medium \"%s\""
msgstr "uklanjam medij \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "YyDd"
@@ -1140,47 +1240,52 @@ msgstr "nepotpun medij \"%s\" označen kao prenosiv ali nije zapravo"
msgid "unable to access medium \"%s\""
msgstr "ne mogu pristupiti mediju \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Ne postoji paket pod nazivom %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Slijedeći paketi sadrže %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "zbog nezadovoljavajućeg %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "sve je već instalirano"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "zbog nezadovoljavajućeg %s"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "odabirem %s izabiranjem datoteka"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "kako bi se zadržalo %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "kako bi se zadržalo %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "zbog sukoba sa %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "nije bilo zatraženo"
@@ -1200,6 +1305,16 @@ msgstr "Neispravan ID ključa (%s)"
msgid "Missing signature (%s)"
msgstr "Nedostaje potpis (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "ne mogu zapisati config datoteku [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "...kopiranje neuspješno"
+
#: ../urpme:40
#, fuzzy, c-format
msgid ""
@@ -1216,8 +1331,8 @@ msgstr ""
"\n"
"uporaba:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1232,18 +1347,18 @@ msgstr "Prikaži automatski odabrane pakete"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - potvrdi da instalacija može biti dostignuta točno.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr " --force - prisili pozivanje iako neki paketi ne postoje.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --group -ispisuje oznaku group: grupu."
@@ -1253,8 +1368,8 @@ msgstr " --group -ispisuje oznaku group: grupu."
msgid " --root - use another root for rpm removal.\n"
msgstr " --wget - koristi wget za dohvaćanje udaljenih datoteka.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --wget - koristi wget za dohvaćanje udaljenih datoteka.\n"
@@ -1271,17 +1386,17 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-hdlist - pokušaj pronaći i upotrijebiti hdlist datoteku.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - pokušaj pronaći i upotrijebiti hdlist datoteku.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " -v - opširan mod.\n"
@@ -1291,37 +1406,37 @@ msgstr " -v - opširan mod.\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - odabire sve odgovarajuće na komandnoj liniji.\n"
-#: ../urpme:76
+#: ../urpme:73
#, fuzzy, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Samo je administratoru dozvoljeno da instalira pakete"
-#: ../urpme:107
+#: ../urpme:104
#, fuzzy, c-format
msgid "unknown packages"
msgstr "Izaberite vaše pakete"
-#: ../urpme:107
+#: ../urpme:104
#, fuzzy, c-format
msgid "unknown package"
msgstr "Nepoznata greška"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, fuzzy, c-format
msgid "removing package %s will break your system"
msgstr "uklanjanje paketa %s će pokvariti vaš sustav\n"
-#: ../urpme:121
+#: ../urpme:118
#, fuzzy, c-format
msgid "Nothing to remove"
msgstr "Nema oznake za uklanjanje"
-#: ../urpme:126
+#: ../urpme:123
#, fuzzy, c-format
msgid "Checking to remove the following packages"
msgstr "Jedan od slijedećih paketa je potreban:"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1333,12 +1448,12 @@ msgstr[1] ""
msgstr[2] ""
"Kako bi zadovoljili ovisnosti, slijedeći paketi će biti uklonjeni (%d MB)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
@@ -1346,12 +1461,12 @@ msgstr[0] "Instaliram paket %s"
msgstr[1] "Instaliram paket %s"
msgstr[2] "Instaliram paket %s"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (d/N) "
-#: ../urpme:160
+#: ../urpme:157
#, fuzzy, c-format
msgid "Removal failed"
msgstr "Prijava nije uspjela"
@@ -1377,13 +1492,13 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --help - ispiši ovaj tekst s pomoći.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - koristi specifično okružje (tipično izvješće o grešci).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, fuzzy, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr " --media - koristi samo medije popisane zarezom.\n"
@@ -1394,12 +1509,12 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, fuzzy, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --update - koristi samo medije za dogradnju.\n"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, fuzzy, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1410,7 +1525,7 @@ msgstr " --media - koristi samo medije popisane zarezom.\n"
msgid " --use-distrib - use the given path to access media\n"
msgstr " --synthesis - koristi datu synthesu umjesto urpmi db.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - koristi datu synthesu umjesto urpmi db.\n"
@@ -1421,7 +1536,7 @@ msgid " --uniq - do not print identical lines twice.\n"
msgstr ""
" -P - nemoj pretraživati u provides kako bi pronašli paket.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - koristi samo medije za dogradnju.\n"
@@ -1563,91 +1678,102 @@ msgstr " --help - ispiši ovaj tekst s pomoći.\n"
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr " --help - ispiši ovaj tekst s pomoći.\n"
#: ../urpmf:73
#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr " --help - ispiši ovaj tekst s pomoći.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr ""
" --obsoletes - ispisuje oznaku obsoletes: sve zastarjele (više linija)."
-#: ../urpmf:74
+#: ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr " --group -ispisuje oznaku group: grupu."
-#: ../urpmf:75
+#: ../urpmf:76
#, fuzzy, c-format
msgid " --provides - provides tags\n"
msgstr ""
" --provides - ispisuje oznaku provides: sve što pruža (više linija)."
-#: ../urpmf:76
+#: ../urpmf:77
#, fuzzy, c-format
msgid " --requires - requires tags\n"
msgstr ""
" --requires - ispisuje oznaku requires: sve što zahtjeva (više linija)."
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --help - ispiši ovaj tekst s pomoći.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, fuzzy, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --group -ispisuje oznaku group: grupu."
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr ""
+" --obsoletes - ispisuje oznaku obsoletes: sve zastarjele (više linija)."
+
+#: ../urpmf:81
#, fuzzy, c-format
msgid " --summary - summary\n"
msgstr " --summary - ispisuje oznaku summary: sažeto."
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr " --help - ispiši ovaj tekst s pomoći.\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr " -v - opširan mod.\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr ""
" -p - dozvoli pretraživanje u provides kako bi pronašao paket.\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - ispiši verziju, izdanje i arhitekturu sa imenom.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "koristim posebno okružje na %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
-#: ../urpmi:79
+#: ../urpmi:75
#, fuzzy, c-format
msgid ""
"urpmi version %s\n"
@@ -1663,41 +1789,41 @@ msgstr ""
"\n"
"uporaba:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
msgstr " --media - koristi samo medije popisane zarezom.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, fuzzy, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr " --auto-select - automatski izaberi pakete za dogradnju sustava.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr " --auto-select - automatski izaberi pakete za dogradnju sustava.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, fuzzy, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - isključi MD5SUM provjeru datoteka.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, fuzzy, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - forsiraj ažuriranje gpg ključa.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1705,14 +1831,14 @@ msgid ""
msgstr ""
" --no-uninstall - ne traži deinstalaciju paketa, odustani od instalacije.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, fuzzy, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr ""
" --install-src - instaliraj samo pakete izvornog koda (bez izvršnih "
"programa).\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1721,7 +1847,7 @@ msgstr ""
" --keep - zadrži postojeće pakete ako je moguće, odbij zatražene\n"
"pakete koji bi bili uklonjeni.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1732,41 +1858,47 @@ msgstr ""
" biti instalirano ili unapređeno,\n"
" uobičajeno je %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - mala dužina prenosa, uobičajeno je %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, fuzzy, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy - uključi fuzzy pretraživanje (isto kao -y).\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, fuzzy, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr ""
" --src - slijedeći paket je izvorišni(source) paket (isto kao -"
"s).\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
" --install-src - instaliraj samo pakete izvornog koda (bez izvršnih "
"programa).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, fuzzy, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --noclean - zadrži rpm koji nije korišten u međuspremniku.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, fuzzy, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - zadrži rpm koji nije korišten u međuspremniku.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1775,7 +1907,7 @@ msgstr ""
" --allow-nodeps - dozvoli korisniku instalaciju paketa\n"
"bez provjere ovisnosti.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1785,59 +1917,59 @@ msgstr ""
"paketa bez\n"
" ovisnosti o provjeri i integritetu.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, fuzzy, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --wget - koristi wget za dohvaćanje udaljenih datoteka.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
" to install a chroot with --root option.\n"
msgstr ""
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - koristi wget za dohvaćanje udaljenih datoteka.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - koristi curl za dohvaćanje udaljenih datoteka.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, fuzzy, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --curl - koristi curl za dohvaćanje udaljenih datoteka.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - ograniči brzinu preuzimanja datoteka.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, fuzzy, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1847,7 +1979,7 @@ msgstr ""
" (--no-verify-rpm treba biti isključen, uobičajeno je "
"uključen).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1857,7 +1989,7 @@ msgstr ""
"porta\n"
" 1080 (format je <proxyhost[:port]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1866,7 +1998,7 @@ msgstr ""
" --proxy-user - odredi korisnika i zaporku da se koristi za proxy\n"
" autentikaciju (format je <user:password>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1875,7 +2007,7 @@ msgstr ""
" --bug - ispiši izvješće o grešci u mapu određenu\n"
"sljedećim argumentom.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, fuzzy, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1885,115 +2017,120 @@ msgstr ""
" (--no-verify-rpm treba biti isključen, uobičajeno je "
"uključen).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, fuzzy, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr " --test - potvrdi da instalacija može biti dostignuta točno.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, fuzzy, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --media - koristi samo medije popisane zarezom.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - isljuči doc datoteke.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, fuzzy, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --no-uninstall - ne traži deinstalaciju paketa, odustani od instalacije.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --help - ispiši ovaj tekst s pomoći.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - ispisuje oznaku description: opis."
-#: ../urpmi:147
+#: ../urpmi:144
#, 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:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --test - potvrdi da instalacija može biti dostignuta točno.\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:150
+#: ../urpmi:148
#, 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:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - odabire sve odgovarajuće na komandnoj liniji.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, 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"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
" -P - nemoj pretraživati u provides kako bi pronašli paket.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - tihi mod.\n"
-#: ../urpmi:157
+#: ../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:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, 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:243
+#: ../urpmi:241
#, 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:244
+#: ../urpmi:242
#, fuzzy, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Nije uspjelo stvaranje direktorija %s"
@@ -2003,41 +2140,43 @@ msgstr "Nije uspjelo stvaranje direktorija %s"
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "Dogradnja"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "Dogradnja"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "Izlaz iz instalacije"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "Izlaz iz instalacije"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2045,12 +2184,12 @@ msgid ""
msgstr ""
"Kako bi zadovoljili ovisnosti, slijedeći paketi će biti uklonjeni (%d MB)"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Izaberite jedan? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2058,7 +2197,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2066,19 +2205,19 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Da ipak nastavim?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (D/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2087,7 +2226,7 @@ msgstr ""
"Naki traženi paketi ne mogu biti instalirani:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2096,7 +2235,7 @@ msgstr ""
"Naki traženi paketi ne mogu biti instalirani:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2106,7 +2245,7 @@ msgstr ""
"neki paketi moraju biti uklonjeni da bi mogli biti nadograđeni, ovo još "
"uvijek nije podržano\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2116,26 +2255,31 @@ msgstr ""
"neki paketi moraju biti uklonjeni da bi mogli biti nadograđeni, ovo još "
"uvijek nije podržano\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, 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:545
+#: ../urpmi:562
#, 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:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2144,12 +2288,12 @@ msgstr ""
"Morate biti administrator(root) kako bi instalirali slijedeće ovisnosti:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2157,100 +2301,17 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../urpmi:623
+#: ../urpmi:632
#, fuzzy, c-format
msgid "Press Enter when ready..."
msgstr "Pritisnite Enter kada ste gotovi..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Odustani"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "Slijedeći paketi će biti instalirani"
-
-#: ../urpmi:672
-#, fuzzy, c-format
-msgid "The following packages have bad signatures"
-msgstr "Slijedeći paketi će biti instalirani"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Želite li nastaviti instalaciju?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Instalacija nije uspjela"
-
-#: ../urpmi:711
-#, fuzzy, c-format
-msgid "distributing %s"
-msgstr "instaliram %s\n"
-
-#: ../urpmi:726
-#, fuzzy, c-format
-msgid "installing %s from %s"
-msgstr "instaliram %s\n"
-
-#: ../urpmi:728
-#, fuzzy, c-format
-msgid "installing %s"
-msgstr "instaliram %s\n"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Pokušati instalaciju bez provjere ovisnosti (d/N) "
-
-#: ../urpmi:776
-#, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Pokušati instalaciju još snažnije (--force)? (d/N) "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "instalacijske intrukcije"
-msgstr[1] "instalacijske intrukcije"
-msgstr[2] "instalacijske intrukcije"
-
-#: ../urpmi:825
-#, fuzzy, c-format
-msgid "Installation is possible"
-msgstr "Problem u instalaciji"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "sve je već instalirano"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "sve je već instalirano"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "sve je već instalirano"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "sve je već instalirano"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "restartam urpmi"
@@ -2378,49 +2439,49 @@ msgstr " -v - opširan mod.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "ne mogu ažurirati medij \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, fuzzy, c-format
msgid "Only superuser is allowed to add media"
msgstr "Samo je administratoru dozvoljeno da instalira pakete"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "zapisana config datoteka [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, fuzzy, c-format
msgid "Can't create config file [%s]"
msgstr "zapisana config datoteka [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "nema potrebe za davanje <relativne putanje do hdlist> sa --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<relativna putanja do hdlist> nedostaje\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "ne mogu napraviti medij \"%s\"\n"
@@ -2581,18 +2642,18 @@ msgstr " -a - odaberi sve medije.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -a - odabire sve odgovarajuće na komandnoj liniji.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, fuzzy, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Samo je administratoru dozvoljeno da instalira pakete"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr ""
"nema ništa za uklanjanje (koristite urpmi.addmedia za dodavanje medija)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2646,18 +2707,18 @@ msgstr " -a - odaberi sve neprenosive medije.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - prisili pravljenje hdlist datoteka.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, fuzzy, c-format
msgid "Only superuser is allowed to update media"
msgstr "Samo je administratoru dozvoljeno da instalira pakete"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
"nema ništa za nadogradnju (koristite urpmi.addmedia za dodavanje medija)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2666,22 +2727,22 @@ msgstr ""
"nedostaje unos za nadogradnju\n"
"(jedan od %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "ignoring media %s"
msgstr "Mijenjam medij \"%s\":"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "enabling media %s"
msgstr "uklanjam medij \"%s\""
-#: ../urpmq:43
+#: ../urpmq:40
#, fuzzy, c-format
msgid ""
"urpmq version %s\n"
@@ -2697,95 +2758,95 @@ msgstr ""
"\n"
"uporaba:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
"packages.\n"
msgstr " --media - koristi samo medije popisane zarezom.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - uključi fuzzy pretraživanje (isto kao -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, fuzzy, c-format
msgid " --list - list available packages.\n"
msgstr ""
" --src - slijedeći paket je izvorišni(source) paket (isto kao -"
"s).\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, fuzzy, c-format
msgid " --list-media - list available media.\n"
msgstr " --all - ispiši sve oznake."
-#: ../urpmq:61
+#: ../urpmq:58
#, fuzzy, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --all - ispiši sve oznake."
-#: ../urpmq:62
+#: ../urpmq:59
#, fuzzy, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr " --all - ispiši sve oznake."
-#: ../urpmq:63
+#: ../urpmq:60
#, fuzzy, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --all - ispiši sve oznake."
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
" --dump-config - snimi konfiguraciju u obliku urpmi.addmedia argumenta.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr ""
" --src - slijedeći paket je izvorišni(source) paket (isto kao -"
"s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr ""
" --sources - daj sve izvorne pakete prije skidanja (root samo).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --help - ispiši ovaj tekst s pomoći.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
" This permit to querying a distro.\n"
msgstr ""
-#: ../urpmq:84
+#: ../urpmq:81
#, fuzzy, c-format
msgid " --changelog - print changelog.\n"
msgstr " --help - ispiši ovaj tekst s pomoći.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - ispisuje oznaku summary: sažeto."
-#: ../urpmq:87
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr ""
" -p - dozvoli pretraživanje u provides kako bi pronašao paket.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, fuzzy, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2793,7 +2854,7 @@ msgid ""
msgstr ""
" -p - dozvoli pretraživanje u provides kako bi pronašao paket.\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
@@ -2801,49 +2862,49 @@ msgid ""
msgstr ""
" -p - dozvoli pretraživanje u provides kako bi pronašao paket.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, fuzzy, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -d - proširi ispitivanje ovisnosti paketa.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - proširi ispitivanje ovisnosti paketa.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, fuzzy, c-format
msgid " -g - print groups with name also.\n"
msgstr " -f - ispiši verziju, izdanje i arhitekturu sa imenom.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, fuzzy, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -f - prisili pravljenje hdlist datoteka.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, fuzzy, c-format
msgid " -l - list files in package.\n"
msgstr ""
" -p - dozvoli pretraživanje u provides kako bi pronašao paket.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - tihi mod.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, fuzzy, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -f - ispiši verziju, izdanje i arhitekturu sa imenom.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - slijedeći paket je izvorišni paket (isto kao --src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, fuzzy, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2851,53 +2912,61 @@ msgid ""
msgstr ""
" -s - slijedeći paket je izvorišni paket (isto kao --src).\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -v - uključi fuzzy pretraživanje (isto kao --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, fuzzy, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -a - odabire sve odgovarajuće na komandnoj liniji.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " imena ili rpm datoteke dane na komandnoj liniji se ispituju.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, fuzzy, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr " --all - ispiši sve oznake."
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:425
#, fuzzy, c-format
msgid "No changelog found\n"
msgstr "Nije pronađena ni jedna slika"
#, fuzzy
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr "Slijedeći paketi će biti instalirani"
+
+#, fuzzy
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Trebate biti administrator (root) da koristite ovu komandu! \n"
@@ -3169,10 +3238,6 @@ msgstr "Nije pronađena ni jedna slika"
#~ "zatražene\n"
#~ "pakete koji bi bili uklonjeni.\n"
-#, fuzzy
-#~ msgid "unable to write file [%s]"
-#~ msgstr "ne mogu zapisati config datoteku [%s]"
-
#~ msgid ""
#~ " --distrib-XXX - automatically create a medium for XXX part of a\n"
#~ " distribution, XXX may be main, contrib, updates or\n"
diff --git a/po/hu.po b/po/hu.po
index 4f23e9ab..d8e29f13 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: hu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2007-03-19 20:34+0100\n"
"Last-Translator: Arpad Biro <biro_arpad@yahoo.com>\n"
"Language-Team: \n"
@@ -22,7 +22,7 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "RPM-telepítés"
@@ -32,7 +32,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:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_OK"
@@ -98,7 +98,7 @@ msgstr "_Telepítés"
msgid "_Save"
msgstr "M_entés"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Mégsem"
@@ -118,17 +118,17 @@ msgstr "Ismeretlen opció: \"%s\""
msgid "No packages specified"
msgstr "Nincs megadva csomag"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Kis türelmet..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "Rendszergazdai jogosultság szükséges"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -139,42 +139,42 @@ msgstr ""
"%s\n"
"Kívánja folytatni a telepítést?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Figyelmeztetés"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "OK"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (frissítés)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (telepítés)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "Csomagválasztás"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "A következő csomagok valamelyikére szükség van:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Megszakítás"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -186,59 +186,61 @@ msgstr ""
"%s\n"
"Kívánja folytatni a telepítést?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, c-format
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:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, c-format
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:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, 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:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Csomagtelepítés..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, 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:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Előkészítés..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "A(z) '%s' (%s/%s) csomag telepítése..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Helyezze be a(z) \"%s\" nevű adathordozót a(z) \"%s\" meghajtóba"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "A(z) '%s' csomag letöltése folyik..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"A következő csomagok aláírása helytelen:\n"
-"%s\n"
-"\n"
-"Kívánja folytatni a telepítést?"
+msgid "_Done"
+msgstr "_Kész"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -249,41 +251,27 @@ msgstr ""
"%s\n"
"Érdemes lehet frissíteni az urpmi adatbázist."
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "\"%s\" eltávolítása"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Előkészítés..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "A(z) '%s' (%s/%s) csomag telepítése..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Kész"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, c-format
msgid "Installation failed:"
msgstr "A telepítés nem sikerült:"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "A csomag(ok) már telepítve van(nak)"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "A telepítés befejeződött"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "\"%s\" eltávolítása"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -320,7 +308,7 @@ msgstr " -f - az RPM-csomag teljes nevének kiírása (NVRA)\n"
msgid " defaults to %s.\n"
msgstr " alapértelmezés: %s\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Csomagok telepítéséhez rendszergazdai jogosultság szükséges"
@@ -330,98 +318,98 @@ 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:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "az rpmdb megnyitása nem sikerült"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
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"
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "érvénytelen csomagfájlnév: \"%s\""
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "RPM-fájl behozatala: \"%s\"..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...behozatal megtörtént"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...a behozatal sikertelen: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "a csomagfájl nem elérhető: \"%s\""
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, 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:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "az RPM-csomagfájl nem regisztrálható"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Az RPM-mel nem kompatibilis architektúra [%s]"
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "hiba a helyi csomagok regisztrálásakor"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, 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:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "helytelen proxy-megadás a parancssorban\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr "chroot-könyvtár nem létezik"
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: egy RPM-fájl nem olvasható: \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
+#, c-format
+msgid "chroot directory doesn't exist"
+msgstr "chroot-könyvtár nem létezik"
+
+#: ../urpm/args.pm:424
#, c-format
msgid "Can't use %s without %s"
msgstr "\"%s\" nem használható \"%s\" nélkül"
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
#, c-format
msgid "Can't use %s with %s"
msgstr "\"%s\" nem használható ezzel: \"%s\""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr "Túl sok argumentum\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "kiterjesztett függőséglista készítése ehhez: \"%s\""
@@ -611,7 +599,12 @@ msgstr "a csomag nem található: \"%s\""
msgid "malformed URL: [%s]"
msgstr "helytelen URL: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "RPM-fájlok behozatala a(z) \"%s\" adatforrásból..."
@@ -621,7 +614,7 @@ msgstr "RPM-fájlok behozatala a(z) \"%s\" adatforrásból..."
msgid "[repackaging]"
msgstr "[újracsomagolás]"
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -629,37 +622,42 @@ 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:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "egy művelet elvégzése nem sikerült"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, 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:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "csomag hozzáadása - %s (azonosító=%d, eid=%d, frissítés=%d, fájl=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "a(z) \"%s\" csomag telepítése sikertelen"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "a(z) %s csomag eltávolítása folyik"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "a(z) %s csomag eltávolítása folyik"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, 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:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "További információ a(z) %s csomagról"
@@ -689,11 +687,103 @@ msgstr "Nincs megadva alap"
msgid "Cannot connect to ldap uri:"
msgstr "Nem lehet kapcsolódni az LDAP-URI-hoz:"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "a(z) \"%s\" adatbázis zárolt"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Figyelmeztetés"
+
+#: ../urpm/lock.pm:65
#, c-format
msgid "%s database locked"
msgstr "a(z) \"%s\" adatbázis zárolt"
+#: ../urpm/main_loop.pm:99
+#, c-format
+msgid "The following package has bad signature"
+msgstr "A következő csomag helytelen aláírást tartalmaz:"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "A következő csomagok helytelen aláírást tartalmaznak:"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Szeretné folytatni a telepítést?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "A telepítés nem sikerült"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "%s elosztása"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "%s telepítése innen: %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "%s telepítése folyik"
+
+#: ../urpm/main_loop.pm:187
+#, 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:205
+#, 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:247
+#, c-format
+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"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "A telepítés elvégezhető"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr "A csomagok naprakészek"
+
+#: ../urpm/main_loop.pm:271
+#, c-format
+msgid "Package %s is already installed"
+msgstr "A(z) \"%s\" csomag már telepítve van"
+
+#: ../urpm/main_loop.pm:272
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "A(z) \"%s\" csomagok már telepítve vannak"
+
+#: ../urpm/main_loop.pm:275
+#, c-format
+msgid "Package %s can not be installed"
+msgstr "A(z) \"%s\" csomag nem telepíthető"
+
+#: ../urpm/main_loop.pm:276
+#, c-format
+msgid "Packages %s can not be installed"
+msgstr "A(z) \"%s\" csomagok nem telepíthetők"
+
#: ../urpm/md5sum.pm:23
#, c-format
msgid "examining %s file"
@@ -751,7 +841,7 @@ msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr ""
"a \"kiterjesztett függőséglista\" opció itt beállítandó (adatforrás: \"%s\")"
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr ""
@@ -847,7 +937,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Keresés kezdete: %s vége: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "függőségek meghatározása - második lépés\n"
@@ -912,68 +1002,73 @@ msgstr "a media.cfg elemzése nem sikerült"
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ó)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, 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:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "több adatforrás kijelölése: \"%s\""
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "\"%s\" adatforrás eltávolítása"
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, 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:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...a beállítások módosítása sikertelen"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "a beállítások módosítása megtörtént"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, 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"
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
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)"
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "a(z) \"%s\" adatforrás naprakész"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "fejléclista vizsgálata: \"%s\""
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "kiterjesztett függőséglista vizsgálata: \"%s\""
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "fejléclista készítése: \"%s\""
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -982,83 +1077,83 @@ msgstr ""
"A(z) \"%s\" adatforráshoz nem készíthető kiterjesztett függőséglista. "
"Lehetséges, hogy a fejléclista sérült."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
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"
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "\"%s\" másolása a(z) \"%s\" adatforrás számára..."
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...a másolás sikertelen"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "\"%s\" leírásfájljának másolása..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...másolás megtörtént"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, 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:1277
+#: ../urpm/media.pm:1284
#, c-format
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"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "\"%s\" másolása sikertelen (az MD5-ös összegek nem egyeznek)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr ""
"a letöltött forrás-fejléclista (vagy a kiterjesztett függőséglista) MD5-ös "
"összegének kiszámítása folyik"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...a behozatal sikertelen: hibás MD5-ös ellenőrzőösszeg"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "csomagfájlok (RPM) nem találhatók: \"%s\""
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "csomagfájlok (RPM) olvasása innen: \"%s\""
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "csomagfájlok (RPM) nem olvashatók innen: \"%s\" - %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "csomagfájlok (RPM) nem lettek beolvasva"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1069,78 +1164,78 @@ msgstr ""
"Lehetséges, hogy az adatforrás létrehozásakor kézzel lett csatolva a "
"megfelelő könyvtár."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, 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:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr ""
"\"%s\" forrás-fejléclistájának (illetve kiterjesztett függőséglistájának) "
"behozatala..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr ""
"a csomagkezelő fejléclistát (illetve kiterjesztett függőséglistát) talált: %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "a(z) \"%s\" adatforráshoz nem található fejléclista (hdlist)"
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "\"%s\" nyilvánoskulcs-fájljának vizsgálata..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, 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:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "\"%s\" nyilvánoskulcs-fájlja nem importálható"
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "a(z) \"%s\" adatforrás listafájljának írása"
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, c-format
msgid "updated medium \"%s\""
msgstr "\"%s\" adatforrás frissítve"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "fejléclista nem elemezhető: \"%s\""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, 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"
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "\"%s\" adatforrás fejléceinek olvasása"
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "IiyY"
@@ -1200,47 +1295,52 @@ msgstr "a(z) \"%s\" hibás adatforrás cserélhetőnek van jelölve, pedig nem a
msgid "unable to access medium \"%s\""
msgstr "a(z) \"%s\" adatforrás nem elérhető"
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Nincs ilyen nevű csomag: %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "A következő csomagok tartalmazzák a(z) %s komponenst: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "\"%s\" hiánya miatt"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "A(z) \"%s\" csomag már telepítve van"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "\"%s\" igényei miatt"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "a legalkalmasabb \"%s\" keresése"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "\"%s\" megtartása érdekében"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "\"%s\" telepítése érdekében"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "ezzel való ütközés miatt: \"%s\""
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "nem volt kérve"
@@ -1260,6 +1360,16 @@ msgstr "Érvénytelen kulcsazonosító (%s)"
msgid "Missing signature (%s)"
msgstr "Hiányzó elektronikus aláírás (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "\"%s\" beállításfájl nem hozható létre"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "A másolás sikertelen"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1276,8 +1386,8 @@ msgstr ""
"\n"
"Használat:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1294,19 +1404,19 @@ 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"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, 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"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, 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:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - a fájlok újracsomagolása törlés előtt\n"
@@ -1317,8 +1427,8 @@ 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"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
@@ -1340,17 +1450,17 @@ 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:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - kiterjesztett függőséglista felhasználása\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - fejléclista felhasználása\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - részletes információ\n"
@@ -1360,37 +1470,37 @@ msgstr " --verbose, -v - részletes információ\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - a mintára illeszkedő csomagok kijelölése\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Csomagok eltávolításához rendszergazdai jogosultság szükséges"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "ismeretlen csomagok"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "ismeretlen csomag"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "a(z) \"%s\" csomag eltávolítása tönkreteheti a rendszert"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Nincs mit eltávolítani"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Ellenőrzés a következő csomagok eltávolításához"
-#: ../urpme:134
+#: ../urpme:131
#, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1398,24 +1508,24 @@ msgid_plural ""
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"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr " (%d MB)"
-#: ../urpme:138
+#: ../urpme:135
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "%d csomag eltávolítása?"
msgstr[1] "%d csomag eltávolítása?"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (i/N) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Az eltávolítás sikertelen"
@@ -1441,14 +1551,14 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - jelen program verziószámának megjelenítése\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../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ében)\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1464,14 +1574,14 @@ msgstr ""
"szövegként\n"
" való kezelése\n"
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../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"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1486,7 +1596,7 @@ msgstr ""
" --synthesis - a megadott kiterjesztett függőséglista használata az\n"
" urpmi-adatbázis helyett\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1498,7 +1608,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - az azonos sorok csak egyszer jelenjenek meg\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - csak frissítési adatforrás legyen használva\n"
@@ -1633,78 +1743,88 @@ msgid " --group - group\n"
msgstr " --group - csoport\n"
#: ../urpmf:72
+#, fuzzy, c-format
+msgid " --license - license\n"
+msgstr " --name - csomagnév\n"
+
+#: ../urpmf:73
#, c-format
msgid " --name - package name\n"
msgstr " --name - csomagnév\n"
-#: ../urpmf:73
+#: ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - \"elavulttá tesz\" címkék\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr " --packager - csomagkészítő\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - \"szolgáltatásjegyzék\" címkék\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - \"követelmények\" címkék\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, c-format
msgid " --size - installed size\n"
msgstr " --size - telepített méret\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - a forráscsomag neve\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - \"elavulttá tesz\" címkék\n"
+
+#: ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr " --summary - összefoglaló\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, c-format
msgid " --url - url\n"
msgstr " --url - URL\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, c-format
msgid " --vendor - vendor\n"
msgstr " --vendor - terjesztő\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -m - a csomagot tartalmazó adatforrás\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, 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"
-#: ../urpmf:140
+#: ../urpmf:142
#, 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ó"
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "a következő környezet használata: %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1713,12 +1833,12 @@ msgstr ""
"Megjegyzés: a feldolgozott adatforrások egyike sem használ fejléclistát, "
"ezért az urpmf nem tudott eredményt adni\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Csomagnevek keresésére használható a --name opció.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1734,7 +1854,7 @@ msgstr ""
"\n"
"Használat:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1742,7 +1862,7 @@ msgstr ""
" --searchmedia - csak a megadott adatforrások használata a kért csomagok\n"
" kereséséhez\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
@@ -1751,30 +1871,30 @@ msgstr ""
" --auto - nem-interaktív mód, a kérdésekre az alapértelmezett\n"
" válaszok lesznek feltételezve\n"
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../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"
-#: ../urpmi:93
+#: ../urpmi:89
#, 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"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - az MD5-ös összeg ellenőrzésének kikapcsolása\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - a GPG-kulcs frissítésének kikényszerítése\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1784,12 +1904,12 @@ msgstr ""
"inkább\n"
" szakadjon félbe a telepítés\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
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:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1798,7 +1918,7 @@ msgstr ""
" --keep - a már telepített csomagok megtartása, ha lehetséges - a\n"
" törlést igénylő csomagok nem kerülnek telepítésre\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1810,41 +1930,47 @@ msgstr ""
" telepítése vagy frissítése esetén,\n"
" az alapértelmezés szerinti érték: %d\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, 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"
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy, -y - fuzzy keresés használata\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src, -s - a következő csomag egy forráscsomag\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, 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"
-#: ../urpmi:107
+#: ../urpmi:103
#, 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"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - az RPM-fájlok ne törlődjenek a gyorstárból\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1854,7 +1980,7 @@ msgstr ""
" telepítését (a felhasználótól érkező megerősítést "
"követően)\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1866,12 +1992,12 @@ msgstr ""
"megerősítést\n"
" követően)\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, 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"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1882,47 +2008,47 @@ msgstr ""
"root\n"
" opció esetén\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../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:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../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:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../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:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr " --curl-options - további opciók a Curl program számára\n"
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr " --rsync-options- további opciók az Rsync program számára\n"
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr " --wget-options - további opciók a Wget program számára\n"
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr " --prozilla-options - további opciók a Prozilla program számára\n"
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - a letöltési sebesség korlátozása\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1932,7 +2058,7 @@ msgstr ""
" (a --no-resume kikapcsolja; alapértelmezésben "
"kikapcsolt)\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1942,7 +2068,7 @@ msgstr ""
"alapértelmezés\n"
" szerint 1080 (formátum: <proxygép[:port]>)\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1951,7 +2077,7 @@ msgstr ""
" --proxy-user - proxyhoz használandó felhasználónév és jelszó\n"
" (formátum: <felhasználónév:jelszó>)\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1960,7 +2086,7 @@ msgstr ""
" --bug - hibajelentés írása a következő argumentumban megadott\n"
" könyvtárba\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1969,31 +2095,31 @@ 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"
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
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"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr ""
" --excludepath - bizonyos útvonalak (elválasztás: vessző) kihagyása\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - dokumentációs fájlok kihagyása\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, 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"
-#: ../urpmi:144
+#: ../urpmi:141
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr ""
@@ -2001,17 +2127,22 @@ msgstr ""
"megfelelő\n"
" architektúra esetén is\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - a csomagok szkriptjei ne legyenek végrehajtva\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - a nem telepítendő csomagok\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - a nem telepítendő csomagok\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2021,49 +2152,49 @@ msgstr ""
"az\n"
" alapértelmezettnél több lehetőséget kínáljon fel\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - ne legyen zárolva az RPM-adatbázis\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, 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:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - kijelölés a parancssorban megadott minta szerint\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - csomag keresése a szolgáltatásjegyzékben\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, 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"
-#: ../urpmi:155
+#: ../urpmi:153
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - néma üzemmód\n"
-#: ../urpmi:157
+#: ../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"
-#: ../urpmi:186
+#: ../urpmi:184
#, 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:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2073,12 +2204,12 @@ msgstr ""
"argumentumokat\n"
"a --bug opcióval együtt.\n"
-#: ../urpmi:220
+#: ../urpmi:218
#, 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:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2087,7 +2218,7 @@ 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:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr ""
@@ -2099,7 +2230,7 @@ msgstr ""
msgid "Environment directory %s does not exist"
msgstr "\"%s\" környezeti könyvtár nem létezik"
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2108,46 +2239,48 @@ 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:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr "Adatforrás frissítése...\n"
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (frissítés)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (frissítés)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (telepítés)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, c-format
msgid "%s (to install)"
msgstr "%s (telepítés)"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "A függőségek feloldásához a következő csomag el lesz távolítva"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Melyiket választja? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2158,7 +2291,7 @@ msgstr ""
"amelyek régebbiek a telepítetteknél:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2169,7 +2302,7 @@ msgstr ""
"amelyek régebbiek a telepítetteknél:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, c-format
msgid ""
"\n"
@@ -2178,12 +2311,12 @@ msgstr ""
"\n"
"Kívánja folytatni a telepítést?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (I/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2192,7 +2325,7 @@ msgstr ""
"A következő kért csomagot nem lehet telepíteni:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2201,7 +2334,7 @@ msgstr ""
"A kért csomagok közül néhányat nem lehet telepíteni:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2212,7 +2345,7 @@ msgstr ""
"távolítani, hogy a szükséges csomagok frissíthetők legyenek:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2223,7 +2356,7 @@ msgstr ""
"távolítani, hogy a szükséges csomagok frissíthetők legyenek:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2233,7 +2366,7 @@ msgstr ""
"frissíthetők legyenek:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2243,12 +2376,17 @@ msgstr ""
"frissíthetők legyenek:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, 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:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2257,111 +2395,29 @@ msgstr ""
"A következő függőségek telepítéséhez rendszergazdai jogosultság szükséges:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, 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:597
+#: ../urpmi:617
#, 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:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Amikor elkészült, nyomja le az Enter billentyűt..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Mégsem"
-#: ../urpmi:671
-#, c-format
-msgid "The following package has bad signature"
-msgstr "A következő csomag helytelen aláírást tartalmaz:"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "A következő csomagok helytelen aláírást tartalmaznak:"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Szeretné folytatni a telepítést?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "A telepítés nem sikerült"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "%s elosztása"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "%s telepítése innen: %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "%s telepítése folyik"
-
-#: ../urpmi:759
-#, 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) "
-
-#: ../urpmi:776
-#, 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) "
-
-#: ../urpmi:815
-#, c-format
-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"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "A telepítés elvégezhető"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr "A csomagok naprakészek"
-
-#: ../urpmi:838
-#, c-format
-msgid "Package %s is already installed"
-msgstr "A(z) \"%s\" csomag már telepítve van"
-
-#: ../urpmi:839
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "A(z) \"%s\" csomagok már telepítve vannak"
-
-#: ../urpmi:842
-#, c-format
-msgid "Package %s can not be installed"
-msgstr "A(z) \"%s\" csomag nem telepíthető"
-
-#: ../urpmi:843
-#, c-format
-msgid "Packages %s can not be installed"
-msgstr "A(z) \"%s\" csomagok nem telepíthetők"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "az urpmi újraindítása"
@@ -2500,34 +2556,34 @@ msgstr " -v - részletes információ\n"
msgid "unable to update medium \"%s\"\n"
msgstr "a(z) \"%s\" adatforrás frissítése nem sikerült\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, fuzzy, 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)\n"
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Adatforrás felvételéhez rendszergazdai jogosultság szükséges"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, c-format
msgid "creating config file [%s]"
msgstr "\"%s\" beállításfájl létrehozása"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "\"%s\" beállításfájl nem hozható létre"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "<a fejléclista relatív útvonala> --distrib esetén szükségtelen"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
@@ -2536,17 +2592,17 @@ msgstr ""
"\n"
"Szeretné felvenni ezt az adatforrást: \"%s\"?"
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<a fejléclista relatív útvonala> hiányzik\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr "\"%s\" távoli adatforrással nem használható"
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "a(z) \"%s\" adatforrás létrehozása nem sikerült\n"
@@ -2715,19 +2771,19 @@ msgstr " -a - az összes adatforrás kijelölése\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - fuzzy keresés az adatforrásnevekben\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Adatforrás eltávolításához rendszergazdai jogosultság szükséges"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, 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"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2790,19 +2846,19 @@ msgstr ""
" -f - kiterjesztett függőséglista illetve fejléclista\n"
" frissítésének kikényszerítése\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Adatforrás frissítéséhez rendszergazdai jogosultság szükséges"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, 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"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2811,22 +2867,22 @@ msgstr ""
"a frissítendő bejegyzés hiányzik\n"
"(valamelyik ezek közül: %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "\"%s\" adatforrás kihagyása"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "\"%s\" adatforrás bekapcsolása"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2842,7 +2898,7 @@ msgstr ""
"\n"
"Használat:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2851,38 +2907,38 @@ msgstr ""
" --searchmedia - csak a megadott adatforrások használata a kért (vagy\n"
" frissített) csomagok kereséséhez\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - fuzzy keresés használata (-y opcióval azonos)\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - az elérhető csomagok listázása\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - az elérhető adatforrások listázása\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - elérhető adatforrások és URL-jeik listázása\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, 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"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - az elérhető párhuzamos aliasok listázása\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
@@ -2890,13 +2946,13 @@ msgstr ""
" --dump-config - beállítások kiírása urpmi.addmedia-argumentumok "
"formájában\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, 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"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
@@ -2904,7 +2960,7 @@ 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"
-#: ../urpmq:68
+#: ../urpmq:65
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr ""
@@ -2912,7 +2968,7 @@ msgstr ""
"lekérdezésének\n"
" engedélyezése\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2921,22 +2977,22 @@ msgstr ""
" --use-distrib - az urpmi menet közben való beállítása egy disztribúciós\n"
" fából; lehetővé teszi egy disztribúció lekérdezését\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - változások listájának megjelenítése\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - összefoglaló megjelenítése\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - fordított keresés: mi igényli a csomagot\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2946,7 +3002,7 @@ msgstr ""
" - kiterjesztett fordított keresés (virtuális csomagokban "
"is)\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, c-format
msgid ""
" --whatprovides, -p\n"
@@ -2955,52 +3011,52 @@ msgstr ""
" --whatprovides, -p\n"
" - csomag keresése a szolgáltatásjegyzékben\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, 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"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - a lekérdezés terjedjen ki a csomagfüggőségekre is\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - a névvel együtt a csoportok is jelenjenek meg\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, 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"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - a csomagban levő fájlok listázása\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, c-format
msgid " -m - equivalent to -du\n"
msgstr " -m - egyenértékű a -du opcióval\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, 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"
-#: ../urpmq:101
+#: ../urpmq:98
#, 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"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -3008,51 +3064,51 @@ msgid ""
msgstr ""
" -u - csomag kihagyása, ha már van újabb verzió telepítve\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
" -y - fuzzy keresés használata (--fuzzy opcióval azonos)\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, 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"
-#: ../urpmq:105
+#: ../urpmq:102
#, 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"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "a --list-nodes csak a --parallel opcióval használható"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
"nincs fejléclista a(z) \"%s\" adatforráshoz, ezért csak részleges eredmény "
"van a(z) \"%s\" csomaghoz"
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"nincs fejléclista a(z) \"%s\" adatforráshoz, ezért csak részleges eredmény "
"van a(z) \"%s\" csomagokhoz"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
"nincs fejléclista a(z) \"%s\" adatforráshoz, ezért nincs eredmény a(z) \"%s"
"\" csomaghoz"
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -3060,11 +3116,22 @@ msgstr ""
"nincs fejléclista a(z) \"%s\" adatforráshoz, ezért nincs eredmény a(z) \"%s"
"\" csomagokhoz"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Változási lista nem található\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "A következő csomagok aláírása helytelen:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Kívánja folytatni a telepítést?"
+
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "A --use-distrib használatához rendszergazdai jogosultság szükséges"
diff --git a/po/id.po b/po/id.po
index 88a250d5..fc415512 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+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"
@@ -24,7 +24,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "Instalasi RPM"
@@ -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:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -99,7 +99,7 @@ msgstr "Install"
msgid "_Save"
msgstr "_Simpan"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Batal"
@@ -119,17 +119,17 @@ msgstr "Opsi %s tidak diketahui"
msgid "No packages specified"
msgstr "Tidak ada paket yang ditentukan"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Silahkan menunggu..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "Harus sebagai root"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -140,42 +140,42 @@ msgstr ""
"%s\n"
"Lanjutkan installasi?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Peringatan"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr "(untuk upgrade)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr "(untuk menginstal)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "Pilihan paket"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Salah satu paket berikut dibutuhkan:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Batal"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -186,59 +186,61 @@ msgstr ""
"%s\n"
"Lanjutkan installasi?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Untuk memenuhi ketergantungan, paket berikut akan diinstall:"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, 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:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, 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:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Instalasi paket..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "tidak dapat mengambil paket sumber, dibatalkan"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Persiapan..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Menginstall paket `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Harap masukkan media bernama \"%s\" ke perangkat [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Mendownload paket `%s'..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Paket berikut memiliki tandatangan yang cacat:\n"
-"%s\n"
-"\n"
-"Apakah Anda mau melanjutkan instalasi ?"
+msgid "_Done"
+msgstr "_Selesai"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -249,41 +251,27 @@ msgstr ""
"%s\n"
"Anda mungkin perlu meng-update database urpmi Anda"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "menghapus %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Persiapan..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Menginstall paket `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Selesai"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, c-format
msgid "Installation failed:"
msgstr "Instalasi gagal:"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Semua paket telah terinstal"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Instalasi selesai"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "menghapus %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -318,7 +306,7 @@ msgstr " -f - tampilkan nama lengkap RPM (NVRA)\n"
msgid " defaults to %s.\n"
msgstr " default pada %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Hanya superuser yang boleh meng-instal paket"
@@ -328,99 +316,99 @@ msgstr "Hanya superuser yang boleh meng-instal paket"
msgid "Running urpmi in restricted mode..."
msgstr "Menjalankan urpmi dalam mode terbatas..."
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "gagal membuka rpmdb"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
"menemukan header rpm %d pada cache, menghapus header %d yang kadaluarsa"
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nama file rpm [%s] tak valid"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "mengambil file rpm [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...pengambilan selesai"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...pengambilan gagal: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "gagal mengakses file rpm [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "gagal mem-parse file spec %s [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "gagal meregistrasi file rpm"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Arsitektur tidak kompatibel untuk rpm [%s]"
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "kesalahan meregistrasi paket lokal"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Operasi ini dilarang ketika berjalan dalam mode terbatas"
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "deklarasi proxy buruk pada pada perintah baris\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr "Direktori chroot tidak ada"
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: tidak dapat membaca file rpm \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
+#, c-format
+msgid "chroot directory doesn't exist"
+msgstr "Direktori chroot tidak ada"
+
+#: ../urpm/args.pm:424
#, c-format
msgid "Can't use %s without %s"
msgstr "Tidak bisa menggunakan %s tanpa %s"
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
#, c-format
msgid "Can't use %s with %s"
msgstr "Tidak bisa menggunakan %s dengan %s"
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr "Terlalu banyak argumen\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "membangun file sintesa hdlist untuk media \"%s\""
@@ -609,7 +597,12 @@ msgstr "paket %s tak ditemukan."
msgid "malformed URL: [%s]"
msgstr "URL cacat: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "mengambil file rpm dari media \"%s\"..."
@@ -619,44 +612,49 @@ msgstr "mengambil file rpm dari media \"%s\"..."
msgid "[repackaging]"
msgstr "[pemaketan ulang]"
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, 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:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "gagal membuat transaksi"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, 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:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "menambah paket %s (id=%d, eid=%d, update=%d, file=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "gagal menginstal paket %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "menghapus paket %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "menghapus paket %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "menghapus rpm yang terinstall (%s) dari %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Informasi tambahan pada paket %s"
@@ -686,11 +684,103 @@ msgstr "Tidak ada dasar yang ditentukan"
msgid "Cannot connect to ldap uri:"
msgstr "Tidak dapat terhubung ke url ldap :"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "database %s terkunci"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Peringatan"
+
+#: ../urpm/lock.pm:65
#, c-format
msgid "%s database locked"
msgstr "database %s terkunci"
+#: ../urpm/main_loop.pm:99
+#, c-format
+msgid "The following package has bad signature"
+msgstr "Paket berikut memiliki tandatangan yang cacat"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Paket berikut memiliki tandatangan yang cacat"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Apakah Anda hendak melanjutkan instalasi ?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Instalasi gagal"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "sebarkan %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "menginstall %s dari %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "menginstall %s"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Mencoba installasi tanpa menguji ketergantungan? (y/T) "
+
+#: ../urpm/main_loop.pm:205
+#, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "Mencoba installasi lebih keras (--force)? (y/T) "
+
+#: ../urpm/main_loop.pm:247
+#, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "transaksi installasi %d gagal"
+msgstr[1] "transaksi installasi %d gagal"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Installasi dimungkinkan"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr "Paket-paket sudah update"
+
+#: ../urpm/main_loop.pm:271
+#, c-format
+msgid "Package %s is already installed"
+msgstr "Paket %s telah terinstall"
+
+#: ../urpm/main_loop.pm:272
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Paket-paket %s telah terinstal"
+
+#: ../urpm/main_loop.pm:275
+#, c-format
+msgid "Package %s can not be installed"
+msgstr "Paket %s tidak bisa diinstall"
+
+#: ../urpm/main_loop.pm:276
+#, c-format
+msgid "Packages %s can not be installed"
+msgstr "Paket-paket %s tidak bisa diinstall"
+
#: ../urpm/md5sum.pm:23
#, c-format
msgid "examining %s file"
@@ -740,7 +830,7 @@ msgstr "\"sintesis\" seharusnya tidak ditentukan (media \"%s\")"
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "\"sintesis\" seharusnya ditentukan (media \"%s\")"
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "gagal mengakses file hdlist \"%s\", media diabaikan"
@@ -832,7 +922,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Pencarian dimulai: %s akhir: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "melakukan pass kedua untuk menghitung ketergantungan\n"
@@ -899,69 +989,74 @@ msgstr ""
"tidak dapat mengakses media distribusi (tidak ada file media.cfg yang "
"ditemukan)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "mencoba memilih media tak eksis \"%s\""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "memilih banyak media: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "menghapus media \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "konfigurasi ulang urpmi untuk media \"%s\""
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...konfigurasi ulang gagal"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "konfigurasi ulang selesai"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
"Kesalahan dalam menghasilkan nama file : ketergantungan %d tidak ditemukan"
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
"Kesalahan dalam menghasilkan nama file : Tidak bisa menulis ke file (%s)"
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "media \"%s\" sudah terbaru"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "memeriksa file hdlist [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "memeriksa file sintesa [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "membangun hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -970,77 +1065,77 @@ msgstr ""
"Gagal membuat file synthesis untuk media \"%s\". File hdlist Anda mungkin "
"rusak."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "masalah dalam membaca file sintesa/hdlist media \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "menyalin [%s] untuk media \"%s\"..."
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...penyalinan gagal"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "file deskripsi \"%s\" sedang disalin"
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...penyalinan selesai"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "penyalinan [%s] gagal (file dicurigai terlalu kecil)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "sedang menghitung md5sum hdlist/sintesa source tersalin"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "penyalinan [%s] gagal (md5sum tidak cocok)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "menghitung md5sum hdlist source (atau sintesa) yang diambil"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...pengambilan gagal: md5sum tidak cocok"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "tidak ada file rpm ditemukan dari [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "membaca file rpm dari [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "gagal membaca file rpm dari [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "tidak ada rpm terbaca"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1051,74 +1146,74 @@ msgstr ""
"ini bisa terjadi jika Anda me-mount direktori secara manual saat membuat "
"media."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "file hdlist %s untuk media \"%s\" tidak valid"
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "mengambil hdlist source (atau sintesa) \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "menemukan hdlist (atau sintesa) sebagai %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "file hdlist utk media \"%s\" tak ditemukan"
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "memeriksa file pubkey dari \"%s\"..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...kunci %s terimport dari file pubkey \"%s\""
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "gagal mengimpor file pubkey dari \"%s\""
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "menulis ke file list untuk media \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, c-format
msgid "updated medium \"%s\""
msgstr "media \"%s\" sudah diupdate"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "gagal memparse file hdlist \"%s\""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "masalah membaca file sintesa hdlist untuk media \"%s\""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "membaca header dari media \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "TtNn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "Yy"
@@ -1178,47 +1273,52 @@ msgstr "media \"%s\" tidak konsisten bertanda removable, seharusnya tidak"
msgid "unable to access medium \"%s\""
msgstr "gagal mengakses media \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Tidak ada paket bernama %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Paket berikut berisi %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "karena %s hilang"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Paket %s telah terinstall"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "karena %s tidak terpenuhi"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "mencoba mempromosikan %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "untuk menjaga %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "untuk menginstall %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "karena konflik dengan %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "tidak diminta"
@@ -1238,6 +1338,16 @@ msgstr "Kunci ID tidak valid (%s)"
msgid "Missing signature (%s)"
msgstr "Tanda tangan hilang (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "gagal menulis ke file konfigurasi [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Penyalinan gagal"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1255,8 +1365,8 @@ msgstr ""
"\n"
"pemakaian:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1272,18 +1382,18 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - pastikan apakah penghapusan bisa dilakukan dengan benar.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr " --force - paksa instal meski beberapa paket tidak ada.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - urpmi tersebar di antara mesin-mesin alias.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Paket ulang file sebelum menghapus\n"
@@ -1293,8 +1403,8 @@ msgstr " --repackage - Paket ulang file sebelum menghapus\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - gunakan root lain untuk penghapusan rpm.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
@@ -1315,17 +1425,17 @@ msgstr ""
"berguna\n"
" untuk meng(un)install chroot dengan opsi --root.\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - gunakan file sintesa.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - gunakan file hdlist.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - mode verbose.\n"
@@ -1335,37 +1445,37 @@ msgstr " --verbose, -v - mode verbose.\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - pilih semua paket yang cocok dengan ekspresi.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Hanya superuser yang diperbolehkan menghapus paket"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "paket tidak dikenal"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "paket tidak dikenal"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "menghapus paket %s akan merusak sistem Anda"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Tidak ada yang dihapus"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Pengujian untuk menghapus paket berikut"
-#: ../urpme:134
+#: ../urpme:131
#, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1373,24 +1483,24 @@ msgid_plural ""
msgstr[0] "Untuk memenuhi ketergantungan, paket berikut akan dihapus"
msgstr[1] "Untuk memenuhi ketergantungan, paket-paket %d berikut akan dihapus"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr " (%d MB)"
-#: ../urpme:138
+#: ../urpme:135
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "Hapus %d paket?"
msgstr[1] "Hapus %d paket?"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (y/T) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Penghapusan gagal"
@@ -1417,13 +1527,13 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - cetak nomor versi perkakas ini.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - gunakan lingkungan khusus (umumnya laporan kecacatan).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1438,13 +1548,13 @@ msgstr ""
" --literal, -l - jangan melakukan pencocokan pola, gunakan argumen "
"sebagai string literal.\n"
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../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"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1457,7 +1567,7 @@ msgstr ""
msgid " --use-distrib - use the given path to access media\n"
msgstr " --synthesis - gunakan sintesa yang diberikan, bukan db urpmi.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - gunakan sintesa yang diberikan, bukan db urpmi.\n"
@@ -1467,7 +1577,7 @@ msgstr " --synthesis - gunakan sintesa yang diberikan, bukan db urpmi.\n"
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - jangan cetak baris identik dua kali.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - hanya pakai media update.\n"
@@ -1605,78 +1715,88 @@ msgid " --group - group\n"
msgstr " --group - grup\n"
#: ../urpmf:72
+#, fuzzy, c-format
+msgid " --license - license\n"
+msgstr " --name - nama paket\n"
+
+#: ../urpmf:73
#, c-format
msgid " --name - package name\n"
msgstr " --name - nama paket\n"
-#: ../urpmf:73
+#: ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - tag kadaluarsa\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr " --packager - pemaket\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - tag yang disediakan\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - tag kebutuhan\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, c-format
msgid " --size - installed size\n"
msgstr " --size - ukuran yang terinstall\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - nama rpm sumber\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - tag kadaluarsa\n"
+
+#: ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr " --summary - ringkasan\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, c-format
msgid " --url - url\n"
msgstr " --url - url\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, c-format
msgid " --vendor - vendor\n"
msgstr " --vendor - vendor\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -m - media dimana paket ditemukan\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - cetak versi, rilis dan arch dengan nama.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
"Format tidak benar: Anda hanya boleh menggunakan satu tag yang bernilai "
"banyak"
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "mengunakan lingkungan spesifik pada %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1685,12 +1805,12 @@ msgstr ""
"Catatan: karena tidak ada media dan menggunakan hdlist, urpmf tidak dapat "
"mengembalikan sembarang hasil\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Anda mungkin akan menggunakan --name untuk mencari nama paket.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1707,7 +1827,7 @@ msgstr ""
"\n"
"pemakaian:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1715,7 +1835,7 @@ msgstr ""
" --searchmedia - hanya gunakan media yang diberikan untuk mencari paket "
"yang dicari.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
@@ -1724,28 +1844,28 @@ msgstr ""
" --auto - mode non-interaktif, mengasumsikan jawaban default pada "
"semua pertanyaan.\n"
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr " --auto-select - otomatis menyeleksi paket untuk upgrade sistem.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr " --auto-update - mengupdate media lalu mengupgrade sistem.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - nonaktifkan pengujian file MD5SUM.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - paksakan update pada kunci gpg.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1753,12 +1873,12 @@ msgid ""
msgstr ""
" --no-uninstall - jangan tanya untuk uninstal paket, batalkan instalasi.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - tidak menginstall paket (hanya download).\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1768,7 +1888,7 @@ msgstr ""
"yang\n"
" bisa menghapus paket yang sudah ada.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1780,37 +1900,43 @@ msgstr ""
" upgrade lebih banyak daripada yang diberikan,\n"
" standarnya %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - panjang transaksi kecil, standarnya %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy, -y - lakukan pencarian fuzzy.\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src, -s - paket berikut adalah paket sumber.\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr " --install-src - hanya instal paket source (tanpa kode biner).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - hapus rpm dari cache sebelum hal-hal yg lain.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - jangan hapus rpm dari cache.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1819,7 +1945,7 @@ msgstr ""
" --allow-nodeps - izinkan meminta user untuk menginstal paket tanpa\n"
" menguji ketergantungan.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1828,12 +1954,12 @@ msgstr ""
" --allow-force - izinkan meminta user menginstal paket tanpa\n"
" menguji ketergantungan dan integritas.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - gunakan root lain untuk installasi rpm.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1843,47 +1969,47 @@ msgstr ""
"berguna\n"
" untuk menginstall chroot dengan opsi --root.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - menggunakan wget untuk mengambil file jauh.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - menggunakan curl untuk mengambil file jauh.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --prozilla - gunakan prozilla untuk mengambil file jauh.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr " --curl-options - opsi tambahan untuk dikirimkan ke curl\n"
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr " --rsync-options - opsi tambahan untuk dikirimkan ke rsync\n"
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr " --wget-options - opsi tambahan untuk dikirimkan ke wget\n"
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr " --prozilla-options - opsi tambahan untuk dikirimkan ke prozilla\n"
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - batasi kecepatan download.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1892,7 +2018,7 @@ msgstr ""
" --resume - lanjutkan transfer dari file yang sudah didownload\n"
" (--no-resume menonaktifkannya, defaultnya nonaktif).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1901,7 +2027,7 @@ msgstr ""
" --proxy - gunakan proxy HTTP tertentu, nomor port dianggap\n"
" 1080 secara standar (format <hostproxy[:port]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1910,7 +2036,7 @@ msgstr ""
" --proxy-user - tentukan user dan katakunci untuk otentikasi proxy\n"
" (format <user:katakunci>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1919,7 +2045,7 @@ msgstr ""
" --bug - keluarkan laporan bug ke direktori yang ditentukan oleh\n"
" arg. berikut.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1928,7 +2054,7 @@ msgstr ""
" --verify-rpm - verifikasi tandatangan rpm sebelum installasi\n"
" (--no-verify-rpm menonaktifkannya, defaultnya aktif).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
@@ -1937,39 +2063,44 @@ msgstr ""
" --test - hanya verifikasi apakah installasi dapat dilaksanakan "
"dengan benar.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - path pengecualian, dipisah oleh koma.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - pengecualian untuk file dokumentasi.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr " --ignoresize - jangan verifikasi ruang diask sebelum installasi.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr ""
" --ignorearch - ijinkan menginstall rpm dari arsitektur yang tidak "
"sesuai.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - tidak menjalankan script paket\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - paket installasi yang harus dilewati\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - paket installasi yang harus dilewati\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1978,50 +2109,50 @@ msgstr ""
" --more-choices - ketika beberapa paket ditemukan, tampilkan pilihan lain\n"
" dari nilai default.\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - jangan kunci database rpm.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, 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:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - pilih semua yg cocok dengan perintah baris.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - izinkan pencarian pada provides untuk mencari paket.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - jangan cari pada provides untuk mencari paket.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - mode diam.\n"
-#: ../urpmi:157
+#: ../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:186
+#: ../urpmi:184
#, 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:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2031,13 +2162,13 @@ msgstr ""
"baris\n"
"bersamaan dengan --bug.\n"
-#: ../urpmi:220
+#: ../urpmi:218
#, 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:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2046,7 +2177,7 @@ msgstr ""
"Direktori [%s] sudah ada, silahkan gunakan direktori lain untuk laporan bug "
"atau hapus"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "gagal membuat direktori [%s] untuk laporan bug"
@@ -2056,7 +2187,7 @@ msgstr "gagal membuat direktori [%s] untuk laporan bug"
msgid "Environment directory %s does not exist"
msgstr "Direktori lingkungan %s tidak ada"
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2065,46 +2196,48 @@ msgstr ""
"Kesalahan: %s tampaknya di-mount sebagai read-only.\n"
"Gunakan --allow-force untuk memaksa operasi."
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr "Mengupdate media...\n"
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (untuk upgrade)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (untuk upgrade)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (untuk menginstal)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, c-format
msgid "%s (to install)"
msgstr "%s (untuk menginstal)"
-#: ../urpmi:447
+#: ../urpmi:454
#, 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:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Pilihan Anda? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2115,7 +2248,7 @@ msgstr ""
"yang lebih lama dari yang terinstall:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2126,7 +2259,7 @@ msgstr ""
"yang lebih lama dari yang terinstall:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, c-format
msgid ""
"\n"
@@ -2135,12 +2268,12 @@ msgstr ""
"\n"
"Lanjutkan installasi?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (Y/t) "
-#: ../urpmi:503
+#: ../urpmi:520
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2149,7 +2282,7 @@ msgstr ""
"Paket yang diminta tidak dapat diinstall:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2158,7 +2291,7 @@ msgstr ""
"Beberapa paket yang diminta tidak dapat diinstall:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2169,7 +2302,7 @@ msgstr ""
"agar yang lain dapat di-upgrade:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2180,7 +2313,7 @@ msgstr ""
"agar yang lain dapat di-upgrade:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2189,7 +2322,7 @@ msgstr ""
"Paket berikut harus dihapus agar yang lain dapat di-upgrade:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2198,12 +2331,17 @@ msgstr ""
"Paket berikut harus dihapus agar yang lain dapat di-upgrade:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(hanya pengujian, penghapusan tidak akan dilakukan)"
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2212,111 +2350,29 @@ msgstr ""
"Anda perlu jadi root untuk menginstall ketergantungan berikut:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(hanya pengujian, installasi tidak akan dilakukan)"
-#: ../urpmi:597
+#: ../urpmi:617
#, 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:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Tekan [Enter] jika siap.."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Batal"
-#: ../urpmi:671
-#, c-format
-msgid "The following package has bad signature"
-msgstr "Paket berikut memiliki tandatangan yang cacat"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Paket berikut memiliki tandatangan yang cacat"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Apakah Anda hendak melanjutkan instalasi ?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Instalasi gagal"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "sebarkan %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "menginstall %s dari %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "menginstall %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Mencoba installasi tanpa menguji ketergantungan? (y/T) "
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Mencoba installasi lebih keras (--force)? (y/T) "
-
-#: ../urpmi:815
-#, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "transaksi installasi %d gagal"
-msgstr[1] "transaksi installasi %d gagal"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Installasi dimungkinkan"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr "Paket-paket sudah update"
-
-#: ../urpmi:838
-#, c-format
-msgid "Package %s is already installed"
-msgstr "Paket %s telah terinstall"
-
-#: ../urpmi:839
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Paket-paket %s telah terinstal"
-
-#: ../urpmi:842
-#, c-format
-msgid "Package %s can not be installed"
-msgstr "Paket %s tidak bisa diinstall"
-
-#: ../urpmi:843
-#, c-format
-msgid "Packages %s can not be installed"
-msgstr "Paket-paket %s tidak bisa diinstall"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "jalankan ulang urpmi"
@@ -2448,32 +2504,32 @@ msgstr " -v - mode verbose.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "gagal mengupdate media \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, fuzzy, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr "<url> salah (untuk direktori lokal, path harus absolut)\n"
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Hanya superuser yang diijinkan menambahkan media"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, c-format
msgid "creating config file [%s]"
msgstr "membuat file konfigurasi [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "Tidak bisa menulis file konfigurasi [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "tidak perlu memberikan <path relatif hdlist> dengan --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
@@ -2482,17 +2538,17 @@ msgstr ""
"\n"
"Apakah Anda hendak menambahkan media '%s'"
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<path relatif hdlist> hilang\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr "Tidak bisa menggunakan %s tanpa media remote"
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "gagal membuat media \"%s\"\n"
@@ -2662,17 +2718,17 @@ msgstr " -a - pilih semua media.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - pencocokan fuzzy pada nama media.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Hanya superuser yang diijinkan menghapus media"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "tidak ada yang dihapus (gunakan urpmi.addmedia untuk menambah media)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2726,18 +2782,18 @@ msgstr " -a - pilih semua media non-removable.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - paksa pembuatan file sintesa/hdlist.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Hanya superuser yang diijinkan mengupdate media"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
"tidak ada yang diupdate (pakailah urpmi.addmedia untuk menambah media)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2746,22 +2802,22 @@ msgstr ""
"masukan update hilang\n"
"(satu dari %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "Mengabaikan media %s"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "mengaktifkan media media %s"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2778,7 +2834,7 @@ msgstr ""
"\n"
"pemakaian:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2787,63 +2843,63 @@ msgstr ""
" --searchmedia - hanya gunakan media yang diberikan untuk mencari "
"paket yang dicari (atau update)\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - lakukan pencarian fuzzy (sama dengan -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - daftar paket tersedia.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - daftar media tersedia.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - daftar media tersedia dan urlnya.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr " --list-nodes - daftar node tersedia saat menggunakan --parallel.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - daftar alias paralel.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
" --dump-config - dump konfigurasi dalam bentuk argumen urpmi.addmedia.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr " --src - paket berikut adalah paket sumber (sama dg -s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr ""
" --sources - beri semua paket source sebelum download (hanya only).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr ""
" --ignorearch - ijinkan untuk query rpm untuk arsitektur yang "
"tidak sesuai.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2852,24 +2908,24 @@ msgstr ""
" --use-distrib - konfigurasikan urpmi secara langsung dari pohon distrib.\n"
" Hal ini mengijinkan query distro.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - cetak changelog.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - cetak ringkasan.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr ""
" --whatrequires - pencarian terbalik untuk mencari apa yang membutuhkan "
"paket.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2879,7 +2935,7 @@ msgstr ""
" - pencarian terbalik yang diperluas (termasuk paket "
"virtual).\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, c-format
msgid ""
" --whatprovides, -p\n"
@@ -2888,48 +2944,48 @@ msgstr ""
" --whatprovides, -p\n"
" - cari di provides untuk mencari paket.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - keluaran lengkap dengan paket yang akan dihapus.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - perluas pencarian ke ketergantungan paket.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - cetak grup dengan nama.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - cetak informasi dalam format yang mudah dibaca.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - daftar file pada paket.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, c-format
msgid " -m - equivalent to -du\n"
msgstr " -m - ekuivalen dengan -du\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - cetak versi dan rrilis dengan nama.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - paket berikut adalah paket sumber (sama dengan --src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2937,48 +2993,48 @@ msgid ""
msgstr ""
" -u - hapus paket jika versi yang lebih baru telah terinstal.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - lakukan pencarian fuzzy (sama dengan --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - seperti -y, tetapi memaksa untuk mencocokan case-"
"insensitif.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " nama atau file rpm yang diberikan pada perintah baris dikirimkan.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes hanya dapat dipakai dengan --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
"tidak ada hdlist untuk media \"%s\", hanya hasil parsial untuk paket %s"
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"tidak ada hdlist untuk media \"%s\", hanya hasil parsial untuk paket-paket %s"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
"tidak ada hdlist untuk media \"%s\", tidak dapat mengembalikan hasil untuk "
"paket %s"
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2986,11 +3042,22 @@ msgstr ""
"tidak ada hdlist untuk media \"%s\", tidak dapat mengembalikan hasil untuk "
"paket-paket %s"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Changelog tidak ditemukan\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Paket berikut memiliki tandatangan yang cacat:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Apakah Anda mau melanjutkan instalasi ?"
+
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Anda harus menjadi root untuk menggunakan --use-distrib"
@@ -3364,9 +3431,6 @@ msgstr "Changelog tidak ditemukan\n"
#~ " --keep - sebisa mungkin pertahankan paket, tolak permintaan\n"
#~ "\t\t\t\t\t\t\t\t\t yang bisa menghapus paket yang sudah ada.\n"
-#~ msgid "unable to write file [%s]"
-#~ msgstr "gagal menulis ke file konfigurasi [%s]"
-
#~ msgid ""
#~ " --distrib-XXX - automatically create a medium for XXX part of a\n"
#~ " distribution, XXX may be main, contrib, updates or\n"
diff --git a/po/is.po b/po/is.po
index f2e8c190..c31e1322 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2007-02-22 17:27+0000\n"
"Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
"Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -18,7 +18,7 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "RPM innsetning"
@@ -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:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "Í _lagi"
@@ -95,7 +95,7 @@ msgstr "Setja _upp"
msgid "_Save"
msgstr "Vi_sta"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "Hætta _við"
@@ -115,17 +115,17 @@ msgstr "óþekktur valkostur %s"
msgid "No packages specified"
msgstr "Engir pakkar tilgreindir"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Vinsamlega bíðið..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "Verður að vera root"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -136,42 +136,42 @@ msgstr ""
"%s\n"
"Halda samt áfram með uppsetningu?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Aðvörun"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Í lagi"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (til að uppfæra)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (til að setja inn)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "Pakkaval"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Krefst einnig eins af af eftirtöldum pökkum:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Hætta við"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -182,59 +182,61 @@ msgstr ""
"%s\n"
"Halda samt áfram með uppsetningu?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, 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:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, 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:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, 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:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Pakka innsetning..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "Get ekki sótt frumpakka, hætti við"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Undirbý..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Set inn pakka `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Vinsamlega settu inn %s %s"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Sæki pakka `%s'..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Eftirfarandi pakkar eru með gallaðar undirskriftir:\n"
-"%s\n"
-"\n"
-"Viltu halda áfram innsetningu ?"
+msgid "_Done"
+msgstr "_Lokið"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -245,41 +247,27 @@ msgstr ""
"%s\n"
"Þú ættir sennilega að uppfæra urpmi gagnagrunninn"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "fjarlægi %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Undirbý..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Set inn pakka `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Lokið"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, c-format
msgid "Installation failed:"
msgstr "Innsetning brást:"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Allt er nú þegar komið inn"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Innsetningu lokið"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "fjarlægi %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -314,7 +302,7 @@ msgstr " -f - prenta fullt nafn rpm (NVRA).\n"
msgid " defaults to %s.\n"
msgstr " sjálfgefið er %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Aðeins kerfisstjóri hefur leyfi til að setja inn pakka"
@@ -324,98 +312,98 @@ 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:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "gat ekki opnað rpmdb"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr "fann %d rpm hausa á biðsvæði, fjarlægi %d útrunna hausa"
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "ógilt rpm skráarnafn [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "sæki rpm skrá [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...niðurhali lokið"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...mistókst að sækja: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "get ekki lesið rpm skrá [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "get ekki unnið úr spec skrá %s [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "gat ekki skráð rpm skrá"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "ósamhæfður vélbúnaður fyrir rpm [%s]"
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "villa við að skrá staðbundna pakka"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, 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:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "röng selskilgreining á skipanalínu\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr "chroot mappa er ekki til"
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: get ekki lesið rpm skrá \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
+#, c-format
+msgid "chroot directory doesn't exist"
+msgstr "chroot mappa er ekki til"
+
+#: ../urpm/args.pm:424
#, c-format
msgid "Can't use %s without %s"
msgstr "Get ekki notað %s án %s"
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
#, c-format
msgid "Can't use %s with %s"
msgstr "Get ekki notað %s með %s"
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr "Of mörg viðföng\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "byggði hdlist samantektar-skrá fyrir miðil \"%s\""
@@ -604,7 +592,12 @@ msgstr "pakki %s fannst ekki."
msgid "malformed URL: [%s]"
msgstr "gölluð slóð: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "sæki rpm skrá frá miðli \"%s\"..."
@@ -614,44 +607,49 @@ msgstr "sæki rpm skrá frá miðli \"%s\"..."
msgid "[repackaging]"
msgstr "[endurpökkun]"
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, 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:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "Gat ekki búið til færslu"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, 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:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "bæti við pakka %s (id=%d, eid=%d, uppfæra=%d, skrá=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "get ekki sett inn pakka %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "fjarlægi pakka %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "fjarlægi pakka %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "fjarlægi uppsett rpm (%s) frá %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Meiri upplýsingar um pakka %s"
@@ -681,11 +679,103 @@ msgstr "Enginn grunnur tilgreindur"
msgid "Cannot connect to ldap uri:"
msgstr "Get ekki tengst ldap slóð :"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "%s gagnagrunnur læstur"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Aðvörun"
+
+#: ../urpm/lock.pm:65
#, c-format
msgid "%s database locked"
msgstr "%s gagnagrunnur læstur"
+#: ../urpm/main_loop.pm:99
+#, c-format
+msgid "The following package has bad signature"
+msgstr "Eftirfarandi pakki er með gallaða undirskrift"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Eftirfarandi pakkar eru með gallaðar undirskriftir"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Viltu halda áfram með uppsetningu ?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Innsetning brást"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "miðla %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "set inn %s frá %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "Set inn %s"
+
+#: ../urpm/main_loop.pm:187
+#, 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:205
+#, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "Prófa sterkari innsetningu (--force)? (j/N) "
+
+#: ../urpm/main_loop.pm:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d Innsetningarfærslur brugðust"
+msgstr[1] "%d Innsetningarfærslur brugðust"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Innsetning er möguleg"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr "Pakkar eru uppfærðir"
+
+#: ../urpm/main_loop.pm:271
+#, c-format
+msgid "Package %s is already installed"
+msgstr "Pakki %s er nú þegar kominn inn"
+
+#: ../urpm/main_loop.pm:272
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Pakkar %s eru nú þegar komnir inn"
+
+#: ../urpm/main_loop.pm:275
+#, c-format
+msgid "Package %s can not be installed"
+msgstr "Ekki er hægt að setja inn pakka %s"
+
+#: ../urpm/main_loop.pm:276
+#, c-format
+msgid "Packages %s can not be installed"
+msgstr "Ekki er hægt að setja inn pakka %s"
+
#: ../urpm/md5sum.pm:23
#, c-format
msgid "examining %s file"
@@ -736,7 +826,7 @@ msgstr "ekki hægt að skrá \"samantekt\" (miðill \"%s\")"
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "\"samantekt\" ætti að vera sett (miðill \"%s\")"
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "gat ekki kannað hdlist fyrir \"%s\", miðill hunsaður"
@@ -831,7 +921,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Leit byrjun: %s endir: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "Fer yfir í annað sinn til að athuga hvað er háð\n"
@@ -896,67 +986,72 @@ msgstr "get ekki unnið úr media.cfg"
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:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "reynt að velja miðil sem er ekki til \"%s\""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "vel marga miðla: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "fjarlægi miðil \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "endurstilli urpmi fyrir miðil \"%s\""
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...endurstilling mistókst"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "endurstillingu lokið"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, 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:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr "Villa við myndun nafnaskrár: get ekki skrifað í skrá (%s)"
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "miðill \"%s\" er uppfærð"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "athuga hdlist [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "athuga samantektar-skrá [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "byggi hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -965,77 +1060,77 @@ msgstr ""
"Get ekki búið til samantektar-skrá fyrir miðil \"%s\". hdlist skráin þín er "
"kannski gölluð."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "vandræði við lestur á hdlist eða samantektar-skrá miðils \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "afrita [%s] fyrir miðil \"%s\"..."
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...afritun brást"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "afrita lýsingaskrá fyrir \"%s\"..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...afritun lokið"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, 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:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "reikna md5 gátsummu yfir afritaða skrá (eða samantektar-skrá)"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "afrit af [%s] brást (md5 gátsumma passar ekki)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "reikna md5 gátsummu yfir sótta hdlist skrá (eða samantektar-skrá)"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...mistókst að sækja: ósamræmi í md5 gátsummu"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "engar rpm skrár fundust frá [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "les rpm skrár frá [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "get ekki lesið rpm skrár frá [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "engar rpm skrár lesnar"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1046,74 +1141,74 @@ msgstr ""
"þetta getur verið vegna þess að þú tengdir möppuna handvirkt þegar þú bjóst "
"miðilinn til."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ógild hdlist skrá %s fyrir miðil \"%s\""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "sæki hdlist skrá (eða samantektar-skrá) fyrir \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "fann, við leit, hdlist skrá (eða samantektar-skrá) sem %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "engin hdlist skrá fannst fyrir miðil \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "athuga lykilskrá \"%s\"..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...flutti inn lykil %s úr lyklaskrá \"%s\""
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "gat ekki flutt inn lykilskrá \"%s\""
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "skrifa lista-skrá fyrir miðil \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, c-format
msgid "updated medium \"%s\""
msgstr "uppfærði miðil \"%s\""
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "gat ekki unnið úr hdlist skrá fyrir \"%s\""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "vandræði við lestur á samantektar-skrá fyrir miðil \"%s\""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "les hausa frá miðli \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "JjYy"
@@ -1173,47 +1268,52 @@ msgstr "ósamræmi í miðli \"%s\" merktur útskiptanlegur en er það ekki í
msgid "unable to access medium \"%s\""
msgstr "get ekki lesið miðil \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Enginn pakki heitir %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Eftirfarandi pakkar innihalda %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "vegna þess að %s vantar"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Pakki %s er nú þegar kominn inn"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "vegna óuppfylltra %s"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "þegar reynt var að setja upp %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "til þess að halda %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "til þess að setja inn %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "vegna árekstra við %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "óumbeðið"
@@ -1233,6 +1333,16 @@ msgstr "Ógilt auðkenni lykils (%s)"
msgid "Missing signature (%s)"
msgstr "Vantar undirskrift (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Get ekki búið til uppsetningaskrá [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Afritun brást"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1249,8 +1359,8 @@ msgstr ""
"\n"
"notkun:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1265,18 +1375,18 @@ msgstr " --auto - velja sjálfvirkt pakka í vali.\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - staðfesta að hægt sé að fjarlægja umbeðna pakka.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr " --force - þvinga uppsetningu þó sumir pakkar séu ekki til.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - dreifð urpmi yfir samnefndar vélar.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Endur-pakka skrám áður en eytt\n"
@@ -1286,8 +1396,8 @@ msgstr " --repackage - Endur-pakka skrám áður en eytt\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - nota aðra rót til að fjarlægja rpm.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
@@ -1307,17 +1417,17 @@ msgstr ""
" --use-distrib - stilla urpme frá dreifingartrénu, gott að nota\n"
" til að setja inn/fjarlægja chroot með --root valkostnum.\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - nota samantektar-skrá.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - nota hdlist skrá.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - ítarlegri hamur.\n"
@@ -1327,37 +1437,37 @@ msgstr " --verbose, -v - ítarlegri hamur.\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - velja alla pakka sem passa við segð.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Aðeins kerfisstjóri hefur leyfi til að fjarlægja pakka"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "óþekktir pakkar"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "Óþekktur pakki"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "ef pakki %s er fjarlægður raskast uppsetning kerfisins"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Ekkert til að fjarlægja"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Forathugun við að fjarlægja eftirtalda pakka"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1367,24 +1477,24 @@ msgstr[0] ""
msgstr[1] ""
"Til að viðhalda samræmi, verða eftirtaldir %d pakkar fjarlægðir (%d MB)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "Fjarlæga %d pakka?"
msgstr[1] "Fjarlæga %d pakka?"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (J/n) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Mistókst að fjarlægja"
@@ -1410,14 +1520,14 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - prenta útgáfunúmer þessa tóls.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - nota tiltekið umhverfi (yfirleitt vegna "
"villutilkynninga).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr " --excludemedia - nota ekki uppgefna miðla, aðskildir með kommum.\n"
@@ -1430,12 +1540,12 @@ msgstr ""
" --literal, -l - ekki leita að mynstrum, nota viðfang sem uppgefinn "
"ákveðinn texta.\n"
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../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"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1448,7 +1558,7 @@ msgid " --use-distrib - use the given path to access media\n"
msgstr ""
" --synthesis - nota gefna samantektar-skrá í stað urpmi gagnagrunns.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1459,7 +1569,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - ekki prenta tvíteknar línur.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - nota aðeins uppfærslu-miðil.\n"
@@ -1594,77 +1704,87 @@ msgid " --group - group\n"
msgstr " --group - hópur.\n"
#: ../urpmf:72
+#, fuzzy, c-format
+msgid " --license - license\n"
+msgstr " --name - pakkanafn.\n"
+
+#: ../urpmf:73
#, c-format
msgid " --name - package name\n"
msgstr " --name - pakkanafn.\n"
-#: ../urpmf:73
+#: ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - úreldir\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr " --packager - pakkað af\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - hvað er skaffað.\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - þarfnast\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, c-format
msgid " --size - installed size\n"
msgstr " --size - stærð.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - frumrpm.\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - úreldir\n"
+
+#: ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr " --summary - samantekt\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, c-format
msgid " --url - url\n"
msgstr " --url - slóð.\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, c-format
msgid " --vendor - vendor\n"
msgstr " --vendor - útgefandi\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -m - miðillinn sem innihélt pakkann\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - prenta útgáfu, undirnúmer og vélartegund með nafni.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Ógilt snið: þú mátt aðeins nota eitt fjölgildis-tag"
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "nota tilgreint umhverfi á %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1672,12 +1792,12 @@ msgid ""
msgstr ""
"Athugið: þar sem enginn miðill notar hdlist skrá, þá fann urpmf ekki neitt\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Þú vilt kannski nota --name til að leita að pakkanöfnum.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1693,7 +1813,7 @@ msgstr ""
"\n"
"notkun:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1701,7 +1821,7 @@ msgstr ""
" --searchmedia - nota aðeins uppgefin miðil til að leita að umbeðnum "
"pökkum.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
@@ -1710,28 +1830,28 @@ msgstr ""
" --auto - ekki gagnvirkur hamur, gera ráðfyrir sjálfgefnum svörum "
"við spurningum.\n"
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr " --auto-select - velja sjálfkrafa pakka til að uppfæra kerfið.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr " --auto-select - uppfæra miðil og uppfæra síðan kerfið.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - aftengja MD5SUM skráarathugun.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - þvinga uppfærslu á gpg lykli.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1740,12 +1860,12 @@ msgstr ""
" --no-uninstall - aldrei biðja um að eyða uppsettum pakka, hætta við "
"uppsetningu.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - ekki setja inn pakka (aðeins sækja)\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1755,7 +1875,7 @@ msgstr ""
"sem\n"
" leiða til að núverandi pakkar séu fjarlægðir.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1766,38 +1886,44 @@ msgstr ""
" verður settur inn eða uppfærður,\n"
" sjálfgefið er %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - litlar færslulengdir, sjálfgefið er %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy - framkvæma loðna leit.\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src - næsti pakki er frumkóða-pakki.\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
" --install-src - setja aðeins inn frumkóða-pakka (engin forþýdd forrit).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - fjarlægja rpm úr biðminni áður en annað er gert.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - ekki hreinsa rpm pakka úr biðminni.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1806,7 +1932,7 @@ msgstr ""
" --allow-nodeps - leyfa uppsetningu pakka án þess að athuga hvort\n"
" það vanti tengda pakka eða pakkar rekist á.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1815,12 +1941,12 @@ msgstr ""
" --allow-force - leyfa notanda að setja upp pakka án þess að athuga\n"
" tengda pakka eða staðfesta uppruna.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - Nota aðra rót fyrir rpm uppsetningu.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1829,47 +1955,47 @@ msgstr ""
" --use-distrib - stilla urpmi frá dreifingartrénu, gott að nota\n"
" til að setja inn chroot með --root valkostnum.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - nota wget til að sækja fjarlægar skrár.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - Nota curl til að ná í skrár.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --prozilla - nota prozilla til að ná í skrár.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr " --curl-options - aukalegir valkostir fyrir curl forritið\n"
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr " --rsync-options- aukalegir valkostir fyrir rsync forritið\n"
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr " --wget-options - aukalegir valkostir fyrir wget forritið\n"
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr " --prozilla-options - aukalegir valkostir fyrir prozilla forritið\n"
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - takmarka hraða niðurhals.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1879,7 +2005,7 @@ msgstr ""
"hluta\n"
" (--no-resume - sem er sjálfgefið - aftengir þetta).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1888,7 +2014,7 @@ msgstr ""
" --proxy - nota tilgreint HTTP sel, gáttin er sjálfgefin 1080\n"
" (sniðið er <sel[:port]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1897,7 +2023,7 @@ msgstr ""
" --proxy-user - skilgreindu sel-notanda og lykilorð til að nota til\n"
" að auðkenna (snið er <user:password>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1906,7 +2032,7 @@ msgstr ""
" --bug - skrifa út villutilkynningu í möppuna sem tilgreind er\n"
" í næsta viðfangi.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1916,46 +2042,51 @@ msgstr ""
" (--no-verify-rpm aftengir, sjálfgefið er að athuga "
"pakka).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr " --test - aðeins athuga hvort uppsetning muni takast.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - undanskilja slóðir, aðskildar með kommu.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - undanskilja doc skrár (handbækur).\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr " --ignoresize - ekki athuga með diskpláss fyrir uppsetningu.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr ""
" --ignorearch - leyfa uppsetningu á rpm pökkum fyrir aðra "
"vélbúnaðartegund.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - ekki keyra uppsetninga-skriftur í pakka\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - pakkar sem ætti að sleppa uppsetningu\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - pakkar sem ætti að sleppa uppsetningu\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1965,50 +2096,50 @@ msgstr ""
"en\n"
" venjulega.\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - ekki læsa rpm gagnagrunni.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, 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:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - velja allt sem passar á skipanalínu.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - leyfa leit í 'skaffar' (provides) til að finna pakka.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
" -P - ekki leita í 'skaffar (provides) til að finna pakka.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - hljóður hamur.\n"
-#: ../urpmi:157
+#: ../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:186
+#: ../urpmi:184
#, 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:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2018,12 +2149,12 @@ msgstr ""
"skipanalínu\n"
"ásamt --bug.\n"
-#: ../urpmi:220
+#: ../urpmi:218
#, 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:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2032,7 +2163,7 @@ msgstr ""
"Mappan [%s] er þegar til, vinsamlega notið aðra möppu fyrir villutilkynningu "
"eða eyðið möppunni"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Get ekki búið til möppu [%s] fyrir villu-tilkynningu"
@@ -2042,7 +2173,7 @@ msgstr "Get ekki búið til möppu [%s] fyrir villu-tilkynningu"
msgid "Environment directory %s does not exist"
msgstr "Umhverfismappa %s er ekki til"
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2051,34 +2182,36 @@ msgstr ""
"Villa: %s virðist vera tengt aðeins til lestrar.\n"
"Notaðu --allow-force til að þvinga aðgerð."
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr "Uppfæri miðil...\n"
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (til að uppfæra)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (til að uppfæra)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (til að setja inn)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, c-format
msgid "%s (to install)"
msgstr "%s (til að setja inn)"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2086,12 +2219,12 @@ msgid ""
msgstr ""
"Til að viðhalda samræmi, verða eftirtaldir %d pakkar fjarlægðir (%d MB)"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Hvað velur þú? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2102,7 +2235,7 @@ msgstr ""
"sem eru eldri en þeir sem eru uppsettir:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2113,7 +2246,7 @@ msgstr ""
"sem eru eldri en þeir sem eru uppsettir:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, c-format
msgid ""
"\n"
@@ -2122,12 +2255,12 @@ msgstr ""
"\n"
"Halda samt áfram með uppsetningu?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (J/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2136,7 +2269,7 @@ msgstr ""
"Ekki er hægt að setja inn umbeðinn pakka:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2145,7 +2278,7 @@ msgstr ""
"Ekki er hægt að setja inn suma umbeðna pakka:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2156,7 +2289,7 @@ msgstr ""
"að fjarlægja til að uppfæra aðra:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2167,7 +2300,7 @@ msgstr ""
"að fjarlægja til að uppfæra aðra:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2176,7 +2309,7 @@ msgstr ""
"Eftirfarandi pakka þarf að fjarlægja til að uppfæra aðra:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2185,12 +2318,17 @@ msgstr ""
"Eftirfarandi pakka þarf að fjarlægja til að uppfæra aðra:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(aðeins prófun, ekkert verður í raun fjarlægt)"
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2200,111 +2338,29 @@ msgstr ""
"pakka:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(aðeins prófun, ekkert verður sett inn í raun)"
-#: ../urpmi:597
+#: ../urpmi:617
#, fuzzy, 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 á pakka? (%d MB)"
msgstr[1] "Halda áfram með uppsetningu á pakka? (%d MB)"
-#: ../urpmi:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Sláðu á ENTER þegar tilbúinn..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Hætta við"
-#: ../urpmi:671
-#, c-format
-msgid "The following package has bad signature"
-msgstr "Eftirfarandi pakki er með gallaða undirskrift"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Eftirfarandi pakkar eru með gallaðar undirskriftir"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Viltu halda áfram með uppsetningu ?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Innsetning brást"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "miðla %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "set inn %s frá %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "Set inn %s"
-
-#: ../urpmi:759
-#, 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) "
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Prófa sterkari innsetningu (--force)? (j/N) "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d Innsetningarfærslur brugðust"
-msgstr[1] "%d Innsetningarfærslur brugðust"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Innsetning er möguleg"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr "Pakkar eru uppfærðir"
-
-#: ../urpmi:838
-#, c-format
-msgid "Package %s is already installed"
-msgstr "Pakki %s er nú þegar kominn inn"
-
-#: ../urpmi:839
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Pakkar %s eru nú þegar komnir inn"
-
-#: ../urpmi:842
-#, c-format
-msgid "Package %s can not be installed"
-msgstr "Ekki er hægt að setja inn pakka %s"
-
-#: ../urpmi:843
-#, c-format
-msgid "Packages %s can not be installed"
-msgstr "Ekki er hægt að setja inn pakka %s"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "endurræsi urpmi"
@@ -2435,32 +2491,32 @@ msgstr " -v - ítarlegri hamur.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "gat ekki uppfært miðil \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, fuzzy, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr "óggild slóð (slóð að staðbundnum möppum verður að vera algild)\n"
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Aðeins kerfisstjóra (root) er heimilt að bæta við miðli"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, c-format
msgid "creating config file [%s]"
msgstr "bý til uppsetningarskrá [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "Get ekki búið til uppsetningaskrá [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "engin þörf á að gefa upp <slóð að hdlist> með --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
@@ -2469,17 +2525,17 @@ msgstr ""
"\n"
"Viltu bæta við miðli '%s'"
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<slóð að hdlist> vantar\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr "Get ekki notað %s með fjartengdum miðli"
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "gat ekki búið til miðil \"%s\"\n"
@@ -2642,18 +2698,18 @@ msgstr " -a - velja alla miðla.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - loðið val á nöfnum miðla.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Aðeins kerfisstjórar hafa leyfi til að fjarlægja miðil"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr ""
"ekkert til að fjarlægja (notaðu urpmi.addmedia til að bæta við miðli)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2709,17 +2765,17 @@ msgstr " -a - velja alla óútskiptanlega miðla.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - þvingauppfærslu samantektar/hdlist skráa\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Aðeins kerfisstjórar mega bæta við miðli"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "ekkert til að uppfæra (notaðu urpmi.addmedia til að bæta við miðli)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2728,22 +2784,22 @@ msgstr ""
"færsluna sem á að uppfæra vantar\n"
"(ein af %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "hunsa miðil %s"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "virkja miðil %s"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2759,7 +2815,7 @@ msgstr ""
"\n"
"notkun:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2768,49 +2824,49 @@ msgstr ""
" --searchmedia - nota aðeins uppgefin miðil til að leita að umbeðnum (eða "
"uppfærðum) pakka.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - framkvæma loðna leit (sama og -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - lista tiltæka pakka.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - lista tiltæka miðla.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - lista tiltæka miðla og slóðir að þeim.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
" --list-nodes - lista tiltæka hnútpunkta þegar notað er --parallel.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - lista tiltæk samhliða samheiti.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr " --dump-config - sýna uppsetninguna sem urpmi.addmedia viðfang.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr " --src - næsti pakki er frumkóða-pakki (sama og -s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
@@ -2818,13 +2874,13 @@ msgstr ""
" --sources - sýna alla frumpakka áður en þeir eru sóttir (aðeins "
"kerfisstjóri - root).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr ""
" --ignorearch - leyfa fyrirspurn eftir rpm pökkum fyrir annan vélbúnað.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2833,24 +2889,24 @@ msgstr ""
" --use-distrib - stilla urpmi eftir dreifingartré.\n"
" Þetta leyfir fyrirspurnir í dreifingar.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - prenta breytingasögu.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - prenta samantekt.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr ""
" --whatrequires - snúa við skilgreindum leitarskilyrðum um hvaða pakka er "
"þörf.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2859,54 +2915,54 @@ msgstr ""
" --whatrequires-recursive\n"
" - öflugri öfug leit (innifelur sýndarpakka).\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -p - leita í 'skaffar' (provides) til að finna pakka.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - heildarúttak með pökkum sem á að fjarlægja.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - útvíkka fyrirspurn til pakka sem eru háðir.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - prenta hópa með nafni líka.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - prenta nytsamar upplýsingar á læsilegu sniði.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - lista skrár í pakka.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, c-format
msgid " -m - equivalent to -du\n"
msgstr " -m - samsvarar -du\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - prenta útgáfu og undirnúmer líka með nafni.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - næsti pakki er frumkóða-pakki (sama og --src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2914,56 +2970,67 @@ msgid ""
msgstr ""
" -u - fjarlægja pakka aðeins ef nýrri útgáfa er þegar uppsett.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - framkvæma loðna leit (sama og --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -Y - eins og -y, en þvingar leit óháð stafastærð.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " leitað er að nöfnum eða rpm skrám sem skrifaðar eru á skipanalínu.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes er aðeins hægt að nota með --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
"engin hdlist skrá fyrir miðil \"%s\", aðeins takmarkaðar upplýsingar fyrir "
"pakka %s"
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"engin hdlist skrá fyrir miðil \"%s\", aðeins takmarkaðar upplýsingar fyrir "
"pakka %s"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr "engin hdlist skrá fyrir miðil \"%s\", engar upplýsingar fyrir pakka %s"
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr "engin hdlist skrá fyrir miðil \"%s\", engar upplýsingar fyrir pakka %s"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Enginn breytilisti fannst\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Eftirfarandi pakkar eru með gallaðar undirskriftir:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Viltu halda áfram innsetningu ?"
+
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Þú verður að vera kerfisstjóri til að nota --use-distrib"
diff --git a/po/it.po b/po/it.po
index dcd5cb50..6e2aec6c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2007-03-18 21:09+0100\n"
"Last-Translator: Andrea Celli <a.celli@caltanet.it>\n"
"Language-Team: Italian <kde-i18n-it@kde.org>\n"
@@ -27,7 +27,7 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "Installazione RPM"
@@ -37,7 +37,7 @@ msgstr "Installazione RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Errore: impossibile trovare %s, annullo l'operazione"
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -103,7 +103,7 @@ msgstr "_Installa"
msgid "_Save"
msgstr "_Salva"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Cancella"
@@ -123,17 +123,17 @@ msgstr "Opzione sconosciuta %s"
msgid "No packages specified"
msgstr "Nessun pacchetto selezionato"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Per favore attendi..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "Devi essere root"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -144,42 +144,42 @@ msgstr ""
"%s\n"
"Continuare?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Attenzione"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr "(da aggiornare)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (da installare)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "Scelta dei pacchetti..."
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "È richiesto uno dei seguenti pacchetti:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Interrompi"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -190,59 +190,61 @@ msgstr ""
"%s\n"
"Continuare?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Per soddisfare le dipendenze, sarà installato il seguente pacchetto:"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Per soddisfare le dipendenze, saranno installati i seguenti pacchetti:"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, 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:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Installazione dei pacchetti..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "impossibile recuperare il pacchetto dalla fonte, interrompo"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "In preparazione..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Sto installando il pacchetto `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Bisogna inserire il supporto denominato \"%s\" nel dispositivo [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Download del pacchetto `%s'..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"I seguenti pacchetti hanno firme non corrette:\n"
-"%s\n"
-"\n"
-"Vuoi proseguire con l'installazione?"
+msgid "_Done"
+msgstr "_Fatto"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -253,41 +255,27 @@ msgstr ""
"%s\n"
"Potresti voler aggiornare il tuo database di urpmi"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "rimozione di %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "In preparazione..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Sto installando il pacchetto `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Fatto"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, c-format
msgid "Installation failed:"
msgstr "Installazione fallita:"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "È già tutto installato"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Installazione completata"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "rimozione di %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -322,7 +310,7 @@ msgstr " -f - mostra il nome completo del pacchetto (NVRA)\n"
msgid " defaults to %s.\n"
msgstr " predefinito: %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Solo superuser è abilitato ad installare pacchetti"
@@ -332,100 +320,100 @@ msgstr "Solo superuser è abilitato ad installare pacchetti"
msgid "Running urpmi in restricted mode..."
msgstr "Eseguo urpmi in modalità \"restricted\""
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "impossibile aprire il database rpm"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
"ci sono gli header di %d pacchetti nella cache, verranno rimossi %d header "
"obsoleti"
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nome del file rpm non valido [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "recupero il file rpm [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...recupero terminato"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...recupero fallito: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "impossibile accedere al file rpm [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "impossibile effettuare il parsing di \"%s\" nel file [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "impossibile registrare il file rpm"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Architettura incompatibile per il file rpm [%s]"
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "errore durante la registrazione dei pacchetti locali"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Quest'operazione non è consentita in modalità \"restricted\""
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "errata dichiarazione di proxy usando la linea di comando\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr "La directory chroot non esiste"
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: impossibile leggere il file rpm \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
+#, c-format
+msgid "chroot directory doesn't exist"
+msgstr "La directory chroot non esiste"
+
+#: ../urpm/args.pm:424
#, c-format
msgid "Can't use %s without %s"
msgstr "Impossibile utilizzare %s senza %s"
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
#, c-format
msgid "Can't use %s with %s"
msgstr "Impossibile utilizzare %s con %s"
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr "Troppi argomenti\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "ho costruito il file di sintesi (hdlist) per il supporto \"%s\""
@@ -616,7 +604,12 @@ msgstr "il pacchetto %s non è stato trovato."
msgid "malformed URL: [%s]"
msgstr "URL malformata : [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "recupero i file rpm dal supporto \"%s\"..."
@@ -626,7 +619,7 @@ msgstr "recupero i file rpm dal supporto \"%s\"..."
msgid "[repackaging]"
msgstr "[rimpacchetto]"
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -634,37 +627,42 @@ msgstr ""
"creata transazione per installare su %s (rimuove=%d, installa=%d, aggiorna=%"
"d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "impossibile creare la transazione"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, 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:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "aggiunta del pacchetto %s (id=%d, eid=%d, update=%d, file=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "impossibile installare il pacchetto %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "rimozione del pacchetto %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "rimozione del pacchetto %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "Rimozione degli rpm installati (%s) da %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Più informazioni sul pacchetto %s"
@@ -694,11 +692,103 @@ msgstr "Nessuna base specificata"
msgid "Cannot connect to ldap uri:"
msgstr "Impossibile connettersi all'uri ldap:"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "database %s bloccato"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Attenzione"
+
+#: ../urpm/lock.pm:65
#, c-format
msgid "%s database locked"
msgstr "database %s bloccato"
+#: ../urpm/main_loop.pm:99
+#, c-format
+msgid "The following package has bad signature"
+msgstr "Questo pacchetto ha una firma errata"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "I seguenti pacchetti hanno delle firme errate"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Vuoi proseguire con l'installazione?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Installazione fallita"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "distribuzione di %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "installazione di %s da %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "installazione di %s"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Provo l'installazione senza controllare le dipendenze? (s/N) "
+
+#: ../urpm/main_loop.pm:205
+#, 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:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d transazioni dell'installazione fallite"
+msgstr[1] "%d transazioni dell'installazione fallite"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "L'installazione è possibile"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr "I pacchetti sono aggiornati"
+
+#: ../urpm/main_loop.pm:271
+#, c-format
+msgid "Package %s is already installed"
+msgstr "Il pacchetto %s è già installato"
+
+#: ../urpm/main_loop.pm:272
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "I pacchetti %s sono già installati"
+
+#: ../urpm/main_loop.pm:275
+#, c-format
+msgid "Package %s can not be installed"
+msgstr "Il pacchetto %s non può essere installato"
+
+#: ../urpm/main_loop.pm:276
+#, c-format
+msgid "Packages %s can not be installed"
+msgstr "I pacchetti %s non possono essere installati"
+
#: ../urpm/md5sum.pm:23
#, c-format
msgid "examining %s file"
@@ -751,7 +841,7 @@ msgstr "\"synthesis\" non dovrebbe essere impostato (supporto \"%s\")"
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "\"synthesis\" dovrebbe essere impostato (supporto \"%s\")"
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "impossibile accedere al file hdlist di \"%s\", ignoro il supporto"
@@ -842,7 +932,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Avvio ricerca: %s e finisce: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "passo alla fase successiva per valutare le dipendenze\n"
@@ -908,68 +998,73 @@ msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"impossibile accedere al supporto di installazione (manca il file media.cfg)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "tentativo di selezionare un supporto inesistente \"%s\""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "sto selezionando più supporti: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "rimuovo il supporto \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "riconfiguro urpmi per il supporto \"%s\""
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...riconfigurazione fallita"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "riconfigurazione eseguita"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Errore nella generazione del file \"names\": manca la dipendenza %d "
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
"Errore nella generazione del file \"names\": impossibile scrivere su (%s) "
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "il supporto \"%s\" è aggiornato"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "esamino il file hdlist [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "esamino il file synthesis [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "sto costruendo il file hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -978,77 +1073,77 @@ msgstr ""
"impossibile costruire un file di sintesi per il supporto \"%s\". Il tuo file "
"hdlist può essere corrotto."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problema nel leggere il file hdlist/synthesis del supporto \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "copio [%s] per il supporto \"%s\""
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...copia fallita"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "copio il file di descrizione di \"%s\"..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...copia terminata"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "copia di [%s] fallita (il file è stranamente piccolo)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "controllo md5sum del file hdlist (o synthesis) copiato"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "copia di [%s] fallita (md5sum non corretta)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "calcolo md5sum del file hdlist (o synthesis) scaricato"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...recupero fallito: md5sum errata"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "nessun file rpm trovato in [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "sto leggendo i file rpm da [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "impossibile leggere i file rpm da [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "nessun rpm è stato letto"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1059,74 +1154,74 @@ msgstr ""
"questo può succedere se hai montato manualmente la directory durante la "
"creazione del supporto"
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "il file hdlist %s per il supporto \"%s\" non è corretto"
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "recupero il file hdlist (o synthesis) di \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "ho trovato la hdlist (o synthesis) analizzata come %s..."
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "non trovo il file hdlist per il supporto \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "controllo il file pubkey di \"%s\"..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...importata la chiave %s dal file pubkey di \"%s\""
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "impossibile importare il file pubkey di \"%s\""
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "scrivo la lista di file per il supporto \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, c-format
msgid "updated medium \"%s\""
msgstr "supporto \"%s\" aggiornato"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "impossibile analizzare l'hdlist file di \"%s\""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problema nel leggere il file synthesis del supporto \"%s\""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "sto leggendo le intestazioni dal supporto \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "SsYy"
@@ -1186,47 +1281,52 @@ msgstr "supporto incoerente \"%s\", segnato come rimovibile ma non tale"
msgid "unable to access medium \"%s\""
msgstr "impossibile accedere al supporto \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Nessun pacchetto denominato %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "I seguenti pacchetti contengono %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "perché manca %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Il pacchetto %s è già installato"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "perché non è soddisfatto %s"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "sto selezionando %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "per tenere %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "per installare %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "per conflitti con %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "non richiesto"
@@ -1246,6 +1346,16 @@ msgstr "Key ID (%s) non valida"
msgid "Missing signature (%s)"
msgstr "Firma mancante (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Impossibile creare il file di configurazione [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Copia fallita"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1263,8 +1373,8 @@ msgstr ""
"\n"
"utilizzo:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1281,7 +1391,7 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - verifica se la rimozione può avvenire correttamente.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
@@ -1289,12 +1399,12 @@ msgstr ""
" --force - forza l'esecuzione anche se alcuni pacchetti non "
"esistono.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - urpmi distribuito fra varie macchine dell'alias.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Ri-pacchetta i file prima della cancellazione.\n"
@@ -1304,8 +1414,8 @@ msgstr " --repackage - Ri-pacchetta i file prima della cancellazione.\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - usa un'altra root per rimuovere i file rpm. \n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
@@ -1328,17 +1438,17 @@ msgstr ""
" per (dis)installare un pacchetto chroot con l'opzione --"
"root.\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - usa il file synthesis.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - usa il file hdlist.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - modalità prolissa.\n"
@@ -1350,37 +1460,37 @@ msgstr ""
" -a - seleziona tutti i pacchetti che soddisfano "
"l'espressione.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Solo superuser è abilitato a rimuovere pacchetti"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "pacchetti sconosciuti"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "pacchetto sconosciuto"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "la rimozione del pacchetto %s comprometterà il sistema"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Niente da rimuovere"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Controllo per la rimozione dei seguenti pacchetti"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1390,24 +1500,24 @@ msgstr[0] ""
msgstr[1] ""
"Per soddisfare le dipendenze, saranno rimossi i seguenti pacchetti %d (%d MB)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "Rimuovo %d pacchetto?"
msgstr[1] "Rimuovo %d pacchetti?"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (s/N) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Rimozione fallita"
@@ -1434,13 +1544,13 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - stampa la versione di questo tool.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../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"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr " --excludemedia - non usa i supporti elencati, separati da virgole.\n"
@@ -1453,13 +1563,13 @@ msgstr ""
"--literal, -l - non confronta i pattern, usa l'argomento come stringa "
"letterale.\n"
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../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"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1473,7 +1583,7 @@ msgid " --use-distrib - use the given path to access media\n"
msgstr ""
" --synthesis - utilizza la synthesis specificata invece del db urpmi.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1484,7 +1594,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - non stampa le linee uguali.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr "--update - usa solo supporti di aggiornamento.\n"
@@ -1619,77 +1729,87 @@ msgid " --group - group\n"
msgstr " --group - gruppo \n"
#: ../urpmf:72
+#, fuzzy, c-format
+msgid " --license - license\n"
+msgstr " --name - nome dei pacchetti.\n"
+
+#: ../urpmf:73
#, c-format
msgid " --name - package name\n"
msgstr " --name - nome dei pacchetti.\n"
-#: ../urpmf:73
+#: ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - lista di quanto reso obsoleto dal pacchetto.\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr " --packager - curatore del pacchetto.\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - elementi forniti dal pacchetto.\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - requisiti necessari per installare il pacchetto.\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, c-format
msgid " --size - installed size\n"
msgstr " --size - dimensione del pacchetto installato.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - nome dei pacchetti rpm con sorgenti.\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - lista di quanto reso obsoleto dal pacchetto.\n"
+
+#: ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr " --summary - sommario del pacchetto.\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, c-format
msgid " --url - url\n"
msgstr " --url - url di riferimento del pacchetto.\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, c-format
msgid " --vendor - vendor\n"
msgstr " --vendor - distributore\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -m - il supporto dov'è stato trovato il pacchetto\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - stampa versione, release e architettura con il nome.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "formato non corretto, puoi usare un solo tag "
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "uso le variabili d'ambiente su %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1698,12 +1818,12 @@ msgstr ""
"Nota: siccome nessuno dei supporti utilizzati usa hdlist, urpmf non può "
"restituire nessun risultato\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Potresti usare --name per cercare tra i nomi dei pacchetti.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1720,7 +1840,7 @@ msgstr ""
"\n"
"uso:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1728,7 +1848,7 @@ msgstr ""
" --searchmedia - usa solo i supporti indicati per cercare i "
"pacchetti richiesti\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
@@ -1737,7 +1857,7 @@ msgstr ""
"--auto - modalità automatica, prevede la risposta di default \" a "
"tutte le domande\n"
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
@@ -1745,24 +1865,24 @@ msgstr ""
" --auto-select - seleziona automaticamente i pacchetti per aggiornare il "
"sistema.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
" --auto-update - aggiorna i supporti quando si aggiorna la versione del "
"sistema.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - disabilita il controllo MD5SUM.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - forza l'aggiornamento della chiave gpg.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1771,12 +1891,12 @@ msgstr ""
" --no-uninstall - non chiedere mai di rimuovere un pacchetto, ferma "
"l'installazione\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - non installa i pacchetti, esegue solo il download\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1785,7 +1905,7 @@ msgstr ""
" --keep - usa i pacchetti esistenti se possibile, rifiuta\n"
" i pacchetti richiesti se sono da rimuovere.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1796,43 +1916,49 @@ msgstr ""
" un pacchetto sta per essere installato o\n"
" aggiornato, il valore predefinito è %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr ""
" --split-length - per avere transazione più corte, il valore predefinito è %"
"d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy, -y - impone una ricerca fuzzy.\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr ""
" --src, -s - il prossimo pacchetto è un pacchetto sorgente.\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, 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"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr ""
" --clean - rimuove gli rpm dalla cache prima di fare qualsiasi altra "
"cosa.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - tieni in cache gli rpm inutilizzati.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1841,7 +1967,7 @@ msgstr ""
" --allow-nodeps - permette di chiedere all'utente se desidera installare\n"
" dei pacchetti senza controllare le dipendenze.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1850,14 +1976,14 @@ msgstr ""
" --allow-force - permette di chiedere all'utente se desidera installare\n"
" dei pacchetti senza controllare dipendenze e integrità.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr ""
" --root - cambia la directory di root per installare i file rpm "
"\"chrooted\".\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1868,47 +1994,47 @@ msgstr ""
" per installare un pacchetto chroot con l'opzione --"
"root.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - usa wget per recuperare file remoti.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - usa curl per recuperare i file remoti.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --prozilla - usa prozilla per recuperare i file remoti.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr "--curl-options - opzioni aggiuntive da passare a curl\n"
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr "--rsync-options - opzioni da passare ad rsync\n"
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr "--wget-options - opzioni da passare a wget\n"
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr "--prozilla-options - opzioni da passare a prozilla\n"
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - limita la velocità del download.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1919,7 +2045,7 @@ msgstr ""
" (--no-resume lo disabilita, solitamente è "
"disabilitato).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1928,7 +2054,7 @@ msgstr ""
" --proxy - usa il proxy HTTP specificato, il numero di porta\n"
" predefinito è1080 (formato: <proxyhost[:port]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1937,7 +2063,7 @@ msgstr ""
" --proxy-user - specifica utente e password da utilizzare per\n"
" l'autenticazione col proxy (formato: <utente:password>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1946,7 +2072,7 @@ msgstr ""
" --bug - produce un bug report nella directory indicata con\n"
" l'argomento successivo.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1956,7 +2082,7 @@ msgstr ""
" (--no-verify-rpm la disabilita, solitamente è "
"abilitata).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
@@ -1965,39 +2091,44 @@ msgstr ""
" --test - verifica che l'installazione possa avvenire "
"correttamente.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - percorsi da escludere, separati da virgole.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - esclude i file di documentazione.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --ignoresize -non verifica lo spazio disponibile prima dell'installazione\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr ""
"--ignore-arch...- permette di installare pacchetti di altre architetture.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr "--noscripts - non esegue gli script contenuti nei pacchetti\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - pacchetti da saltare durante l'installazione.\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - pacchetti da saltare durante l'installazione.\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2006,52 +2137,52 @@ msgstr ""
" --more-choices - qualora si trovassero più pacchetti propone più scelte\n"
" che quelle predefinite.\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr "--nolock - non bloccare il db degli rpm\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
" --strict-arch - aggiorna solo i pacchetti della stessa architettura.\n"
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
" -a - seleziona tutte le corrispondenze da riga di comando.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - abilita la ricerca tra i provides del pacchetto.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, 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"
-#: ../urpmi:155
+#: ../urpmi:153
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - modalità silenziosa.\n"
-#: ../urpmi:157
+#: ../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:186
+#: ../urpmi:184
#, 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:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2061,12 +2192,12 @@ msgstr ""
"commando\n"
"--bug.\n"
-#: ../urpmi:220
+#: ../urpmi:218
#, 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:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2075,7 +2206,7 @@ msgstr ""
"La directory [%s] esiste già. Usa un'altra directory per i bug report o "
"cancellala"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Impossibile creare una directory [%s] per un bug report"
@@ -2085,7 +2216,7 @@ msgstr "Impossibile creare una directory [%s] per un bug report"
msgid "Environment directory %s does not exist"
msgstr "La directory %s, specificata nelle variabili d'ambiente, non esiste"
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2094,34 +2225,36 @@ msgstr ""
"Errore: %s sembra montato in sola lettura.\n"
"Usa --allow-force per forzare l'operazione."
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr "Aggiorno il supporto...\n"
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (da aggiornare)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (da aggiornare)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (da installare)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, c-format
msgid "%s (to install)"
msgstr "%s (da installare)"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2129,12 +2262,12 @@ msgid ""
msgstr ""
"Per soddisfare le dipendenze, saranno rimossi i seguenti pacchetti %d (%d MB)"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Qual è la tua scelta? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2145,7 +2278,7 @@ msgstr ""
"da pacchetti più vecchi di quelli già installati:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2156,7 +2289,7 @@ msgstr ""
"da pacchetti più vecchi di quelli già installati:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, c-format
msgid ""
"\n"
@@ -2165,12 +2298,12 @@ msgstr ""
"\n"
"Continuo comunque l'istallazione?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (S/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2179,7 +2312,7 @@ msgstr ""
"Uno dei pacchetti richiesti non può essere installato:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2188,7 +2321,7 @@ msgstr ""
"Alcuni dei pacchetti richiesti non possono essere installati:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2199,7 +2332,7 @@ msgstr ""
"devono essere rimossi per poterne aggiornare altri:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2210,7 +2343,7 @@ msgstr ""
"devono essere rimossi per poterne aggiornare altri:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2219,7 +2352,7 @@ msgstr ""
"Questi pacchetti devono essere rimossi per poterne aggiornare altri:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2228,12 +2361,17 @@ msgstr ""
"Questi pacchetti devono essere rimossi per poterne aggiornare altri:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(è solo un test, la rimozione non verrà effettuata)"
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2242,111 +2380,29 @@ msgstr ""
"Devi essere root per installare le seguenti dipendenze:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(è solo un test, l'installazione non verrà fatta)"
-#: ../urpmi:597
+#: ../urpmi:617
#, fuzzy, 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? (%d MB)"
msgstr[1] "Procedo con l'installazione di un pacchetto? (%d MB)"
-#: ../urpmi:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Premi Invio quando sei pronto..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Annulla"
-#: ../urpmi:671
-#, c-format
-msgid "The following package has bad signature"
-msgstr "Questo pacchetto ha una firma errata"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "I seguenti pacchetti hanno delle firme errate"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Vuoi proseguire con l'installazione?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Installazione fallita"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "distribuzione di %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "installazione di %s da %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "installazione di %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Provo l'installazione senza controllare le dipendenze? (s/N) "
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Provo l'installazione in modo ancora più forzato (--force)? (s/N) "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d transazioni dell'installazione fallite"
-msgstr[1] "%d transazioni dell'installazione fallite"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "L'installazione è possibile"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr "I pacchetti sono aggiornati"
-
-#: ../urpmi:838
-#, c-format
-msgid "Package %s is already installed"
-msgstr "Il pacchetto %s è già installato"
-
-#: ../urpmi:839
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "I pacchetti %s sono già installati"
-
-#: ../urpmi:842
-#, c-format
-msgid "Package %s can not be installed"
-msgstr "Il pacchetto %s non può essere installato"
-
-#: ../urpmi:843
-#, c-format
-msgid "Packages %s can not be installed"
-msgstr "I pacchetti %s non possono essere installati"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "Riavvio di urpmi"
@@ -2476,33 +2532,33 @@ msgstr " -v - modalità prolissa.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "impossibile aggiornare il supporto \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, fuzzy, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
"<url> non valido (per una directory locale, serve un percorso assoluto)\n"
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Solo superuser è abilitato ad aggiungere supporti"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, c-format
msgid "creating config file [%s]"
msgstr "creazione del file di configurazione [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "Impossibile creare il file di configurazione [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "non c'è bisogno di fornire <percorso relativo di hdlist> con --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
@@ -2511,17 +2567,17 @@ msgstr ""
"\n"
"Vuoi aggiungere il supporto '%s'"
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "manca il <percorso relativo di hdlist>\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr "Non si può usare %s con un supporto remoto"
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "impossibile creare il supporto \"%s\"\n"
@@ -2688,17 +2744,17 @@ msgstr " -a - seleziona tutti i supporti.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - imponi una ricerca fuzzy sul nome dei supporti.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Solo superuser è abilitato a rimuovere i supporti"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "niente da rimuovere (usa urpmi.addmedia per aggiungere un supporto)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2755,17 +2811,17 @@ msgstr " -a - seleziona tutti i supporti non rimovibili.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - forza l'aggiornamento di synthesis/hdlist.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Solo superuser è abilitato ad aggiornare i supporti"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "niente da aggiornare (usa urpmi.addmedia per aggiungere un supporto)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2774,22 +2830,22 @@ msgstr ""
"la voce da aggiornare non è presente\n"
"(uno di %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "Ignoro il supporto %s"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "rendo disponibile il supporto %s"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2806,7 +2862,7 @@ msgstr ""
"\n"
"uso:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2815,38 +2871,38 @@ msgstr ""
" --searchmedia - usa solo i supporti indicati per cercare i "
"pacchetti richiesti (o aggiornati)\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - impone una ricerca fuzzy (uguale a -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - elenca i pacchetti disponibili.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - elenca i supporti disponibili.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - elenca i supporti disponibili e la loro url.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
" --list-nodes - elenca i nodi disponibili quando si utilizza --parallel.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - elenca gli alias paralleli disponibili.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
@@ -2854,14 +2910,14 @@ msgstr ""
" --dump-config - mostra la configurazione nella forma usata da urpmi."
"addmedia\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr ""
" --src - il prossimo pacchetto è un pacchetto sorgente (uguale a -"
"s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
@@ -2869,13 +2925,13 @@ msgstr ""
" --sources - elenca tutti i pacchetti sorgenti prima del download "
"(solo root).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr ""
" --ignorearch - permette di cercare rpm per un'altra architettura.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2884,22 +2940,22 @@ msgstr ""
" --use-distrib - configura urpmi \"al volo\" da un albero distribuito.\n"
" Permette di interrogare una distribuzione.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - mostra la lista delle modifiche.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - stampa il sommario.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - ricerca a ritroso sui requisiti del pacchetto.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2909,56 +2965,56 @@ msgstr ""
" - ricerca estesa a ritroso (anche sui pacchetti "
"virtuali).\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -p - cerca tra i provides per trovare pacchetto.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - risultati completi con i pacchetti da rimuovere.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - estende la ricerca alle dipendenze del pacchetto.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - stampa i gruppi anche col nome.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - stampa informazioni utili in forma leggibile.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - elenca i file presenti in un pacchetto.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, c-format
msgid " -m - equivalent to -du\n"
msgstr " -m - equivalente a -du\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - stampa versione e release anche col nome.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - il prossimo pacchetto è un pacchetto sorgente (uguale a --"
"src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2967,49 +3023,49 @@ msgstr ""
" -u - rimuove il pacchetto se una versione più recente è già "
"installata.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - impone una ricerca fuzzy (uguale a --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -Y - come -y, ma non distingue maiuscole da minuscole.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, 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"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes può essere usato solo con --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
"manca hdlist per il supporto \"%s\", solo risultati parziali per il "
"pacchetto %s"
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"manca hdlist per il supporto \"%s\", solo risultati parziali per i pacchetti "
"%s"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
"manca hdlist per il supporto \"%s\", impossibile dare risultati per il "
"pacchetto %s"
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -3017,11 +3073,22 @@ msgstr ""
"manca hdlist per il supporto \"%s\", impossibile dare risultati per i "
"pacchetti %s"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Nessun changelog trovato\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "I seguenti pacchetti hanno firme non corrette:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Vuoi proseguire con l'installazione?"
+
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Devi essere root per usare --use-distrib"
diff --git a/po/ja.po b/po/ja.po
index 052f9472..82168cea 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-ja\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2007-08-07 17+0900\n"
"Last-Translator: BANDO Yukiko <ybando@k6.dion.ne.jp>\n"
"Language-Team: Japanese <cooker-i18n@mandrivalinux.org>\n"
@@ -22,7 +22,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "RPM のインストール"
@@ -32,7 +32,7 @@ msgstr "RPM のインストール"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "エラー: ファイル %s が見つかりません。操作をキャンセルします。"
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_OK"
@@ -98,7 +98,7 @@ msgstr "インストール(_I)"
msgid "_Save"
msgstr "保存(_S)"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "キャンセル(_C)"
@@ -118,17 +118,17 @@ msgstr "不明なオプション %s"
msgid "No packages specified"
msgstr "パッケージが指定されていません"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "お待ちください..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "root 権限が必要です"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -139,42 +139,42 @@ msgstr ""
"%s\n"
"このままインストールを続けますか?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "警告"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "OK"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (アップグレードするため)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (インストールするため)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "パッケージの選択"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "以下のパッケージのいずれかが必要です:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "中止(_A)"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -185,58 +185,60 @@ msgstr ""
"%s\n"
"このままインストールを続けますか?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "依存を満たすために以下のパッケージをインストールします:"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "依存を満たすために以下のパッケージをインストールします:"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d 個のパッケージ, %d MB)"
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "パッケージをインストール..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "ソースパッケージを取得できませんでした。中止します。"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "準備中..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "パッケージ %s (%s/%s) をインストール..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "メディア %s を デバイス [%s] に挿入してください"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "パッケージ %s をダウンロード..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"以下のパッケージの署名は間違っています:\n"
-"%s\n"
-"\n"
-"インストールを続けますか?"
+msgid "_Done"
+msgstr "完了(_D)"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -247,41 +249,27 @@ msgstr ""
"%s\n"
"urpmi データベースを更新してください。"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "%s を削除"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "準備中..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "パッケージ %s (%s/%s) をインストール..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "完了(_D)"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, c-format
msgid "Installation failed:"
msgstr "インストール失敗:"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "パッケージは既にインストールされています"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "インストールが完了しました"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "%s を削除"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -316,7 +304,7 @@ msgstr " -f - RPM の完全な名前を表示 (NVRA)\n"
msgid " defaults to %s.\n"
msgstr " デフォルトは %s\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "パッケージのインストールはスーパーユーザにしかできません"
@@ -326,98 +314,98 @@ msgstr "パッケージのインストールはスーパーユーザにしかで
msgid "Running urpmi in restricted mode..."
msgstr "urpmi を制限モードで実行中..."
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "rpmdb を開けません"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr "キャッシュに %d RPM ヘッダを検出、古い %d ヘッダを削除"
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "RPM ファイル名 [%s] が無効です"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "RPM ファイル [%s] を取得..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...取得完了"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...取得に失敗: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "RPM ファイル [%s] にアクセスできません"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "スペックファイル %s [%s] を分析できません"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "RPM ファイルを登録できません"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "RPM とアーキテクチャが一致していません [%s]"
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "ローカルパッケージの登録中にエラーが発生"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "この操作は制限モードでは禁止されています"
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "コマンドラインのプロキシ宣言が間違っています\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr "chroot ディレクトリが存在しません"
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: RPM ファイル %s を読み込めません\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
+#, c-format
+msgid "chroot directory doesn't exist"
+msgstr "chroot ディレクトリが存在しません"
+
+#: ../urpm/args.pm:424
#, c-format
msgid "Can't use %s without %s"
msgstr "%2$s なしで %1$s は使えません"
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
#, c-format
msgid "Can't use %s with %s"
msgstr "%s は %s と一緒には使えません"
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr "引数が多すぎます\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "メディア %s の hdlist synthesis ファイルを作成しました"
@@ -606,7 +594,12 @@ msgstr "パッケージ %s は見つかりません"
msgid "malformed URL: [%s]"
msgstr "不正な形式の URL: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "メディア %s から RPM ファイルを取得..."
@@ -616,7 +609,7 @@ msgstr "メディア %s から RPM ファイルを取得..."
msgid "[repackaging]"
msgstr "[repackaging 再パッケージ化]"
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -624,37 +617,42 @@ msgstr ""
"%s にインストールするためのトランザクションを作成しました\n"
"(remove=%d, install=%d, upgrade-%d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "トランザクションを作成できません"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "delta-rpm パッケージ %s から rpm を抽出できません"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "パッケージ %s を追加 (id=%d, eid=%d, update=%d, file=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "%s をインストールできません"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "%s を削除"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "%s を削除"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "インストールされている rpm (%s) を %s から削除"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "パッケージ %s の詳細情報"
@@ -684,11 +682,102 @@ msgstr "ベースが指定されていません"
msgid "Cannot connect to ldap uri:"
msgstr "LDAP の URI に接続できません:"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "%s データベースがロックされています"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "警告"
+
+#: ../urpm/lock.pm:65
#, c-format
msgid "%s database locked"
msgstr "%s データベースがロックされています"
+#: ../urpm/main_loop.pm:99
+#, c-format
+msgid "The following package has bad signature"
+msgstr "以下のパッケージは署名が間違っています"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "以下のパッケージは署名が間違っています"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "インストールを続けますか?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "インストールに失敗"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "%s を配信"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "%s を %s からインストール"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "%s をインストール"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "依存を確認せずにインストールしますか? (y/N)[デフォルトはN] "
+
+#: ../urpm/main_loop.pm:205
+#, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "インストールを強行 (--force) してみますか?(y/N)[デフォルトはN]"
+
+#: ../urpm/main_loop.pm:247
+#, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d 件のインストールトランザクションが失敗しました"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "インストール可能です"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr "パッケージは最新です"
+
+#: ../urpm/main_loop.pm:271
+#, c-format
+msgid "Package %s is already installed"
+msgstr "パッケージ %s は既にインストールされています"
+
+#: ../urpm/main_loop.pm:272
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "パッケージ %s は既にインストールされています"
+
+#: ../urpm/main_loop.pm:275
+#, c-format
+msgid "Package %s can not be installed"
+msgstr "パッケージ %s はインストールできません"
+
+#: ../urpm/main_loop.pm:276
+#, c-format
+msgid "Packages %s can not be installed"
+msgstr "パッケージ %s はインストールできません"
+
#: ../urpm/md5sum.pm:23
#, c-format
msgid "examining %s file"
@@ -739,7 +828,7 @@ msgstr "\"synthesis\" はセットできません (メディア %s)"
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "\"synthesis\" をセットしてください (メディア %s)"
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "%s の hdlist ファイルにアクセスできません。メディアを無視します。"
@@ -832,7 +921,7 @@ msgstr "注: メディア %s に hdlist がないため、検索結果を返す
msgid "Search start: %s end: %s"
msgstr "検索開始: %s 終了: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "セカンドステージ実行中 (依存を計算)\n"
@@ -899,67 +988,72 @@ msgstr ""
"ディストリビューションのメディアにアクセスできません (media.cfg ファイルがあ"
"りません)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "%s というメディアは存在しません"
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "複数のメディアを選択: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "メディア %s を削除"
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "メディア %s について urpmi を再設定"
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...再設定に失敗"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "再設定完了"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "名前ファイルの生成エラー: 依存 %d が見つかりません"
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr "名前ファイルの生成エラー: ファイルに書き込めません (%s)"
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "メディア %s は最新です"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "hdlist ファイル [%s] を検査"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "synthesis ファイル [%s] を検査"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "hdlist [%s] を作成"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -968,78 +1062,78 @@ msgstr ""
"メディア %s の synthesis ファイルを作成できません。hdlist ファイルが壊れてい"
"る可能性があります。"
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr ""
"メディア %s の hdlist (または synthesis) ファイルの読み込み中に問題が発生"
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "メディア %2$s のために [%1$s] をコピー..."
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...コピーに失敗"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "%s の説明ファイルをコピー..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...コピー完了"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "[%s] のコピーに失敗 (ファイルが異常に小さすぎます)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "コピーした source hdlist (または synthesis) の md5sum を計算"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "[%s] のコピーに失敗 (md5sum 不一致)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "取得した source hdlist (または synthesis) の md5sum を計算"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...取得に失敗: md5sum 不一致"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "[%s] には RPM ファイルがありません"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "[%s] からRPMファイルを読み込み"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "[%s] から RPM ファイルを読み込めません: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "RPM を読めませんでした"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1050,74 +1144,74 @@ msgstr ""
"この現象は、メディアを追加するときに手動でディレクトリをマウントすると起こる"
"ことがあります。"
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "メディア %2$s の hdlist ファイル %1$s が無効"
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "%s の source hdlist (または synthesis) を取得..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "検出した hdlist (または synthesis) を %s と認識しました"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "メディア %s には hdlist ファイルがありません"
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "%s の公開鍵ファイルを検査..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...%2$s の公開鍵ファイルから鍵 %1$s を取り込みました"
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "%s の公開鍵ファイルを取り込めません"
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "メディア %s のリストファイルを作成"
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, c-format
msgid "updated medium \"%s\""
msgstr "メディア %s を更新しました"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "%s の hdlist を分析できません"
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "メディア %s の synthesis ファイルの読み込み中に問題が発生"
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "メディア %s のヘッダを読み込み"
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "NnNnいイ"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "YyYyはハ"
@@ -1177,47 +1271,52 @@ msgstr "メディア %s はリムーバブルだと判断しましたが、不
msgid "unable to access medium \"%s\""
msgstr "メディア %s にアクセスできません"
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "%s という名前のパッケージはありません"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "以下のパッケージが %s を含んでいます: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "%s がないために"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "パッケージ %s は既にインストールされています"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "%s が依存を満たしていないために"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "%s をアップグレードするために"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "%s を維持するために"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "%s をインストールするために"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "%s と衝突するために"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "要求されていません"
@@ -1237,6 +1336,16 @@ msgstr "無効な鍵 ID (%s)"
msgid "Missing signature (%s)"
msgstr "署名がありません (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "設定ファイル [%s] を作成できません"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "コピーに失敗"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1253,8 +1362,8 @@ msgstr ""
"\n"
"使い方:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - このヘルプを表示\n"
@@ -1269,18 +1378,18 @@ msgstr " --auto - 複数の選択肢から自動的にパッケージ
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - 問題なく削除できるかどうかテストする\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr " --force - 足りないパッケージがあっても強制的に実行する\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - urpmi をエイリアスの複数のマシンに使う\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - ファイルを削除する前に再パッケージ化する\n"
@@ -1290,8 +1399,8 @@ msgstr " --repackage - ファイルを削除する前に再パッケージ
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - RPM の削除に他のルートを使う\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --urpmi-root - urpmi db と RPM のインストールに他のルートを使う\n"
@@ -1311,17 +1420,17 @@ msgstr ""
" で設定。chroot を --root オプション付きでインストール/\n"
" アンインストールする際に使用。\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - synthesis ファイルを使う\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - hdlist ファイルを使う\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - 詳細モード\n"
@@ -1331,60 +1440,60 @@ msgstr " --verbose, -v - 詳細モード\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - 指定した表現を含むすべてのパッケージを選択\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "パッケージの削除はスーパーユーザにしかできません"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "不明なパッケージ"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "不明なパッケージ"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "%s を削除するとシステムが壊れます"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "削除するものはありません"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "以下のパッケージを削除するために調査しています"
-#: ../urpme:134
+#: ../urpme:131
#, 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] "依存を満たすために以下の %d 個のパッケージを削除します"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr " (%d MB)"
-#: ../urpme:138
+#: ../urpme:135
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "%d 個のパッケージを削除しますか?"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (y/N)[デフォルトはN] "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "削除に失敗"
@@ -1410,12 +1519,12 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - このツールのバージョンを表示\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr " --env - 特定の環境を使う (バグレポートなどのため)\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr " --excludemedia - 指定したメディアは使わない (コンマで区切る)\n"
@@ -1426,12 +1535,12 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr " --literal, -l - パターンで検索せずに引数を普通の文字列とみなす\n"
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - 指定したメディアのみを使う (コンマで区切る)\n"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1442,7 +1551,7 @@ msgstr " --sortmedia - カンマ区切りで指定したメディアごと
msgid " --use-distrib - use the given path to access media\n"
msgstr " --use-distrib - メディアへのアクセスに指定したパスを使う\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1453,7 +1562,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - 全く同じ行は表示しない\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - 更新メディアのみを使う\n"
@@ -1585,76 +1694,86 @@ msgid " --group - group\n"
msgstr " --group - グループ\n"
#: ../urpmf:72
+#, fuzzy, c-format
+msgid " --license - license\n"
+msgstr " --name - パッケージ名\n"
+
+#: ../urpmf:73
#, c-format
msgid " --name - package name\n"
msgstr " --name - パッケージ名\n"
-#: ../urpmf:73
+#: ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - obsolete (廃止) タグ\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr " --packager - パッケージ作成者\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - provide (提供) タグ\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - require (要求) タグ\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, c-format
msgid " --size - installed size\n"
msgstr " --size - インストール後のサイズ\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - ソース RPM の名前\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - obsolete (廃止) タグ\n"
+
+#: ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr " --summary - 要約\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, c-format
msgid " --url - url\n"
msgstr " --url - URL\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, c-format
msgid " --vendor - vendor\n"
msgstr " --vendor - ベンダー\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -m - パッケージのあるメディア\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - バージョン, リリース番号, アーキテクチャを表示\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "不正な形式: 多値タグは一つしか使えません"
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "%s に特定の環境を使用\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1663,12 +1782,12 @@ msgstr ""
"注: どのメディアにも hdlist がないため、検索結果を返すことができませんでし"
"た\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "パッケージ名を探すには --name オプションを使うと便利です\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1684,42 +1803,42 @@ msgstr ""
"\n"
"使い方:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
" --searchmedia - 指定したメディアのみを要求したパッケージの検索に使う\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr " --auto\t - 非対話モード、質問に対する答えはデフォルトとみなす\n"
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr " --auto-select - 自動的にパッケージを選択してシステムを更新\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr " --auto-update - メディアを更新し、その後システムを更新\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - MD5SUM ファイルをチェックしない\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - gpg 鍵の更新を強制する\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1728,19 +1847,19 @@ msgstr ""
" --no-uninstall - パッケージを削除する必要があるときは自動的にインストールを"
"中止\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - パッケージをインストールしない (ダウンロードのみ)\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
" packages that lead to removals.\n"
msgstr " --keep - 既存のパッケージを維持し、削除要求は拒否する\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1750,37 +1869,43 @@ msgstr ""
" --split-level - 一定数以上のパッケージがインストールまたは更新される\n"
" ときは分割して行う。デフォルトは %d\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - 分割する最低パッケージ数。デフォルトは %d\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy, -y - ファジー検索\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src, -s - ソースパッケージを指定\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr " --install-src - ソースのみをインストール (バイナリなし)\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - 最初にキャッシュから RPM を削除する\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - RPM をキャッシュに残す\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1789,7 +1914,7 @@ msgstr ""
" --allow-nodeps - 依存関係に問題が発生したときに、自動的に終了せずに\n"
" --nodeps でインストールするかどうか質問する\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1798,12 +1923,12 @@ msgstr ""
" --allow-force - 依存関係に問題が発生したときに、自動的に終了せずに\n"
" --force でインストールするかどうか質問する\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - RPM のインストールに他のルートを使う\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1813,47 +1938,47 @@ msgstr ""
" で設定。chroot を --root オプション付きでインストール/\n"
" アンインストールする際に使用。\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - リモートファイルの取得に wget を使う\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - リモートファイルの取得に curl を使う\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --prozilla - リモートファイルの取得に prozilla を使う\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr " --curl-options - curl に渡す追加オプション\n"
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr " --rsync-options - rsync に渡す追加オプション\n"
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr " --wget-options - wget に渡す追加オプション\n"
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr " --prozilla-options - prozilla に渡す追加オプション\n"
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - ダウンロード速度を制限\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1862,7 +1987,7 @@ msgstr ""
" --resume - 不完全なファイルのダウンロードを再開する\n"
" (--no-resume で無効化、デフォルトで無効)\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1871,7 +1996,7 @@ msgstr ""
" --proxy - 指定した HTTP プロキシを使う。デフォルトのポート番号は\n"
" 1080。(形式: <proxyhost[:port]>)\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1880,14 +2005,14 @@ msgstr ""
" --proxy-user - プロキシ認証に使うユーザ名とパスワードを\n"
" 指定する。(形式: <user:password>)\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
" next arg.\n"
msgstr " --bug - 指定したディレクトリにバグレポートを出力\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1896,44 +2021,49 @@ msgstr ""
" --verify-rpm - インストールする前に RPM の署名を確認する\n"
" (デフォルトで有効。--no-verify-rpm で無効)\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr " --test - 正しくインストールされるかどうかテストする\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - 除外するパスを指定 (カンマで区切る)\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - doc ファイルを除外する\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr " --ignoresize - インストールする前にディスク容量を確認しない\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --ignorearch - 別のアーキテクチャの RPM のインストールを許可する\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - パッケージのスクリプトを実行しない\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - インストールをスキップするパッケージ\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - インストールをスキップするパッケージ\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1942,48 +2072,48 @@ msgstr ""
" --more-choices - 複数のパッケージがある場合に、デフォルト以外の選択肢を\n"
" 表示する\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - RPM データベースをロックしない\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - 同じアーキテクチャのパッケージのみを更新\n"
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - 指定した表現を含むすべてのパッケージを選択する\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - provide (提供) タグも検索対象に含める\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - provide (提供) タグは検索の対象にしない\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - 詳細を表示しない\n"
-#: ../urpmi:157
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
" コマンドラインで指定したパッケージ名/RPM ファイルをインストールします\n"
-#: ../urpmi:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr "エラー: --auto-select はパッケージリストと一緒には使えません。\n"
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -1992,13 +2122,13 @@ msgstr ""
"エラー: バグレポートを生成するには、通常のコマンドライン引数に加えて\n"
"--bug を指定してください。\n"
-#: ../urpmi:220
+#: ../urpmi:218
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
"バイナリ RPM は --install-src オプション使用時にはインストールできません"
-#: ../urpmi:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2007,7 +2137,7 @@ msgstr ""
"ディレクトリ [%s] は既に存在します。バグレポートには他のディレクトリを使う"
"か、既存のディレクトリを削除してください。"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "バグレポート用のディレクトリ [%s] を作成できません"
@@ -2017,7 +2147,7 @@ msgstr "バグレポート用のディレクトリ [%s] を作成できません
msgid "Environment directory %s does not exist"
msgstr "環境ディレクトリ %s が存在しません"
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2026,46 +2156,48 @@ msgstr ""
"エラー: %s は読み取り専用でマウントされているようです。\n"
"操作を強制するには --allow-force を使ってください。"
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr "メディアを更新...\n"
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (アップグレードするため)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (アップグレードするため)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (インストールするため)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, c-format
msgid "%s (to install)"
msgstr "%s (インストールするため)"
-#: ../urpmi:447
+#: ../urpmi:454
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "'%s' の依存を満たすために以下のパッケージのいずれかが必要です:"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "どれを選びますか? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2076,7 +2208,7 @@ msgstr ""
"パッケージに依存しているため、インストールできません:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2087,7 +2219,7 @@ msgstr ""
"パッケージに依存しているため、インストールできません:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, c-format
msgid ""
"\n"
@@ -2096,12 +2228,12 @@ msgstr ""
"\n"
"このままインストールを続けますか?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (Y/n)[デフォルトはY] "
-#: ../urpmi:503
+#: ../urpmi:520
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2110,7 +2242,7 @@ msgstr ""
"インストールできないパッケージがあります:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2119,7 +2251,7 @@ msgstr ""
"インストールできないパッケージがあります:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2130,7 +2262,7 @@ msgstr ""
"更新するには以下のパッケージを削除しなければなりません:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2141,7 +2273,7 @@ msgstr ""
"更新するには以下のパッケージを削除しなければなりません:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2150,7 +2282,7 @@ msgstr ""
"更新するには以下のパッケージを削除しなければなりません:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2159,12 +2291,17 @@ msgstr ""
"更新するには以下のパッケージを削除しなければなりません:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(テストのみ、実際には削除されません)"
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2173,109 +2310,28 @@ msgstr ""
"以下の依存パッケージをインストールするには root 権限が必要です:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(テストのみ、実際にはインストールされません)"
-#: ../urpmi:597
+#: ../urpmi:617
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "%d 個のパッケージのインストールを開始しますか?"
-#: ../urpmi:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "準備ができたら Enter を押してください"
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "キャンセル"
-#: ../urpmi:671
-#, c-format
-msgid "The following package has bad signature"
-msgstr "以下のパッケージは署名が間違っています"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "以下のパッケージは署名が間違っています"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "インストールを続けますか?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "インストールに失敗"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "%s を配信"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "%s を %s からインストール"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "%s をインストール"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "依存を確認せずにインストールしますか? (y/N)[デフォルトはN] "
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "インストールを強行 (--force) してみますか?(y/N)[デフォルトはN]"
-
-#: ../urpmi:815
-#, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d 件のインストールトランザクションが失敗しました"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "インストール可能です"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr "パッケージは最新です"
-
-#: ../urpmi:838
-#, c-format
-msgid "Package %s is already installed"
-msgstr "パッケージ %s は既にインストールされています"
-
-#: ../urpmi:839
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "パッケージ %s は既にインストールされています"
-
-#: ../urpmi:842
-#, c-format
-msgid "Package %s can not be installed"
-msgstr "パッケージ %s はインストールできません"
-
-#: ../urpmi:843
-#, c-format
-msgid "Packages %s can not be installed"
-msgstr "パッケージ %s はインストールできません"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "urpmi を再スタートします"
@@ -2404,32 +2460,32 @@ msgstr " -v - 詳細モード。\n"
msgid "unable to update medium \"%s\"\n"
msgstr "メディア %s を更新できません\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr "不正な <url> (ローカルディレクトリの場合は絶対パスが必要です)"
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "メディアの追加はスーパーユーザにしかできません"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, c-format
msgid "creating config file [%s]"
msgstr "設定ファイル [%s] を作成"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "設定ファイル [%s] を作成できません"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "--distrib に <hdlistの相対パス> は必要ありません"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
@@ -2438,17 +2494,17 @@ msgstr ""
"\n"
"メディア '%s' を追加しますか?"
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<hdlistの相対パス> の指定がありません\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr "%s はリモートメディアには使えません"
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "メディア %s を作成できません\n"
@@ -2611,17 +2667,17 @@ msgstr " -a - 全メディアを選択\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - メディア名をファジー検索\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "メディアの削除はスーパーユーザにしかできません"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "削除するものがありません (urpmi.addmedia でメディアを追加できます)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2676,17 +2732,17 @@ msgstr " -a - リムーバブルメディア以外のすべてを
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - synthesis/hdlist を強制的に更新\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "メディアの更新はスーパーユーザにしかできません"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "更新するものがありません (urpmi.addmedia でメディアを追加できます)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2695,22 +2751,22 @@ msgstr ""
"更新対象が見つかりません\n"
"(%s の中のいずれか)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "「%s」"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "メディア %s を無視しています"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "メディア %s を有効にしています"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2726,7 +2782,7 @@ msgstr ""
"\n"
"使い方:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2735,49 +2791,49 @@ msgstr ""
" --searchmedia - 指定したメディアのみを要求した (または更新された) パッ"
"ケージの検索に使う\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - ファジー検索 (-y と同じ)\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - 利用できるパッケージを表示\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - 利用できるメディアを表示\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - 利用できるメディアと URL を表示\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr " --list-nodes - --parallel に利用できるノードを表示\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - 利用できるパラレルエイリアスを表示\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
" --dump-config - メディアの設定を urpmi.addmedia の引数の形式で表示\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr " --src - ソースパッケージを指定 (-s と同じ)\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
@@ -2785,12 +2841,12 @@ msgstr ""
" --sources - ダウンロードする前にすべてのソースパッケージを表示 (root "
"のみ)\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --ignorearch - 別のアーキテクチャの RPM も検索に含める\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2799,22 +2855,22 @@ msgstr ""
" --use-distrib - ディストリビューションのツリーから urpmi をオンザフライ\n"
" で設定。ディストリビューションの検索を可能にする。\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - 変更ログを表示\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - 要約を表示\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - 指定したパッケージに依存するパッケージを逆検索\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2823,7 +2879,7 @@ msgstr ""
" --whatrequires-recursive\n"
" - 拡張逆検索 (仮想パッケージを含める)\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, c-format
msgid ""
" --whatprovides, -p\n"
@@ -2832,47 +2888,47 @@ msgstr ""
" --whatprovides, -p\n"
" - パッケージを探すために provide (提供) タグを検索\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - 削除されるパッケージを表示\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - 依存するパッケージも検索して表示\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - グループと名前を表示\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - 読みやすい形で情報を表示\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - パッケージに含まれるファイルを表示\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, c-format
msgid " -m - equivalent to -du\n"
msgstr " -m - -du に相当\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - 名前, バージョン, リリース番号を表示\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - ソースパッケージを指定 (--src と同じ)\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2880,52 +2936,63 @@ msgid ""
msgstr ""
" -u - 新しい版がインストールされているときはパッケージを削除\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - ファジー検索 (--fuzzy と同じ)\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -Y - 大文字/小文字を区別しない [-y] (ファジー検索)\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " 指定したパッケージ名/RPM ファイルがあるか調べる\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes は --parallel と一緒にしか使えません"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr "メディア %s に hdlist がないため、パッケージ %s の検索結果は不完全です"
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr "メディア %s に hdlist がないため、パッケージ %s の検索結果は不完全です"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr "メディア %s に hdlist がないため、パッケージ %s の検索結果を返せません"
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr "メディア %s に hdlist がないため、パッケージ %s の検索結果を返せません"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "変更ログはありません\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "以下のパッケージの署名は間違っています:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "インストールを続けますか?"
+
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "--use-distrib を使用するには root 権限が必要です。"
diff --git a/po/ka.po b/po/ka.po
index 2865391a..b3cd135b 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2003-01-29 23:47+0400\n"
"Last-Translator: Aiet Kolkhi <aiet@gmx.net>\n"
"Language-Team: Georgian\n"
@@ -19,7 +19,7 @@ msgstr ""
"X-Generator: KBabel 0.9.6\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, fuzzy, c-format
msgid "RPM installation"
msgstr "ინსტალაცია ჩაიშალა"
@@ -29,7 +29,7 @@ msgstr "ინსტალაცია ჩაიშალა"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -77,7 +77,7 @@ msgstr "ინსტალირება"
msgid "_Save"
msgstr "_შენახვა"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_გაუქმება"
@@ -97,17 +97,17 @@ msgstr "უცნობი ტიპის ფაილი %s-სთვის"
msgid "No packages specified"
msgstr "ბრძანება არ იქნა მითითებული"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, fuzzy, c-format
msgid "Please wait..."
msgstr "გთხოვთ იქონიოთ მოთმინება"
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr ""
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -115,42 +115,42 @@ msgid ""
"Continue installation anyway?"
msgstr "უკვე ყველაფერი ჩაწერილია"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "გაფრთხილება"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "ო-ქეი"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr ""
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, fuzzy, c-format
msgid " (to install)"
msgstr "ავტომატური ინსტალირება"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, fuzzy, c-format
msgid "_Abort"
msgstr "შესახებ..."
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -158,54 +158,60 @@ msgid ""
"Continue installation anyway?"
msgstr "%s შედმეგ პაკეტებშია: %s\n"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "დამოკიდებულებების შესასრულებლად შემდეგი პაკეტები ჩაიწერება (%d მბ)"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "დამოკიდებულებების შესასრულებლად შემდეგი პაკეტები ჩაიწერება (%d მბ)"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] ""
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, fuzzy, c-format
msgid "Package installation..."
msgstr "ინსტალაციისათვის საჭირო ramdisk იმიჯები"
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, fuzzy, c-format
msgid "unable to get source packages, aborting"
msgstr "ვერ ვიყენებ პარალელურ პარამეტრს \"%s\""
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr ""
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "პაკეტის ინსტალაცია: `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "გთხოვთ ჩადოთ: %s სახელით: %s"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, fuzzy, c-format
msgid "Downloading package `%s'..."
msgstr "პაკეტის ინსტალაცია: `%s' (%s/%s)..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr "%s შედმეგ პაკეტებშია: %s\n"
+msgid "_Done"
+msgstr "დასრულდა"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -213,41 +219,27 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../gurpmi2:292 ../urpme:142
-#, fuzzy, c-format
-msgid "removing %s"
-msgstr "მომხმარებლის წაშლა : %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr ""
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "პაკეტის ინსტალაცია: `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, fuzzy, c-format
-msgid "_Done"
-msgstr "დასრულდა"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "ინსტალაცია ჩაიშალა"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "უკვე ყველაფერი ჩაწერილია"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, fuzzy, c-format
msgid "Installation finished"
msgstr "ინსტალაცია ჩაიშალა"
+#: ../gurpmi2:312 ../urpme:139
+#, fuzzy, c-format
+msgid "removing %s"
+msgstr "მომხმარებლის წაშლა : %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -280,7 +272,7 @@ msgstr " --help - აჩვენე ეს დამხმარე
msgid " defaults to %s.\n"
msgstr ""
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, fuzzy, c-format
msgid "Only superuser is allowed to install packages"
msgstr ""
@@ -292,98 +284,98 @@ msgstr ""
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, fuzzy, c-format
msgid "unable to open rpmdb"
msgstr "ვერ ვიძახებ ფაილს %s\n"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr ""
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, fuzzy, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "ვიძახებ hdlists ფაილს..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...გამოძახება დასრულდა"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...გამოძახება ჩაიშალა: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, fuzzy, c-format
msgid "unable to access rpm file [%s]"
msgstr "ვერ ვშიფრავ \"%s\"-ს ფაილში [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "ვერ ვშიფრავ \"%s\"-ს ფაილში [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, fuzzy, c-format
msgid "unable to register rpm file"
msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr ""
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr ""
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, fuzzy, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "ვერ წავიკითხე მენიუს ფაილი:%s"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, fuzzy, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
@@ -570,7 +562,12 @@ msgstr "უკვე ყველაფერი ჩაწერილია"
msgid "malformed URL: [%s]"
msgstr ""
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, fuzzy, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
@@ -580,43 +577,48 @@ msgstr "პრობლემა synthesis-ის ფაილის ან მ
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, fuzzy, c-format
msgid "unable to create transaction"
msgstr "ვერ მოვახერხე დირექტორია %s-ის შექმნა"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr ""
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, fuzzy, c-format
msgid "unable to install package %s"
msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "ვაგდებ მედიას \"%s\""
+
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing package %s"
msgstr "ვაგდებ მედიას \"%s\""
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "ვაინსტალირებ: %s\n"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, fuzzy, c-format
msgid "More information on package %s"
msgstr "გვერდის ინფორმაცია არ არსებობს"
@@ -646,11 +648,102 @@ msgstr "ბრძანება არ იქნა მითითებულ
msgid "Cannot connect to ldap uri:"
msgstr "ვერ ვიყენებ მეხსიერებას პალიტრის ელემენტებისთვის"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "urpmi მონაცემთა ბაზა ჩაკეტილია"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "გაფრთხილება"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "urpmi მონაცემთა ბაზა ჩაკეტილია"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
+
+#: ../urpm/main_loop.pm:100
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
+msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
+
+#: ../urpm/main_loop.pm:101
+#, fuzzy, c-format
+msgid "Do you want to continue installation ?"
+msgstr "გნებავთ დაამუშაოთ:"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "ინსტალაცია ჩაიშალა"
+
+#: ../urpm/main_loop.pm:133
+#, fuzzy, c-format
+msgid "distributing %s"
+msgstr "ვაინსტალირებ: %s\n"
+
+#: ../urpm/main_loop.pm:148
+#, fuzzy, c-format
+msgid "installing %s from %s"
+msgstr "ვაინსტალირებ: %s\n"
+
+#: ../urpm/main_loop.pm:150
+#, fuzzy, c-format
+msgid "installing %s"
+msgstr "ვაინსტალირებ: %s\n"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "გნებავთ ვცადე ჩაწერა დამოკიდებულებების შემოწმების გარეშე? (ხ/ა) [ა] "
+
+#: ../urpm/main_loop.pm:205
+#, fuzzy, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "გნებავთ ვცადო ჩაწერა ძალით (--force)? (ხ/ა) [ა] "
+
+#: ../urpm/main_loop.pm:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "ინსტალაციაშტან დაკავშირებული მითითებები"
+
+#: ../urpm/main_loop.pm:258
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "ინსტალაცია ჩაიშალა"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "უკვე ყველაფერი ჩაწერილია"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "უკვე ყველაფერი ჩაწერილია"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "უკვე ყველაფერი ჩაწერილია"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "უკვე ყველაფერი ჩაწერილია"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -701,7 +794,7 @@ msgstr "ვცდილობ გადავახტე არსებულ
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "ვერ ვუკავშირდები hdlist ფაილს \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
@@ -793,7 +886,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr ""
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr ""
@@ -861,144 +954,149 @@ msgstr "ვერ ვიძახებ ფაილს %s\n"
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "ვერ ვპოულობ პირველ საინსტალაციო მედიუმს (ვერ მივაკვლიე hdlists ფაილს)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, fuzzy, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "ვცდილობ გადავახტე არსებულ მედიას \"%s\"-ს, თავიდან ვიშორებ"
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "ვირჩევ მრავალ მედიას: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "ვაგდებ მედიას \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "პრობლემა hdlist ფაილის ან მედიუმის კითხვისას \"%s\""
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "მენიუს კონფიგურაცია დამახსოვრებულია"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "სერვერის კონფიგურაცია"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "მედიუმი \"%s\" უკვე არსებობს"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "ვამოწმებ hdlist ფაილს [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "ვამოწმებ synthesis ფაილს [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, fuzzy, c-format
msgid "building hdlist [%s]"
msgstr "ვამოწმებ hdlist ფაილს [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, fuzzy, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, fuzzy, c-format
msgid "...copying failed"
msgstr "...კოპირება დასრულდა"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "\"%s\"-ის აღწერილობის ფაილის კოპირება..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...კოპირება დასრულდა"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "...კოპირება ჩაიშალა"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, fuzzy, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "source hdlist-ის (ან synthesis-ის) კოპირება o"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, fuzzy, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "...კოპირება ჩაიშალა"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, fuzzy, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "source hdlist-ის (ან synthesis-ის) კოპირება o"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, fuzzy, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...გამოძახება ჩაიშალა: %s"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, fuzzy, c-format
msgid "no rpm files found from [%s]"
msgstr "ვამოწმებ hdlist ფაილს [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, fuzzy, c-format
msgid "reading rpm files from [%s]"
msgstr "ვამოწმებ hdlist ფაილს [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, fuzzy, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1006,74 +1104,74 @@ msgid ""
"medium."
msgstr ""
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, fuzzy, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "ვიძახებ hdlists ფაილს..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, fuzzy, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "ვიპოვე პარალელური სათაე (handler) nodes:-ისთვის %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, fuzzy, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, fuzzy, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "\"%s\"-ის აღწერილობის ფაილის კოპირება..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, fuzzy, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, fuzzy, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "ვერ ვიძახებ ფაილს %s\n"
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, fuzzy, c-format
msgid "writing list file for medium \"%s\""
msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "დამატებული მედიუმი %s"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, fuzzy, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "ვერ ვუკავშირდები hdlist ფაილს \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, fuzzy, c-format
msgid "reading headers from medium \"%s\""
msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "nNaAა"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "yYkKxXხ"
@@ -1133,51 +1231,56 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "ვერ ვუკავშირდები მედიას \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, fuzzy, c-format
msgid "No package named %s"
msgstr "არც ერთ პაკეტს არ ქვია %s\n"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, fuzzy, c-format
msgid "The following packages contain %s: %s"
msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr ""
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "უკვე ყველაფერი ჩაწერილია"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, fuzzy, c-format
msgid "trying to promote %s"
msgstr "ვერ ვპოულობ წასაშლელ შენატანს!"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, fuzzy, c-format
msgid "in order to keep %s"
msgstr ""
"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
"ჩაწეროს პაკეტები."
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, fuzzy, c-format
msgid "in order to install %s"
msgstr ""
"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
"ჩაწეროს პაკეტები."
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr ""
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, fuzzy, c-format
msgid "unrequested"
msgstr "Freestyle"
@@ -1197,6 +1300,16 @@ msgstr ""
msgid "Missing signature (%s)"
msgstr ""
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "შესვლა ვერ განხორციელდა"
+
#: ../urpme:40
#, fuzzy, c-format
msgid ""
@@ -1214,8 +1327,8 @@ msgstr ""
"\n"
"გამოყენება:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - აჩვენე ეს დამხმარე ტექსტი.\n"
@@ -1230,18 +1343,18 @@ msgstr ""
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr ""
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --update - განახლების კვანძები\n"
@@ -1251,8 +1364,8 @@ msgstr " --update - განახლების კვანძებ
msgid " --root - use another root for rpm removal.\n"
msgstr ""
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
@@ -1269,17 +1382,17 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr ""
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr ""
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr "დააჭირეთ Esc ღილაკს ინტერაქტიული რეჟიმისათვის"
@@ -1289,62 +1402,62 @@ msgstr "დააჭირეთ Esc ღილაკს ინტერაქტ
msgid " -a - select all packages matching expression.\n"
msgstr ""
-#: ../urpme:76
+#: ../urpme:73
#, fuzzy, c-format
msgid "Only superuser is allowed to remove packages"
msgstr ""
"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
"ჩაწეროს პაკეტები."
-#: ../urpme:107
+#: ../urpme:104
#, fuzzy, c-format
msgid "unknown packages"
msgstr "უცნობი მდგომარეობა"
-#: ../urpme:107
+#: ../urpme:104
#, fuzzy, c-format
msgid "unknown package"
msgstr "უცნობი მდგომარეობა"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr ""
-#: ../urpme:121
+#: ../urpme:118
#, fuzzy, c-format
msgid "Nothing to remove"
msgstr "ვერ ვპოულობ წასაშლელ შენატანს!"
-#: ../urpme:126
+#: ../urpme:123
#, fuzzy, c-format
msgid "Checking to remove the following packages"
msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, 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] "დამოკიდებულებების შესასრულებლად შემდეგი პაკეტები ჩაიწერება (%d მბ)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "ვაგდებ მედიას \"%s\""
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, fuzzy, c-format
msgid " (y/N) "
msgstr " (ხ/ა) [ხ] "
-#: ../urpme:160
+#: ../urpme:157
#, fuzzy, c-format
msgid "Removal failed"
msgstr "შესვლა ვერ განხორციელდა"
@@ -1371,12 +1484,12 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --help - აჩვენე ეს დამხმარე ტექსტი.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1387,12 +1500,12 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1403,7 +1516,7 @@ msgstr ""
msgid " --use-distrib - use the given path to access media\n"
msgstr ""
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1413,7 +1526,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --help - აჩვენე ეს დამხმარე ტექსტი.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, fuzzy, c-format
msgid " --update - use only update media.\n"
msgstr " --update - განახლების კვანძები\n"
@@ -1545,87 +1658,97 @@ msgstr " --help - აჩვენე ეს დამხმარე
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr " --help - აჩვენე ეს დამხმარე ტექსტი.\n"
#: ../urpmf:73
+#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr " --help - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr ""
-#: ../urpmf:74
+#: ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr " --update - განახლების კვანძები\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, fuzzy, c-format
msgid " --provides - provides tags\n"
msgstr " --update - განახლების კვანძები\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr ""
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --help - აჩვენე ეს დამხმარე ტექსტი.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr ""
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --update - განახლების კვანძები\n"
+
+#: ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr ""
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr " --help - აჩვენე ეს დამხმარე ტექსტი.\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr "დააჭირეთ Esc ღილაკს ინტერაქტიული რეჟიმისათვის"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr " --help - აჩვენე ეს დამხმარე ტექსტი.\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
-#: ../urpmi:79
+#: ../urpmi:75
#, fuzzy, c-format
msgid ""
"urpmi version %s\n"
@@ -1642,60 +1765,60 @@ msgstr ""
"\n"
"გამოყენება:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr ""
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr " --update - განახლების კვანძები\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr ""
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr ""
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
"installation.\n"
msgstr ""
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr ""
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
" packages that lead to removals.\n"
msgstr ""
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1703,241 +1826,252 @@ msgid ""
" default is %d.\n"
msgstr ""
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr ""
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr ""
-#: ../urpmi:105
+#: ../urpmi:101
#, fuzzy, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --help - აჩვენე ეს დამხმარე ტექსტი.\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr ""
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr ""
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
" dependencies checking.\n"
msgstr ""
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
" dependencies checking and integrity.\n"
msgstr ""
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr ""
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
" to install a chroot with --root option.\n"
msgstr ""
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr ""
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr ""
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr ""
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr ""
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
" (--no-resume disables it, default is disabled).\n"
msgstr ""
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../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 ""
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
" authentication (format is <user:password>).\n"
msgstr ""
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
" next arg.\n"
msgstr ""
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
" (--no-verify-rpm disables it, default is enabled).\n"
msgstr ""
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr ""
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr ""
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr ""
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --help - აჩვენე ეს დამხმარე ტექსტი.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr ""
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
-#: ../urpmi:148
+#: ../urpmi:145
+#, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr ""
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:150
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr ""
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
-#: ../urpmi:155
+#: ../urpmi:153
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr "დააჭირეთ Esc ღილაკს ინტერაქტიული რეჟიმისათვის"
-#: ../urpmi:157
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
-#: ../urpmi:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi:243
+#: ../urpmi:241
#, fuzzy, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr "ჯგუფის სახელი უკვე არსებობს, გთხოვთ ამოირჩიოთ სხვა ჯგუფის სახელი"
-#: ../urpmi:244
+#: ../urpmi:242
#, fuzzy, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "ვერ მოვახერხე დირექტორია %s-ის შექმნა"
@@ -1947,53 +2081,55 @@ msgstr "ვერ მოვახერხე დირექტორია %s-
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, c-format
msgid "%s: %s (to upgrade)"
msgstr ""
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, c-format
msgid "%s (to upgrade)"
msgstr ""
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "ავტომატური ინსტალირება"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "ავტომატური ინსტალირება"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "დამოკიდებულებების შესასრულებლად შემდეგი პაკეტები ჩაიწერება (%d მბ)"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "თქვენი არჩევანი? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2001,7 +2137,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2009,33 +2145,33 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "საინსტალაციო სერვერის კონფიგურირება"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (ხ/ა) [ხ] "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
"%s"
msgstr "უკვე ყველაფერი ჩაწერილია"
-#: ../urpmi:504
+#: ../urpmi:521
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s"
msgstr "უკვე ყველაფერი ჩაწერილია"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2043,7 +2179,7 @@ msgid ""
"%s\n"
msgstr "%s შედმეგ პაკეტებშია: %s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2051,135 +2187,59 @@ msgid ""
"%s\n"
msgstr "%s შედმეგ პაკეტებშია: %s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
msgstr "%s შედმეგ პაკეტებშია: %s\n"
-#: ../urpmi:545
+#: ../urpmi:562
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
"%s"
msgstr "%s შედმეგ პაკეტებშია: %s\n"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
"%s\n"
msgstr ""
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
-#: ../urpmi:623
+#: ../urpmi:632
#, fuzzy, c-format
msgid "Press Enter when ready..."
msgstr "გთხოვთ დაგვიდასტუროთ Enter ღილაკზე დაჭერით..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "გამოქცევა"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
-
-#: ../urpmi:672
-#, fuzzy, c-format
-msgid "The following packages have bad signatures"
-msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
-
-#: ../urpmi:673
-#, fuzzy, c-format
-msgid "Do you want to continue installation ?"
-msgstr "გნებავთ დაამუშაოთ:"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "ინსტალაცია ჩაიშალა"
-
-#: ../urpmi:711
-#, fuzzy, c-format
-msgid "distributing %s"
-msgstr "ვაინსტალირებ: %s\n"
-
-#: ../urpmi:726
-#, fuzzy, c-format
-msgid "installing %s from %s"
-msgstr "ვაინსტალირებ: %s\n"
-
-#: ../urpmi:728
-#, fuzzy, c-format
-msgid "installing %s"
-msgstr "ვაინსტალირებ: %s\n"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "გნებავთ ვცადე ჩაწერა დამოკიდებულებების შემოწმების გარეშე? (ხ/ა) [ა] "
-
-#: ../urpmi:776
-#, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "გნებავთ ვცადო ჩაწერა ძალით (--force)? (ხ/ა) [ა] "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "ინსტალაციაშტან დაკავშირებული მითითებები"
-
-#: ../urpmi:825
-#, fuzzy, c-format
-msgid "Installation is possible"
-msgstr "ინსტალაცია ჩაიშალა"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "უკვე ყველაფერი ჩაწერილია"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "უკვე ყველაფერი ჩაწერილია"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "უკვე ყველაფერი ჩაწერილია"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "უკვე ყველაფერი ჩაწერილია"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr ""
@@ -2291,51 +2351,51 @@ msgstr ""
msgid "unable to update medium \"%s\"\n"
msgstr "ვერ ვუკავშირდები მედიას \"%s\""
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, fuzzy, c-format
msgid "Only superuser is allowed to add media"
msgstr ""
"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
"ჩაწეროს პაკეტები."
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "დაწერე საკონფიგურაციო ფაილი [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, fuzzy, c-format
msgid "Can't create config file [%s]"
msgstr "დაწერე საკონფიგურაციო ფაილი [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr ""
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr ""
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, fuzzy, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "ვერ ვუკავშირდები მედიას \"%s\""
@@ -2493,19 +2553,19 @@ msgstr ""
msgid " -y - fuzzy match on media names.\n"
msgstr ""
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, fuzzy, c-format
msgid "Only superuser is allowed to remove media"
msgstr ""
"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
"ჩაწეროს პაკეტები."
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr ""
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2555,41 +2615,41 @@ msgstr ""
msgid " -f - force updating synthesis/hdlist\n"
msgstr " --help - აჩვენე ეს დამხმარე ტექსტი.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, fuzzy, c-format
msgid "Only superuser is allowed to update media"
msgstr ""
"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
"ჩაწეროს პაკეტები."
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
"(one of %s)\n"
msgstr ""
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "ignoring media %s"
msgstr "ვაგდებ მედიას \"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "enabling media %s"
msgstr "ვაგდებ მედიას \"%s\""
-#: ../urpmq:43
+#: ../urpmq:40
#, fuzzy, c-format
msgid ""
"urpmq version %s\n"
@@ -2606,195 +2666,203 @@ msgstr ""
"\n"
"გამოყენება:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
"packages.\n"
msgstr ""
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr ""
-#: ../urpmq:59
+#: ../urpmq:56
#, fuzzy, c-format
msgid " --list - list available packages.\n"
msgstr " --help - აჩვენე ეს დამხმარე ტექსტი.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr ""
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr ""
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr ""
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr ""
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr ""
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --help - აჩვენე ეს დამხმარე ტექსტი.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
" This permit to querying a distro.\n"
msgstr ""
-#: ../urpmq:84
+#: ../urpmq:81
#, fuzzy, c-format
msgid " --changelog - print changelog.\n"
msgstr " --help - აჩვენე ეს დამხმარე ტექსტი.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr ""
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr ""
-#: ../urpmq:88
+#: ../urpmq:85
#, fuzzy, c-format
msgid ""
" --whatrequires-recursive\n"
" - extended reverse search (includes virtual packages).\n"
msgstr " --help - აჩვენე ეს დამხმარე ტექსტი.\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " --help - აჩვენე ეს დამხმარე ტექსტი.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr ""
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr ""
-#: ../urpmq:96
+#: ../urpmq:93
#, fuzzy, c-format
msgid " -g - print groups with name also.\n"
msgstr " --help - აჩვენე ეს დამხმარე ტექსტი.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
-#: ../urpmq:98
+#: ../urpmq:95
#, fuzzy, c-format
msgid " -l - list files in package.\n"
msgstr " --help - აჩვენე ეს დამხმარე ტექსტი.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " --help - აჩვენე ეს დამხმარე ტექსტი.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr ""
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
msgstr ""
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr ""
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:425
#, fuzzy, c-format
msgid "No changelog found\n"
msgstr "სურათები ვერ ვიპოვე"
#, fuzzy
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr "%s შედმეგ პაკეტებშია: %s\n"
+
+#, fuzzy
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "თქვენ უჯრის გაზიარების უფლება უნდა გაგაჩნდეთ"
@@ -2933,9 +3001,5 @@ msgstr "სურათები ვერ ვიპოვე"
#~ msgstr "გაგრძელება"
#, fuzzy
-#~ msgid "unable to write file [%s]"
-#~ msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
-
-#, fuzzy
#~ msgid "retrieving mirrors at %s ..."
#~ msgstr "ვიძახებ hdlists ფაილს..."
diff --git a/po/ko.po b/po/ko.po
index 79011e3a..6e35689b 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2001-09-22 03:14+0900\n"
"Last-Translator: Jaegeum Choe <baedaron@hananet.net>\n"
"Language-Team: Korean <baedaron@hananet.net>\n"
@@ -18,7 +18,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, fuzzy, c-format
msgid "RPM installation"
msgstr "설치 준비중입니다"
@@ -28,7 +28,7 @@ msgstr "설치 준비중입니다"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "확인 (_O)"
@@ -76,7 +76,7 @@ msgstr "설치(_I)"
msgid "_Save"
msgstr "저장(_S)"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "취소 (_C)"
@@ -96,17 +96,17 @@ msgstr "알 수 없는 연결 유형"
msgid "No packages specified"
msgstr "선택된 팩키지 목록 저장"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "잠시만 기다려 주십시오..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, fuzzy, c-format
msgid "Must be root"
msgstr "마우스 포트"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -114,42 +114,42 @@ msgid ""
"Continue installation anyway?"
msgstr "일부 팩키지는 제거되어야 합니다."
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "경고"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "확인"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "업그레이드"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, fuzzy, c-format
msgid " (to install)"
msgstr "설치 종료"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "다음 팩키지들 중 하나가 필요합니다:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "중단(_A)"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -157,54 +157,60 @@ msgid ""
"Continue installation anyway?"
msgstr "다음 팩키지들이 제거될 것입니다."
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "의존성 문제로 인하여, 다음 팩키지들도 설치되어야 합니다:"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "의존성 문제로 인하여, 다음 팩키지들도 설치되어야 합니다:"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d 팩키지, %d MB)"
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "팩키지 설치 중..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "소스 팩키지를 구할 수 없습니다, 중단합니다."
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, fuzzy, c-format
+msgid "Preparing..."
+msgstr "부트 로더 준비중"
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "팩키지 설치 중: [%s] (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "장치 [%2$s]에 「%1$s」미디어를 넣으세요."
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, fuzzy, c-format
msgid "Downloading package `%s'..."
msgstr "팩키지 내려받는 중: [%s] (%s/%s)..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr "다음 팩키지들이 설치될 것입니다."
+msgid "_Done"
+msgstr "완료"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -212,41 +218,27 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../gurpmi2:292 ../urpme:142
-#, fuzzy, c-format
-msgid "removing %s"
-msgstr "%s 제거 중"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, fuzzy, c-format
-msgid "Preparing..."
-msgstr "부트 로더 준비중"
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "팩키지 설치 중: [%s] (%s/%s)..."
-
-#: ../gurpmi2:334
-#, fuzzy, c-format
-msgid "_Done"
-msgstr "완료"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "설치 실패."
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "모든 것이 이미 설치되어 있습니다."
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "설치 완료"
+#: ../gurpmi2:312 ../urpme:139
+#, fuzzy, c-format
+msgid "removing %s"
+msgstr "%s 제거 중"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -281,7 +273,7 @@ msgstr " -v - 상세 정보 모드.\n"
msgid " defaults to %s.\n"
msgstr " -v - 상세 정보 모드.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, fuzzy, c-format
msgid "Only superuser is allowed to install packages"
msgstr "다음 팩키지를 설치중 오류가 발생했습니다: "
@@ -291,98 +283,98 @@ msgstr "다음 팩키지를 설치중 오류가 발생했습니다: "
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, fuzzy, c-format
msgid "unable to open rpmdb"
msgstr "%s 파일을 열 수 없습니다.\n"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "유효하지 않은 RPM 파일 이름 [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, fuzzy, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "유효하지 않은 RPM 파일 이름 [%s]"
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, fuzzy, c-format
msgid "...retrieving done"
msgstr "[%s] 추출 중"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, fuzzy, c-format
msgid "...retrieving failed: %s"
msgstr "FAT크기조정 실패: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "RPM 파일「%s」에 접근할 수 없습니다."
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "RPM 파일「%s」에 접근할 수 없습니다."
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, fuzzy, c-format
msgid "unable to register rpm file"
msgstr "RPM 파일「%s」에 접근할 수 없습니다."
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "지역 팩키지 등록 오류"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr ""
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: RPM 파일 「%s」을 읽을 수 없습니다.\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "매체「%s」에 대한 목록 합성 파일 생성 완료."
@@ -571,7 +563,12 @@ msgstr "팩키지 %s를 찾을 수 없습니다."
msgid "malformed URL: [%s]"
msgstr "잘못된 형식의 입력: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, fuzzy, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "매체「%2$s」에서 RPM 파일「%1$s」를 읽을 수 없습니다."
@@ -581,43 +578,48 @@ msgstr "매체「%2$s」에서 RPM 파일「%1$s」를 읽을 수 없습니다."
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, fuzzy, c-format
msgid "unable to create transaction"
msgstr "SSH 신원을 생성할 수 없습니다."
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "소스 팩키지를 가져올 수 없습니다."
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr ""
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, fuzzy, c-format
msgid "unable to install package %s"
msgstr "팩키지 설치중 문제 발생 %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "%s 팩키지 설치중"
+
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing package %s"
msgstr "%s 팩키지 설치중"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "%s 설치 중...\n"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, fuzzy, c-format
msgid "More information on package %s"
msgstr "추가 팩키지 정보..."
@@ -647,11 +649,102 @@ msgstr "선택된 팩키지 목록 저장"
msgid "Cannot connect to ldap uri:"
msgstr "컬러맵 항목을 할당할 수 없습니다"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, c-format
+msgid "%s database locked. waiting..."
+msgstr ""
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "경고"
+
+#: ../urpm/lock.pm:65
#, c-format
msgid "%s database locked"
msgstr ""
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "다음 팩키지들이 설치될 것입니다."
+
+#: ../urpm/main_loop.pm:100
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
+msgstr "다음 팩키지들이 설치될 것입니다."
+
+#: ../urpm/main_loop.pm:101
+#, fuzzy, c-format
+msgid "Do you want to continue installation ?"
+msgstr "이 버튼을 누르시겠습니까?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "설치 실패."
+
+#: ../urpm/main_loop.pm:133
+#, fuzzy, c-format
+msgid "distributing %s"
+msgstr "%s 설치 중...\n"
+
+#: ../urpm/main_loop.pm:148
+#, fuzzy, c-format
+msgid "installing %s from %s"
+msgstr "%s 설치 중...\n"
+
+#: ../urpm/main_loop.pm:150
+#, fuzzy, c-format
+msgid "installing %s"
+msgstr "%s 설치 중...\n"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "의존성 검사없이 설치합니까? (y/N) "
+
+#: ../urpm/main_loop.pm:205
+#, fuzzy, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "설치를 강제 추진합니까? (y/N) "
+
+#: ../urpm/main_loop.pm:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "설치 실패."
+
+#: ../urpm/main_loop.pm:258
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "설치 문제"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "모든 것이 이미 설치되어 있습니다."
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "모든 것이 이미 설치되어 있습니다."
+
+#: ../urpm/main_loop.pm:275
+#, c-format
+msgid "Package %s can not be installed"
+msgstr "[%s] 팩키지를 설치할 수 없습니다."
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "[%s] 팩키지를 설치할 수 없습니다."
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -699,7 +792,7 @@ msgstr "「%s」매체를 생성할 수 없습니다.\n"
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "매체「%s」에 대한 목록 합성 파일 생성 완료."
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "「%s」의 목록 파일에 접근할 수 없습니다. 매체 무시됨."
@@ -786,7 +879,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "설치된 폰트 검색"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr ""
@@ -851,144 +944,149 @@ msgstr "%s 파일을 열 수 없습니다.\n"
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "「%s」의 목록 파일에 접근할 수 없습니다. 매체 무시됨."
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, fuzzy, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "「%s」매체를 생성할 수 없습니다.\n"
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, fuzzy, c-format
msgid "selecting multiple media: %s"
msgstr "존재하지 않는 매체「%s」 선택 시도"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, fuzzy, c-format
msgid "removing medium \"%s\""
msgstr "%s 제거 중"
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "프린터 「%s」 설정 중 ..."
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "메뉴 설정이 저장되었습니다."
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "서버 설정"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "매체 [%s]는 선택되지 않았습니다."
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, fuzzy, c-format
msgid "examining hdlist file [%s]"
msgstr "목록 [%s] 생성 중"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, fuzzy, c-format
msgid "examining synthesis file [%s]"
msgstr "의존목록 파일 [%s] 읽기"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "목록 [%s] 생성 중"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, fuzzy, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr "「%s」매체에 대한 합성 파일을 만들 수 없습니다."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, fuzzy, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "매체「%s」에 대한 목록 합성 파일 생성 완료."
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "매체「%s」에 대한 목록 파일을 찾을 수 없습니다."
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, fuzzy, c-format
msgid "...copying failed"
msgstr "로그인에 실패했습니다"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, fuzzy, c-format
msgid "copying description file of \"%s\"..."
msgstr "목록 파일에「%s」에 대한 기록이 없습니다."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, fuzzy, c-format
msgid "...copying done"
msgstr "[%s] 추출 중"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "[%s]의 wget 실패 (wget이 설치되어 있습니까?)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, fuzzy, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "목록 파일에「%s」에 대한 기록이 없습니다."
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, fuzzy, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "[%s] 복사 실패."
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, fuzzy, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "목록 파일에「%s」에 대한 기록이 없습니다."
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, fuzzy, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "FAT크기조정 실패: %s"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "[%s]에서 RPM 파일을 찾을 수 없습니다."
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, fuzzy, c-format
msgid "reading rpm files from [%s]"
msgstr "[%s]에서 RPM 파일을 찾을 수 없습니다."
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, fuzzy, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "매체「%2$s」에서 RPM 파일「%1$s」를 읽을 수 없습니다."
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -996,74 +1094,74 @@ msgid ""
"medium."
msgstr ""
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "매체「%s」에 대한 목록 파일을 찾을 수 없습니다."
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, fuzzy, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "[%s] 추출 중"
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, fuzzy, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "목록 파일에「%s」에 대한 기록이 없습니다."
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "매체「%s」에 대한 목록 파일을 찾을 수 없습니다."
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, fuzzy, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "프린터 「%s」 제거 중 ..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, fuzzy, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "「%s」의 목록 파일을 기록할 수 없습니다."
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, fuzzy, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "「%s」의 목록 파일을 기록할 수 없습니다."
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, fuzzy, c-format
msgid "writing list file for medium \"%s\""
msgstr "매체「%s」에 대한 목록 파일을 찾을 수 없습니다."
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "매체 교환"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "「%s」의 목록파일을 분석할 수 없습니다."
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, fuzzy, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "매체「%s」에 대한 목록 합성 파일 생성 완료."
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, fuzzy, c-format
msgid "reading headers from medium \"%s\""
msgstr "매체「%2$s」에서 RPM 파일「%1$s」를 읽을 수 없습니다."
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn아니오"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "Yy예"
@@ -1123,47 +1221,52 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "매체「%s」에 접근할 수 없습니다."
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "%s라는 팩키지는 없습니다."
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "다음 팩키지들은 %s를 담고 있습니다: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "kdesu가 없음"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "모든 것이 이미 설치되어 있습니다."
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, fuzzy, c-format
msgid "due to unsatisfied %s"
msgstr "kdesu가 없음"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, fuzzy, c-format
msgid "trying to promote %s"
msgstr "제거할 태그 없음!"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, fuzzy, c-format
msgid "in order to keep %s"
msgstr "창 테두리 테마"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "자동 설치 플로피 디스크 생성"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "kdesu가 없음"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, fuzzy, c-format
msgid "unrequested"
msgstr "콘퀘스트"
@@ -1183,6 +1286,16 @@ msgstr ""
msgid "Missing signature (%s)"
msgstr "항목이 빠졌습니다."
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "설정 파일 [%s]에 기록할 수 없습니다."
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "로그인에 실패했습니다"
+
#: ../urpme:40
#, fuzzy, c-format
msgid ""
@@ -1199,8 +1312,8 @@ msgstr ""
"\n"
"사용법:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - 이 도움말 출력.\n"
@@ -1215,18 +1328,18 @@ msgstr "자동으로 선택된 팩키지들 보이기"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr ""
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --help - 이 도움말 출력.\n"
@@ -1236,8 +1349,8 @@ msgstr " --help - 이 도움말 출력.\n"
msgid " --root - use another root for rpm removal.\n"
msgstr ""
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
@@ -1254,17 +1367,17 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr ""
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr ""
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " -v - 상세 정보 모드.\n"
@@ -1274,37 +1387,37 @@ msgstr " -v - 상세 정보 모드.\n"
msgid " -a - select all packages matching expression.\n"
msgstr ""
-#: ../urpme:76
+#: ../urpme:73
#, fuzzy, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "루트 사용자만이 지역 팩키지를 설치할 수 있습니다."
-#: ../urpme:107
+#: ../urpme:104
#, fuzzy, c-format
msgid "unknown packages"
msgstr "%d 팩키지"
-#: ../urpme:107
+#: ../urpme:104
#, fuzzy, c-format
msgid "unknown package"
msgstr "%d 팩키지"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr ""
-#: ../urpme:121
+#: ../urpme:118
#, fuzzy, c-format
msgid "Nothing to remove"
msgstr "제거할 태그 없음!"
-#: ../urpme:126
+#: ../urpme:123
#, fuzzy, c-format
msgid "Checking to remove the following packages"
msgstr "다음 팩키지들 중 하나가 필요합니다:"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1314,23 +1427,23 @@ msgstr[0] ""
"설치되어야 합니다.\n"
"\n"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "%s 팩키지 설치중"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, fuzzy, c-format
msgid " (y/N) "
msgstr " (Y/n) "
-#: ../urpme:160
+#: ../urpme:157
#, fuzzy, c-format
msgid "Removal failed"
msgstr "로그인에 실패했습니다"
@@ -1356,12 +1469,12 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --help - 이 도움말 출력.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1372,12 +1485,12 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1388,7 +1501,7 @@ msgstr ""
msgid " --use-distrib - use the given path to access media\n"
msgstr ""
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1398,7 +1511,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --help - 이 도움말 출력.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr ""
@@ -1530,87 +1643,97 @@ msgstr " --help - 이 도움말 출력.\n"
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr " --help - 이 도움말 출력.\n"
#: ../urpmf:73
+#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr " --help - 이 도움말 출력.\n"
+
+#: ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr ""
-#: ../urpmf:74
+#: ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr " --help - 이 도움말 출력.\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr ""
-#: ../urpmf:76
+#: ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr ""
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --help - 이 도움말 출력.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr ""
-#: ../urpmf:79
+#: ../urpmf:80
+#, c-format
+msgid " --suggests - suggests tags\n"
+msgstr ""
+
+#: ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr ""
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr " --help - 이 도움말 출력.\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr " -v - 상세 정보 모드.\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -v - 상세 정보 모드.\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, fuzzy, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -v - 상세 정보 모드.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1626,60 +1749,60 @@ msgstr ""
"\n"
"사용법:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr ""
-#: ../urpmi:93
+#: ../urpmi:89
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr ""
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr ""
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
"installation.\n"
msgstr ""
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr ""
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
" packages that lead to removals.\n"
msgstr ""
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1687,241 +1810,252 @@ msgid ""
" default is %d.\n"
msgstr ""
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr ""
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr ""
-#: ../urpmi:105
+#: ../urpmi:101
#, fuzzy, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --help - 이 도움말 출력.\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr ""
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr ""
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
" dependencies checking.\n"
msgstr ""
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
" dependencies checking and integrity.\n"
msgstr ""
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr ""
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
" to install a chroot with --root option.\n"
msgstr ""
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr ""
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr ""
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr ""
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr ""
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
" (--no-resume disables it, default is disabled).\n"
msgstr ""
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../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 ""
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
" authentication (format is <user:password>).\n"
msgstr ""
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
" next arg.\n"
msgstr ""
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
" (--no-verify-rpm disables it, default is enabled).\n"
msgstr ""
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr ""
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr ""
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr ""
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --help - 이 도움말 출력.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr ""
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
-#: ../urpmi:148
+#: ../urpmi:145
+#, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr ""
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:150
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr ""
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, fuzzy, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -v - 상세 정보 모드.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
-#: ../urpmi:155
+#: ../urpmi:153
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -v - 상세 정보 모드.\n"
-#: ../urpmi:157
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
-#: ../urpmi:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr ""
-#: ../urpmi:244
+#: ../urpmi:242
#, fuzzy, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr ""
@@ -1933,41 +2067,43 @@ msgstr ""
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "업그레이드"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "업그레이드"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "설치 종료"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "설치 종료"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -1977,12 +2113,12 @@ msgstr ""
"설치되어야 합니다.\n"
"\n"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "어느 것을 선택하시겠습니까? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -1990,7 +2126,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -1998,7 +2134,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, c-format
msgid ""
"\n"
@@ -2007,26 +2143,26 @@ msgstr ""
"\n"
"계속하시겠습니까?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (Y/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
"%s"
msgstr "일부 팩키지는 제거되어야 합니다."
-#: ../urpmi:504
+#: ../urpmi:521
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s"
msgstr "일부 팩키지는 제거되어야 합니다."
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2036,7 +2172,7 @@ msgstr ""
"업그레이드하기 위해서는 일부 팩키지가 제거되어야 합니다. 이 기능은 아직 지원"
"되지 않습니다.\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2046,135 +2182,59 @@ msgstr ""
"업그레이드하기 위해서는 일부 팩키지가 제거되어야 합니다. 이 기능은 아직 지원"
"되지 않습니다.\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
msgstr "다음 팩키지들이 제거될 것입니다."
-#: ../urpmi:545
+#: ../urpmi:562
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
"%s"
msgstr "다음 팩키지들이 제거될 것입니다."
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
"%s\n"
msgstr ""
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
-#: ../urpmi:623
+#: ../urpmi:632
#, fuzzy, c-format
msgid "Press Enter when ready..."
msgstr "다 되었으면 ENTER키를 누르세요..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "취소"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "다음 팩키지들이 설치될 것입니다."
-
-#: ../urpmi:672
-#, fuzzy, c-format
-msgid "The following packages have bad signatures"
-msgstr "다음 팩키지들이 설치될 것입니다."
-
-#: ../urpmi:673
-#, fuzzy, c-format
-msgid "Do you want to continue installation ?"
-msgstr "이 버튼을 누르시겠습니까?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "설치 실패."
-
-#: ../urpmi:711
-#, fuzzy, c-format
-msgid "distributing %s"
-msgstr "%s 설치 중...\n"
-
-#: ../urpmi:726
-#, fuzzy, c-format
-msgid "installing %s from %s"
-msgstr "%s 설치 중...\n"
-
-#: ../urpmi:728
-#, fuzzy, c-format
-msgid "installing %s"
-msgstr "%s 설치 중...\n"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "의존성 검사없이 설치합니까? (y/N) "
-
-#: ../urpmi:776
-#, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "설치를 강제 추진합니까? (y/N) "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "설치 실패."
-
-#: ../urpmi:825
-#, fuzzy, c-format
-msgid "Installation is possible"
-msgstr "설치 문제"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "모든 것이 이미 설치되어 있습니다."
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "모든 것이 이미 설치되어 있습니다."
-
-#: ../urpmi:842
-#, c-format
-msgid "Package %s can not be installed"
-msgstr "[%s] 팩키지를 설치할 수 없습니다."
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "[%s] 팩키지를 설치할 수 없습니다."
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr ""
@@ -2296,49 +2356,49 @@ msgstr " -v - 상세 정보 모드.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "「%s」매체를 업데이트할 수 없습니다.\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, fuzzy, c-format
msgid "Only superuser is allowed to add media"
msgstr "루트 사용자만이 지역 팩키지를 설치할 수 있습니다."
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "설정 파일 [%s]에 기록"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, fuzzy, c-format
msgid "Can't create config file [%s]"
msgstr "설정 파일 [%s]에 기록"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, fuzzy, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "<팩키지 목록 파일의 상대경로>가 빠져 있습니다.\n"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<팩키지 목록 파일의 상대경로>가 빠져 있습니다.\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "「%s」매체를 생성할 수 없습니다.\n"
@@ -2497,18 +2557,18 @@ msgstr " -v - 상세 정보 모드.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -v - 상세 정보 모드.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, fuzzy, c-format
msgid "Only superuser is allowed to remove media"
msgstr "루트 사용자만이 지역 팩키지를 설치할 수 있습니다."
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr ""
"제거할 것이 없습니다. (미디어를 추가하려면 「urpmi.addmedia」를 사용하세요.\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2565,19 +2625,19 @@ msgstr " -v - 상세 정보 모드.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -v - 상세 정보 모드.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, fuzzy, c-format
msgid "Only superuser is allowed to update media"
msgstr "루트 사용자만이 지역 팩키지를 설치할 수 있습니다."
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
"업데이트할 것이 없습니다. (미디어를 추가하려면 「urpmi.addmedia」를 사용하세"
"요.\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2586,22 +2646,22 @@ msgstr ""
"업데이트하려는 항목이 빠져있습니다.\n"
"(%s 중 하나)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "ignoring media %s"
msgstr "존재하지 않는 매체「%s」의 제거 시도"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "enabling media %s"
msgstr "존재하지 않는 매체「%s」의 제거 시도"
-#: ../urpmq:43
+#: ../urpmq:40
#, fuzzy, c-format
msgid ""
"urpmq version %s\n"
@@ -2617,195 +2677,203 @@ msgstr ""
"\n"
"사용법:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
"packages.\n"
msgstr ""
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr ""
-#: ../urpmq:59
+#: ../urpmq:56
#, fuzzy, c-format
msgid " --list - list available packages.\n"
msgstr " --help - 이 도움말 출력.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr ""
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr ""
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr ""
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr ""
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr ""
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --help - 이 도움말 출력.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
" This permit to querying a distro.\n"
msgstr ""
-#: ../urpmq:84
+#: ../urpmq:81
#, fuzzy, c-format
msgid " --changelog - print changelog.\n"
msgstr " --help - 이 도움말 출력.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr ""
-#: ../urpmq:87
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " -v - 상세 정보 모드.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, fuzzy, c-format
msgid ""
" --whatrequires-recursive\n"
" - extended reverse search (includes virtual packages).\n"
msgstr " -v - 상세 정보 모드.\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -v - 상세 정보 모드.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr ""
-#: ../urpmq:94
+#: ../urpmq:91
#, fuzzy, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -v - 상세 정보 모드.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, fuzzy, c-format
msgid " -g - print groups with name also.\n"
msgstr " -v - 상세 정보 모드.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
-#: ../urpmq:98
+#: ../urpmq:95
#, fuzzy, c-format
msgid " -l - list files in package.\n"
msgstr " -v - 상세 정보 모드.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -v - 상세 정보 모드.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, fuzzy, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -v - 상세 정보 모드.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
msgstr ""
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr ""
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:425
#, fuzzy, c-format
msgid "No changelog found\n"
msgstr "하드 디스크를 찾을 수 없습니다."
#, fuzzy
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr "다음 팩키지들이 설치될 것입니다."
+
+#, fuzzy
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "디렉토리를 공유하기 위해서는 권한을 부여받아야 합니다."
@@ -2910,9 +2978,5 @@ msgstr "하드 디스크를 찾을 수 없습니다."
#~ msgstr "%s: 명령어를 찾을 수 없습니다.\n"
#, fuzzy
-#~ msgid "unable to write file [%s]"
-#~ msgstr "설정 파일 [%s]에 기록할 수 없습니다."
-
-#, fuzzy
#~ msgid "retrieving mirrors at %s ..."
#~ msgstr "[%s] 추출 중"
diff --git a/po/ky.po b/po/ky.po
index 58f8aaff..43478922 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2005-07-13 13:23+0000\n"
"Last-Translator: Timur Jamakeev <ztimur@mail..ru>\n"
"Language-Team: Kyrgyz\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.3.1\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "RPM орнотуу"
@@ -27,7 +27,7 @@ msgstr "RPM орнотуу"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -93,7 +93,7 @@ msgstr "_Орнотуу"
msgid "_Save"
msgstr "_Сактоо"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Калтыруу"
@@ -115,17 +115,17 @@ msgstr ""
msgid "No packages specified"
msgstr "%s аттуу пакет жок"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Күтө туруңуз..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "root укуктары талап кылынат"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -136,42 +136,42 @@ msgstr ""
"%s\n"
"Уланталыбы?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Эскертүү"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (жаңылоо)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (орнотуу)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "Пакет тандоо"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Төмөнкү пакеттердин бири талап кылынат:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Токтотуу"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -182,14 +182,14 @@ msgstr ""
"%s\n"
"Уланталыбы?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
"Көз карандылыктарды канаатандыруу үчүн, төмөнкү пакет орнотулат (%d Мб)"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -197,47 +197,49 @@ msgstr ""
"Көз карандылыктарды канаатандыруу үчүн, төмөнкү %d пакет орнотулат:\n"
"%s\n"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Пакет орнотулууда..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "баштапкы пакеттерди алууга болбоду, күтүлбөгөн аяктоо"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Даярдоо ..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Пакет орнотулууда: `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "\"%s\" аттуу булагын [%s] түзүлүшүнө орнотуңуз"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "`%s' пакети жүктөлүүдө..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Төмөнкү пакеттердин сигнатуралары туура эмес:\n"
-"%s\n"
-"\n"
-"Орнотууну улантууну каалайсызбы?"
+msgid "_Done"
+msgstr "_Даяр"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -248,41 +250,27 @@ msgstr ""
"%s\n"
"Мүмкүн сизге urpmi берилиштер базасын жаңылоо керек"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "%s алынып салынууда"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Даярдоо ..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Пакет орнотулууда: `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Даяр"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Орнотуу ишке ашпады"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Бардыгы алдагачан орнотулган"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Орнотуу аяктады"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "%s алынып салынууда"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -317,7 +305,7 @@ msgstr " -g - группаларды наамдары менен к
msgid " defaults to %s.\n"
msgstr " алдыалынганы %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Суперколдонуучу гана пакеттерди орното алат"
@@ -327,98 +315,98 @@ msgstr "Суперколдонуучу гана пакеттерди орнот
msgid "Running urpmi in restricted mode..."
msgstr "urpmi чектелген режимде иштөөдө..."
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "rpmdb ачууга болбоду"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "[%s] туура эмес rpm файл аты"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "[%s] rpm файлы кабыл алынууда..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...кабыл алуу аяктады"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...кабыл алуу ийгиликсиз: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "[%s] rpm файлына жетүүгө болбоду"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "\"%s\" түшүнүүгө болбоду; ал [%s] файлынын ичинде"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "rpm файлын каттого болбоду"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "локалдык пакеттерди каттоо катасы"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Чектелген режим учурунда бул операцияны аткарууга болбойт"
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "командалык сапта туура эмес прокси көрсөтүлгөн\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: \"%s\" rpm файлын окууга болбоду\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "\"%s\" булагы үчүн hdlist synthesis файлы түзүлдү"
@@ -607,7 +595,12 @@ msgstr "%s пакети табылбады."
msgid "malformed URL: [%s]"
msgstr "туура эмес форматталган кирүү: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "rpm файлдарын \"%s\" булагынан кабыл алуу жүрүп жатат..."
@@ -617,7 +610,7 @@ msgstr "rpm файлдарын \"%s\" булагынан кабыл алуу ж
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -625,37 +618,42 @@ msgstr ""
"%s ичине инсталляциялоо үчүн транзакция түзүлдү (remove=%d, install=%d, "
"upgrade=%d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "транзакция түзүүгө мүмкүн эмес"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "%s дельта-rpm пакетинен rpm-ди чыгаруугу мүмкүн эмес"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "%s пакети кошулууда (id=%d, eid=%d, update=%d, file=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "%s пакетин орнотуу мүмкүн эмес"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "%s пакети алынып салынууда"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "%s пакети алынып салынууда"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "%2s булагынан %1s орнотулууда"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "%s пакети жөнүндө кеңирээк маалымат"
@@ -685,11 +683,103 @@ msgstr "%s аттуу пакет жок"
msgid "Cannot connect to ldap uri:"
msgstr ""
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "urpmi берилиштер базасы кулпуланган"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Эскертүү"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "urpmi берилиштер базасы кулпуланган"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "Төмөнкү пакеттердин сигнарурасы туура эмес"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Төмөнкү пакеттердин сигнарурасы туура эмес"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Орнотууну улантууну каалайсызбы ?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Орнотуу ишке ашпады"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "%s бөлүштүрүлүүдө"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "%2s булагынан %1s орнотулууда"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "%s орнотулууда"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Көз карадылыктарды эске албай орнотуп көрөйүнбү? (y/N) "
+
+#: ../urpm/main_loop.pm:205
+#, fuzzy, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "Мажбурлап орнотуп көрөйүнбү (--force)? (y/N) "
+
+#: ../urpm/main_loop.pm:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d орнотуу транзакциялары ишке ашпады"
+msgstr[1] "%d орнотуу транзакциялары ишке ашпады"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Орнотууга мүмкүн"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "Бардыгы алдагачан орнотулган"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Бардыгы алдагачан орнотулган"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "Бардыгы алдагачан орнотулган"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Бардыгы алдагачан орнотулган"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -740,7 +830,7 @@ msgstr "жашабаган \"%s\" булагын тандоо аракети"
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "\"%s\" булагы үчүн hdlist synthesis файлы түзүлдү"
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "\"%s\" үчүн hdlist файлына жетүүгө болбоду, булак четке кагылды"
@@ -838,7 +928,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Издөө: башы-%s, аягы-%s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "көз карандылыктарды экинчи жолку эсептөөсүү аткарылууда\n"
@@ -903,67 +993,72 @@ msgstr "rpmdb ачууга болбоду"
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "биринчи инсталлялык булакка жетүүгө болбоду (hdlists файлы табылбады)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "жашабаган \"%s\" булагын тандоо аракети"
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "составдык булак тандалууда: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "\"%s\" булагы алынып салынууда"
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "\"%s\" булагы үчүн urpmi программасын кайра конфигурациялоо"
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...кайра конфигурациялоо ишке ашпады"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "кайра конфигурациялоо аяктады"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "\"%s\" булагы тандалган эмес"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "[%s] hdlist файлы текшерилүүдө"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "[%s] synthesis файлы текшерилүүдө"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "hdlist [%s] түзүлүшү"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -972,77 +1067,77 @@ msgstr ""
"\"%s\" булагы үчүн synthesis файлын түзүүгө болбоду. Сиздин hdlist файлыңыз "
"бузук болушу мүмкүн."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "\"%s\" булагы үчүн hdlist же synthesis файлын окуу проблемасы"
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "\"%s\" булагы үчүн тизме файлы жазылууда"
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...көчүрүү ишке ашпады"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "\"%s\" үчүн баяндоо файлы көчүрүлүүдө..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...көчүрүү аяктады"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "[%s] көчүрүү ишке ашпады (файл күмөндүү кыска)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "көчүрүлгөн баштапкы hdlist (же synthesis) үчүн md5sum эсептелүүдө"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr " [%s] көчүрүү ишке ашпады (md5sum туура эмес)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "кабыл алынган баштапкы hdlist (же synthesis) үчүн md5sum эсептелүүдө"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...кабыл алуу ийгиликсиз: md5sum дал келбестиги"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "[%s] булагында rpm файлдары табылдбады"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "[%s] булагынын rpm файлдары окулууда"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "[%s] булагынан rpm файлдарын окууга болбоду: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "rpm-дер окулбады"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1053,74 +1148,74 @@ msgstr ""
"бул ката сиз булакты түзүүдө аны өз алдыңызча бириктиргенде пайда болушу "
"мүмкүн."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "\"%s\" булагы үчүн hdlist файлы табылбады"
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "\"%s\" булагынын баштапкы hdlist (же synthesis) кабыл алынууда..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "изделген hdlist (же synthesis) табылды: %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "\"%s\" булагы үчүн hdlist файлы табылбады"
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "\"%s\" үчүн ачык ачкыч файлы текшерилүүдө..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...%s ачкычы \"%s\" ачык ачкычынан импорттолду"
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "\"%s\" ачык ачкыч файлын импортоо мүмкүн эмес"
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "\"%s\" булагы үчүн тизме файлы жазылууда"
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "%s булагы кошулду"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "\"%s\" үчүн hdlist файлын түшүнө албадым"
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "\"%s\" булагынын synthesis файлын окуу проблемасы"
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "\"%s\" булагынын башсаптары окулууда"
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "NnжЖ;:"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "YyоО"
@@ -1182,47 +1277,52 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "\"%s\" булагына жетүүгө мүмкүн эмес"
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, fuzzy, c-format
msgid "No package named %s"
msgstr "%s аттуу пакет жок"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Төмөнкү пакеттер %s камтыйт: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "%s жоктугунан"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Бардыгы алдагачан орнотулган"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "%s канаатанбагандыгынан"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "%s активдештирүү аракети"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "%s сактоо үчүн"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "%s орнотуу үчүн"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "%s менен конфликтешкендиги үчүн"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "талап кылынбаган"
@@ -1242,6 +1342,16 @@ msgstr "Туура эмес Key ID (%s)"
msgid "Missing signature (%s)"
msgstr "Сигнатура жок (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "[%s] конфигурация файлын түзүү"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Көчүрүү ишке ашпады"
+
#: ../urpme:40
#, fuzzy, c-format
msgid ""
@@ -1259,8 +1369,8 @@ msgstr ""
"\n"
"колдонулушу:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - бул жардамды чыгаруу.\n"
@@ -1276,19 +1386,19 @@ msgstr ""
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - туура өчүрүү мүмүкүнчүлүгүн текшерүү.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr ""
" --force - кээ бир пакеттер жок болсо дагы, мажбурлап аткаруу.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - машиналардын алиастары боюнча бөлүнгөн urpmi.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - packager: пакеттөөчү тэгин чыгаруу.\n"
@@ -1298,8 +1408,8 @@ msgstr " --packager - packager: пакеттөөчү тэгин чыгар
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - rpm өчүрүү үчүн башка түп колдонуу.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - орнотуу үчүн башка түп колдонуу.\n"
@@ -1319,17 +1429,17 @@ msgstr ""
"конфигурациялоо,\n"
" chroot (кайра)орнотууда --root опциясы менен пайдалуу.\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - synthesis файлын издөө жана аны колдонуу.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - hdlist файлын издөө жана аны колдонуу.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - кеңири режим.\n"
@@ -1339,37 +1449,37 @@ msgstr " --verbose - кеңири режим.\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - туюнтмага туура келген бардык пакеттерди тандоо.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Суперколдонуучу гана пакеттерди жогото алат"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "белгисиз пакеттер"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "белгисиз пакет"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "%s пакетин алып салуу сиздин системаңыздын ишин бузат"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Алып салууга эч нерсе жок"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Төмөнкү пакеттерди алып салуу мүмкүнчүлүгүн текшерүү"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1379,24 +1489,24 @@ msgstr[0] ""
msgstr[1] ""
"Көз карандылыктарды канаатандыруу үчүн төмөнкү %d пакет жоготулат (%d Мб)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "%s пакети алынып салынууда"
msgstr[1] "%s пакети алынып салынууда"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (y/N) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Алып салуу ишке ашпады"
@@ -1423,14 +1533,14 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --help - бул жардамды чыгаруу.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - спецификалык чөйрөнү колдонуу (демейде ката жөнүндө "
"отчет).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1442,13 +1552,13 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - үтүр менен бөлүнүп көрсөтүлгөн булактарды гана колдонуу.\n"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1460,7 +1570,7 @@ msgstr ""
msgid " --use-distrib - use the given path to access media\n"
msgstr " --synthesis - urpmi db ордуна көрсөтүлгөн synthesis колдонуу.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - urpmi db ордуна көрсөтүлгөн synthesis колдонуу.\n"
@@ -1470,7 +1580,7 @@ msgstr " --synthesis - urpmi db ордуна көрсөтүлгөн synthesi
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - бирдей саптарды чыгарбоо.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - жаңылоо булагын гана колдонуу.\n"
@@ -1606,77 +1716,87 @@ msgstr " --group - group: группа тэгин чыгаруу.\n"
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr " --name - пакет ысымдарын гана чыгаруу.\n"
#: ../urpmf:73
#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr " --name - пакет ысымдарын гана чыгаруу.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - obsoletes: бардык эскирген файлдар тэгин чыгаруу.\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr " --packager - packager: пакеттөөчү тэгин чыгаруу.\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, fuzzy, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - provides: бардык берилчү файлдар тэгин чыгаруу.\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, fuzzy, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - requires: бардык көз карандылыктар тэгин чыгаруу.\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --size - size: өлчөмү тэгин чыгаруу.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, fuzzy, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - sourcerpm: баштапкы rpm тэгин чыгаруу.\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - obsoletes: бардык эскирген файлдар тэгин чыгаруу.\n"
+
+#: ../urpmf:81
#, fuzzy, c-format
msgid " --summary - summary\n"
msgstr " --summary, -S - жалпы маалымат тэгин чыгаруу.\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr " --url - url: url тэгин чыгаруу.\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr " --verbose - кеңири режим.\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -l - пакеттеги файлдар тизмеси.\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - версиясын, релизин жана архитектурасын аттары менен кошо "
"чыгаруу.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "%s үчүн спецификалык чөйрө колдонулууда\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1685,13 +1805,13 @@ msgstr ""
"Эске алыңыз: изилденип жаткан булак hdlist'терди колдонбогондуктан, urpmf эч "
"кандай жыйынтык кайтара албады\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
"Сиз пакеттерди ысымы боюнча издөө үчүн --name ачкычын колдонсоңуз болот.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, fuzzy, c-format
msgid ""
"urpmi version %s\n"
@@ -1708,7 +1828,7 @@ msgstr ""
"\n"
"колдонулушу:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1716,14 +1836,14 @@ msgstr ""
" --searchmedia - талап кылынган (же жаңыланган) пакеттерди издөө "
"үчүн көрсөтүлгөн булактарды гана колдонуу.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
@@ -1731,24 +1851,24 @@ msgstr ""
" --auto-select - системаны жаңылоо үчүн автоматтык түрдө пакеттерди.\n"
" тандоо.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
" --auto-select - системаны жаңылоо үчүн автоматтык түрдө пакеттерди.\n"
" тандоо.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, fuzzy, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - MD5SUM файлын текшербөө.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, fuzzy, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - gpg ачкычын жаңылоого мажбурлоо.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1757,12 +1877,12 @@ msgstr ""
" --no-uninstall - эч качан пакетти алып салууну сурабоо, орнотууну "
"токтотуу.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - пакетттерди орнотпоо (жүктөө гана)\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1771,7 +1891,7 @@ msgstr ""
" --keep - мүмкүн болсо бар пакеттерди калтыруу, алып салууга\n"
" алып келүүчү пакеттерди талап кылууну четке кагуу.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1782,40 +1902,46 @@ msgstr ""
" же жаңыланса майда транзакцияларга бөлүү,\n"
" алдыалынганы %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - майда транзакциянын узундугу, алдыалынганы %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, fuzzy, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr ""
" --fuzzy - издөөнү так эмес логиканын негизинде көрсөтүү (-y "
"сыяктуу).\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, fuzzy, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src - кийинки пакет-баштапкы пакет (-s сыяктуу).\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
" --install-src - баштапкы пакетти гана орнотуу (бинардыктарын орнотпоо).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - аракет кылуу алдында, адегенде rpm кэшин тазалоо.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - rpm-дерди кэштен тазалабоо.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1824,7 +1950,7 @@ msgstr ""
" --allow-nodeps - колдонуучудан пакеттердин көз карандылыктарына\n"
" карабай орнотуу уруксатын алуу.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1833,12 +1959,12 @@ msgstr ""
" --allow-force - колдонуучудан пакеттердин көз карандылыктарына\n"
" жана бүтүндүгүнө карабай орнотуу уруксатын алуу.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - орнотуу үчүн башка түп колдонуу.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1848,47 +1974,47 @@ msgstr ""
"конфигурациялоо,\n"
" chroot орнотуу үчүн --root опциясын колдонууда ыңгайлуу.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - алыста жайгашкан файлдары wget аркылуу кабылдоо.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - алыста жайгашкан файлдары curl аркылуу кабылдоо.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, fuzzy, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --curl - алыста жайгашкан файлдары curl аркылуу кабылдоо.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - жүктөө ылдамдыгын чектөө.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1897,7 +2023,7 @@ msgstr ""
" --resume - жарым-жартылай кабыл алынган файлдарды жүктөөнү\n"
" улантуу (--no-resume муну өчүрөт, алдынала өчүрүлгөн).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1906,7 +2032,7 @@ msgstr ""
" --proxy - көрсөтүлгөн HTTP проксини колдонуу, алдыалынган\n"
" порт номери 1080 (форматы: <proxyhost[:port]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1915,7 +2041,7 @@ msgstr ""
" --proxy-user - прокси аутентификациясы үчүн колдонуучу жана паролду\n"
" көрсөтүү (форматы: <user:password>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1924,7 +2050,7 @@ msgstr ""
" --bug - баг отчетторун кийинки аргумент\n"
" көрсөткөн каталогго sчыгаруу.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, fuzzy, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1933,46 +2059,51 @@ msgstr ""
" --verify-rpm - орнотуу алдында rpm сигнатурасын текшерүү\n"
" (--no-verify-rpm муну өчүрөт, алдынала күйгүзүлгөн).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, fuzzy, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr " --test - туура орнотулгандыгын текшерүү мүмүкүнчүлүгү.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - үтүр менен ажыратылган жолдорду карабоо.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - документациялык файлдарды карабоо (docs).\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, fuzzy, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --no-uninstall - эч качан пакетти алып салууну сурабоо, орнотууну "
"токтотуу.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --url - url: url тэгин чыгаруу.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - description: баяны тэгин чыгаруу.\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - орнотуу учурунда коё берилүүчү пакеттер.\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - орнотуу учурунда коё берилүүчү пакеттер.\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1982,60 +2113,60 @@ msgstr ""
"сунуштан\n"
" баш тартып, көбүрөөк вариантты сунуштоо.\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - rpm-дерди кэштен тазалабоо.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - архитектуралары бирдей гана пакеттерди жаңылоо.\n"
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - бардык тийиштүүсүн командалык саптан алуу.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - пакетти табуу үчүн, provides'терден издөө уруксаты.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - пакетти табуу үчүн, provides'терден издебөө.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - кыскартылган режим (quiet).\n"
-#: ../urpmi:157
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " командалык сапта көрсөтүлгөн аттар жана rpm файлдар орнотулат.\n"
-#: ../urpmi:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "--install-src колдонууда бинардык rpm файлдарын эмне кылуу"
-#: ../urpmi:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2044,7 +2175,7 @@ msgstr ""
"[%s] каталогу алдагачан бар, баг жөнүндө билдирүү үчүн башка каталог "
"колдонуңуз же аны өчүрүңүз"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Баг отчету үчүн [%s] каталогун түзүүгө болбоду"
@@ -2054,7 +2185,7 @@ msgstr "Баг отчету үчүн [%s] каталогун түзүүгө бо
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2063,34 +2194,36 @@ msgstr ""
"Ката:мүмкүн %s окуу үчүн гана колдонулган.\n"
" --allow-force операцияны чакыруу үчүн колдонуу."
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (жаңылоо)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (жаңылоо)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (орнотуу)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (орнотуу)"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2098,12 +2231,12 @@ msgid ""
msgstr ""
"Көз карандылыктарды канаатандыруу үчүн төмөнкү %d пакет жоготулат (%d Мб)"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Сиздин тандооңуз? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2114,7 +2247,7 @@ msgstr ""
"каранды:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2125,19 +2258,19 @@ msgstr ""
"каранды:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Буга карабай улантайынбы?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (Y/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2146,7 +2279,7 @@ msgstr ""
"Талап кылынган кээ бир пакеттерди орноттууга болбойт:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2155,7 +2288,7 @@ msgstr ""
"Талап кылынган кээ бир пакеттерди орноттууга болбойт:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2166,7 +2299,7 @@ msgstr ""
"үчүн төмөнкү пакеттерди алып салуу талап кылынат:\n"
",%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2177,7 +2310,7 @@ msgstr ""
"үчүн төмөнкү пакеттерди алып салуу талап кылынат:\n"
",%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2186,7 +2319,7 @@ msgstr ""
"Башкаларын жаңылоо үчүн төмөнкү пакеттерди алып салуу талап кылынат:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2195,12 +2328,17 @@ msgstr ""
"Башкаларын жаңылоо үчүн төмөнкү пакеттерди алып салуу талап кылынат:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2209,111 +2347,29 @@ msgstr ""
"Төмөнкү көз карандылыктарды орнотуу үчүн сиз root болушуңуз керек:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, 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:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Даяр болгон соң, Enter басыңыз..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Калтыруу"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "Төмөнкү пакеттердин сигнарурасы туура эмес"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Төмөнкү пакеттердин сигнарурасы туура эмес"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Орнотууну улантууну каалайсызбы ?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Орнотуу ишке ашпады"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "%s бөлүштүрүлүүдө"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "%2s булагынан %1s орнотулууда"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "%s орнотулууда"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Көз карадылыктарды эске албай орнотуп көрөйүнбү? (y/N) "
-
-#: ../urpmi:776
-#, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Мажбурлап орнотуп көрөйүнбү (--force)? (y/N) "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d орнотуу транзакциялары ишке ашпады"
-msgstr[1] "%d орнотуу транзакциялары ишке ашпады"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Орнотууга мүмкүн"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Бардыгы алдагачан орнотулган"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Бардыгы алдагачан орнотулган"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "Бардыгы алдагачан орнотулган"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "Бардыгы алдагачан орнотулган"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "urpmi кайра ишке киргизилүүдө"
@@ -2444,51 +2500,51 @@ msgstr " -v - кеңири режим.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "\"%s\" булагын жаңылоого болбоду\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Суперколдонуучу гана пакет булактарын кошо алат"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "[%s] конфигурация файлын түзүү"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "[%s] конфигурация файлын түзүү"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr ""
"--distrib менен кошо <hdlist файлынын салыштырма жолун> көрсөтүүнүн кереги "
"жок"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<hdlist файлынын салыштырма жолу> жок\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "\"%s\" булагын түзүүгө болбоду\n"
@@ -2651,18 +2707,18 @@ msgstr " -a - бардык булактарды тандоо.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - булак ысымдарынын толук эмес дал келүүсү.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Суперколдонуучу гана пакет булактарын жогото алат"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr ""
"алып салууга эч нерсе жок (булак кошуу үчүн urpmi.addmedia колдонуңуз)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2718,17 +2774,17 @@ msgstr " -a - чыкпоочу бардык булактарды т
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - hdlist файлдардын түзүүгө мажбурлоо.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Суперколдонуучу гана пакет булактарын жаңылай алат"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "жаңылоого эч нерсе жок (булак кошуу үчүн urpmi.addmedia колдонуңуз)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2737,22 +2793,22 @@ msgstr ""
"жаңылоо үчүн пунк жок\n"
"(%s ичинен бири)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "%s булагы оңдолууда:"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "%s булагы иштөөдө"
-#: ../urpmq:43
+#: ../urpmq:40
#, fuzzy, c-format
msgid ""
"urpmq version %s\n"
@@ -2769,7 +2825,7 @@ msgstr ""
"\n"
"колдонулушу:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2778,41 +2834,41 @@ msgstr ""
" --searchmedia - талап кылынган (же жаңыланган) пакеттерди издөө "
"үчүн көрсөтүлгөн булактарды гана колдонуу.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr ""
" --fuzzy - издөөнү так эмес логиканын негизинде көрсөтүү (-y "
"сыяктуу).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - мүмкүн болгон пакеттер тизмеси.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - мүмкүн болгон булактар тизмеси.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr ""
" --list-url - мүмкүн болгон булактар тизмеси жана алардын url-дери.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
" --list-nodes - --parallel колдонуудагы мүмкүн болгон түйүндөр тизмеси.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - мүмкүн болгон параллель алиастар тизмеси.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
@@ -2820,12 +2876,12 @@ msgstr ""
" --dump-config - конфигди urpmi.addmedia аргументи көрсөткөн формада "
"дамптоо.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr " --src - кийинки пакет-баштапкы пакет (-s сыяктуу).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
@@ -2833,12 +2889,12 @@ msgstr ""
" --sources - жүктөө алдында пакеттердин баштапкы коддорун чыгаруу "
"(root үчүн гана).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --url - url: url тэгин чыгаруу.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2847,22 +2903,22 @@ msgstr ""
" --use-distrib - иштөө учурунда distrib дарагынан urpmi-ди конфигдөө.\n"
" Опция дистрибутивди суроо-талабына уруксат берет.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - changelog чыгаруу.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - жалпы маалымат тэгин чыгаруу.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - кректелген пакеттерди тескери тартипте издөө.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2872,58 +2928,58 @@ msgstr ""
" - тескери тартипте кеңири издөө (анык пакеттерди "
"камтыйт).\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -p - пакеттерди табуу үчүн provides'терден издөө.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - пакетти алып салууда кеңири маалымат чыгаруу.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr ""
" -d - пакеттерди көз карандылыктары үчүн кеңейтилген суроо-"
"талап.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - группаларды наамдары менен кошо чыгаруу.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - керектүү информацияны окууга ыңгайлуу формада чыгаруу.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - пакеттеги файлдар тизмеси.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - кыскартылган режим (quiet).\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr ""
" -r - версиясын жана релизин наамдары менен кошо чыгаруу.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - кийинки пакет-баштапкы пакет (--src сыяктуу).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2931,48 +2987,48 @@ msgid ""
msgstr ""
" -u - жаңыраак версиясы орнотулган болсо пакетти алып салуу.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
" -y - издөөнү так эмес логиканын негизинде көрсөтүү(--fuzzy "
"сыяктуу).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - -y ачкычынын эквиваленти, бирок тамгалар регистрин эске "
"албайт.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " командалык сапта көрсөтүлгөн наамдар же rpm файлдар суралды.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes опциясы --parallel менен чогуу гана колдонулат"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"Эске алыңыз: изилденип жаткан булак hdlist'терди колдонбогондуктан, urpmf эч "
"кандай жыйынтык кайтара албады\n"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2980,11 +3036,22 @@ msgstr ""
"Эске алыңыз: изилденип жаткан булак hdlist'терди колдонбогондуктан, urpmf эч "
"кандай жыйынтык кайтара албады\n"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "changelog табылбады\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Төмөнкү пакеттердин сигнатуралары туура эмес:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Орнотууну улантууну каалайсызбы?"
+
#, fuzzy
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Бул команданы колдонуу үчүн root болушуңуз керек! \n"
diff --git a/po/lt.po b/po/lt.po
index e37da69e..e39b9c42 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+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"
@@ -20,7 +20,7 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
"100<10 || n%100>=20) ? 1 : 2);\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "RPM įdiegimas"
@@ -30,7 +30,7 @@ msgstr "RPM įdiegimas"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Gerai"
@@ -96,7 +96,7 @@ msgstr "Į_diegti"
msgid "_Save"
msgstr "Iš_saugoti"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Atšaukti"
@@ -116,17 +116,17 @@ msgstr "Nežinomas perspėjimas"
msgid "No packages specified"
msgstr "Išsaugoti paketų pasirinkimą"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Palaukite..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "Turi būti pradinis"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -137,42 +137,42 @@ msgstr ""
"%s\n"
"Tęsti?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Dėmesio"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Gerai"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (atnaujinti)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (įdiegti)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "Paketų pasirinkimas"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Vienas iš šių paketų yra reikalingas."
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Nutraukti"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -183,19 +183,19 @@ msgstr ""
"%s\n"
"Tęsti?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, 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:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, 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:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, fuzzy, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
@@ -203,40 +203,42 @@ msgstr[0] "%d paketų"
msgstr[1] "%d paketų"
msgstr[2] "%d paketų"
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Paketų įdiegimas..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "negaliu gauti pirminių paketų, nutraukiu"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Ruošiamasi..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Įdiegiamas paketas `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Įdėkite laikmeną, pavadintą \"%s\", į įrenginį [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Parsiunčiamas paketas `%s'..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Sekantys paketai turi blogus ženklus:\n"
-"%s\n"
-"\n"
-"Ar norite tęsti įdiegimą ?"
+msgid "_Done"
+msgstr "Baigta"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -247,41 +249,27 @@ msgstr ""
"%s\n"
"Jūs galite norėti atnaujinti urpmi duomenų bazę"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "pašalinama %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Ruošiamasi..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Įdiegiamas paketas `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "Baigta"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Įdiegimas nepavyko"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Paketas(-ai) jau įdiegti"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Įdiegimas baigtas"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "pašalinama %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -316,7 +304,7 @@ msgstr " -g - spausdinti grupes kartu su pavadinimu.\n"
msgid " defaults to %s.\n"
msgstr " standartinis yra %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Paketus įdiegti leidžiama tik supervartotojui"
@@ -326,98 +314,98 @@ msgstr "Paketus įdiegti leidžiama tik supervartotojui"
msgid "Running urpmi in restricted mode..."
msgstr "urpmi paleidžiama apribota veiksena..."
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "negaliu atverti rpmdb"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "netinkamas rpm bylos vardas [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "atkuriama rpm byla [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...atkūrimas baigtas"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...atkūrimas nepavyko: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "negaliu prieiti prie rpm bylos [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "negaliu išnagrinėti \"%s\" byloje [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "negaliu įregistruoti rpm bylos"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "vietinių paketų registravimo klaida"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Operacija yra draudžiama, kai dirbama apribotoje veiksenoje"
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "blogas tarpinio serverio deklaravimas komandinėje eilutėje\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: negaliu perskaityti rpm bylos \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "\"%s\" laikmenai sudaryta hdlist sintezės byla"
@@ -606,7 +594,12 @@ msgstr "paketas %s nerastas."
msgid "malformed URL: [%s]"
msgstr "blogai suformuotas įvedimas: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "rpm bylos atkuriamos iš laikmenos \"%s\"..."
@@ -616,44 +609,49 @@ msgstr "rpm bylos atkuriamos iš laikmenos \"%s\"..."
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, 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:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "negaliu sukurti operacijos"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, 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:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "įtraukiamas paketas %s (id=%d, eid=%d, atnaujinti=%d, byla=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "negaliu įdiegti paketo %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "pašalinamas paketas %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "pašalinamas paketas %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "iš %2$s įdiegiamas %1$s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Daugiau informacijos apie paketą %s"
@@ -683,11 +681,104 @@ msgstr "Išsaugoti paketų pasirinkimą"
msgid "Cannot connect to ldap uri:"
msgstr "Nepavyko paskirti spalvų lentelės įrašų"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "urpmi duomenų bazė užrakinta"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Dėmesio"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "urpmi duomenų bazė užrakinta"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "Šie paketai turi netinkamus ženklus"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Šie paketai turi netinkamus ženklus"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Ar norite tęsti įdiegimą ?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Įdiegimas nepavyko"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "paskirstomas %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "iš %2$s įdiegiamas %1$s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "įdiegiama %s"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Pabandyti įdiegimą be priklausomybių tikrinimo? (t/N) "
+
+#: ../urpm/main_loop.pm:205
+#, fuzzy, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "Pabandyti įdiegimą priverstinai (--force)? (t/N) "
+
+#: ../urpm/main_loop.pm:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d įdiegimo operacijos nepavyko"
+msgstr[1] "%d įdiegimo operacijos nepavyko"
+msgstr[2] "%d įdiegimo operacijos nepavyko"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Įdiegimas galimas"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "Paketas(-ai) jau įdiegti"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Paketas(-ai) jau įdiegti"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "Paketas(-ai) jau įdiegti"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Paketas(-ai) jau įdiegti"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -738,7 +829,7 @@ msgstr "bandoma išrinkti nesančią laikmeną \"%s\""
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "\"%s\" laikmenai sudaryta hdlist sintezės byla"
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "negaliu prieiti prie \"%s\" hdlist bylos, laikmena ignoruojama"
@@ -831,7 +922,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Paieškos pradžia: %s pabaiga: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "atliekamas antrasis priklausomybių skaičiavimo bandymas\n"
@@ -896,67 +987,72 @@ msgstr "negaliu atverti rpmdb"
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:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "bandoma išrinkti nesančią laikmeną \"%s\""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "išrenkama daugialypė laikmena: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "pašalinama laikmena \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "laikmenai \"%s\" iš naujo konfigūruojama urpmi"
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...naujas konfigūravimas nepavyko"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "naujas konfigūravimas atliktas"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "laikmena \"%s\" neišrinkta"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "tikrinama hdlist byla [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "tikrinama sintezės byla [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "sudaromas hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -965,77 +1061,77 @@ msgstr ""
"Laikmenai \"%s\" negaliu sudaryti sintezės bylos. Jūsų hdlist byla gali būti "
"sugadinta."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "hdlist skaitymo arba \"%s\" laikmenos bylos sintezės problema"
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "įrašoma laikmenos \"%s\" sąrašo byla"
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...kopijavimas nepavyko"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopijuojama \"%s\" aprašo byla..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...kopijavimas baigtas"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "[%s] kopijavimas nepavyko (byla per daug maža)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "nukopijuotam hdlist (arba sintezei) skaičiuojama md5sum"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "[%s] kopijavimas nepavyko (md5sum neatitikimas)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "atkurtam hdlist (arba sintezei) skaičiuojama md5sum"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...atkūrimas nepavyko: md5sum neatitikimas"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "nerasta jokių rpm bylų iš [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "iš [%s] skaitomos rpm bylos"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "negaliu skaityti rpm bylų iš [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "neperskaityta jokių rpms"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1046,74 +1142,74 @@ msgstr ""
"tai galėjo atsitikti, jei, kurdami laikmeną, rankiniu būdu prijungėte "
"katalogą."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "laikmenai \"%s\" nerasta hdlist byla"
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "atkuriamas \"%s\" pirminis hdlist (arba zintezė)..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "rastas ištirtas hdlist (arba sintezė) kaip %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "laikmenai \"%s\" nerasta hdlist byla"
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "tikrinama \"%s\" pubkey byla..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...iš \"%2$s\" pubkey bylos importuotas raktas %1$s"
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "negaliu importuoti \"%s\" pubkey bylos"
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "įrašoma laikmenos \"%s\" sąrašo byla"
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "įtraukta laikmena %s"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "negaliu išnagrinėti \"%s\" hdlist bylos"
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "laikmenos \"%s\" sintezės bylos skaitymo problema"
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "iš laikmenos \"%s\" skaitomos antraštės"
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "TtYy"
@@ -1173,47 +1269,52 @@ msgstr "nesuderinama laikmena \"%s\" pažymėta kaip išimama, bet tokia nėra"
msgid "unable to access medium \"%s\""
msgstr "negaliu prieiti prie laikmenos \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Nėra paketo, pavadinto %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Šie paketai turi %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "dėl trūkstamo %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Paketas(-ai) jau įdiegti"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "dėl nepatenkinto %s"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "bandau paaukštinti %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "%s išlaikymui"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "%s įdiegimui"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "dėl konfliktų su %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "nepareikalautas"
@@ -1233,6 +1334,16 @@ msgstr "Netinkamas rakto ID (%s)"
msgid "Missing signature (%s)"
msgstr "Nėra ženklo (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Įjungti ar išjungti bendrą naudojimąsi bylomis"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Kopijavimas nepavyko"
+
#: ../urpme:40
#, fuzzy, c-format
msgid ""
@@ -1250,8 +1361,8 @@ msgstr ""
"\n"
"naudojimas:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1268,18 +1379,18 @@ msgstr ""
" --test - tikrinti, jei pašalinimas negali būti tinkamai "
"įvykdytas.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr " --force - vykdyti kreipimąsi, net jei nėra keleto paketų.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - urpmi paskirstomas po kompiuterius.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - spausdinti žymens archyvatorių: archyvatorius.\n"
@@ -1289,8 +1400,8 @@ msgstr " --packager - spausdinti žymens archyvatorių: archyvatorius.\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - naudokite kitą pradinį (root) rpm pašalinimui.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - rpm įdiegimui naudokite kitą pradinį.\n"
@@ -1310,17 +1421,17 @@ msgstr ""
"metodu, naudinga\n"
" įdiegti (pašalinti) chroot su --root parinktimi.\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - bandyti surasti ir panaudoti sintezės bylą.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - bandyti surasti ir panaudoti hdlist bylą.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - verbose veiksena.\n"
@@ -1330,37 +1441,37 @@ msgstr " --verbose - verbose veiksena.\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - išrinkti visus paketus, atitinkančius išraišką.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Paketus pašalinti gali tik supervartotojas"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "nežinomi paketai"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "nežinomas paketas"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "paketo %s pašalinimas sugadins jūsų sistemą"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Nėra ką pašalinti"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Tikrinami pašalintini sekantys paketai"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1369,12 +1480,12 @@ 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)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
@@ -1382,12 +1493,12 @@ msgstr[0] "pašalinamas paketas %s"
msgstr[1] "pašalinamas paketas %s"
msgstr[2] "pašalinamas paketas %s"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (t/N) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Pašalinimas nepavyko"
@@ -1414,14 +1525,14 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --help - spausdinti šį pagalbos pranešimą.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - naudoti specifinę aplinką (paprastai klaidos "
"pranešimas).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr " --excludemedia - nenaudoti duotųjų laikmenų, atskirtų kableliu.\n"
@@ -1432,13 +1543,13 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../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"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1452,7 +1563,7 @@ msgid " --use-distrib - use the given path to access media\n"
msgstr ""
" --synthesis - vietoje urpmi duomenų bazės naudokite duotąją sintezę.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1463,7 +1574,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - nespausdinti identiškų eilučių.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - naudoti tik atnaujinimo laikmeną.\n"
@@ -1598,78 +1709,88 @@ msgstr " --group - spausdinti žymenų grupę: grupė.\n"
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr " --name - spausdinti tik paketų pavadinimus.\n"
#: ../urpmf:73
#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr " --name - spausdinti tik paketų pavadinimus.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - spausdinti pasenusius žymenis: visi pasenę.\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr " --packager - spausdinti žymens archyvatorių: archyvatorius.\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, fuzzy, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - spausdinti: all provides.\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, fuzzy, c-format
msgid " --requires - requires tags\n"
msgstr ""
" --requires - spausdinti žymenų pareikalavimus: visi pareikalavimai.\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --size - spausdinti žymenų dydį: dydis.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, fuzzy, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - spausdinti žymens pirminį rpm: pirminis rpm.\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - spausdinti pasenusius žymenis: visi pasenę.\n"
+
+#: ../urpmf:81
#, fuzzy, c-format
msgid " --summary - summary\n"
msgstr " --summary, -S - spausdinti suvestinę.\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr " --url - spausdinti žymens url: url.\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr " --verbose - verbose veiksena.\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -l - paketo bylas sudėti į sąrašą.\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - spausdinimo versija, išleisti ir archyvuoti su "
"pavadinimu.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "%s naudojama specifinė aplinka\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1678,12 +1799,12 @@ msgstr ""
"Pastaba: kadangi nei viena surasta laikmena nenaudoja hdlists, urpmf negali "
"išvesti jokio rezultato\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Galbūt noresite naudoti --pavadinimas paketų pavadinimų paieškai.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, fuzzy, c-format
msgid ""
"urpmi version %s\n"
@@ -1700,7 +1821,7 @@ msgstr ""
"\n"
"naudojimas:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1708,37 +1829,37 @@ msgstr ""
" --searchmedia - pareikalautų (arba atnaujintų) paketų paieškai naudokite "
"tik duotąją laikmeną.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr ""
" --auto-select - automatiškai parinkti paketus sistemos atnaujinimui.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
" --auto-select - automatiškai parinkti paketus sistemos atnaujinimui.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, fuzzy, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - išjungti MD5SUM bylos tikrinimą.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, fuzzy, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - vykdyti gpg key atnaujinimą.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1747,12 +1868,12 @@ msgstr ""
" --no-uninstall - niekada neklausiti dėl paketo pašalinimo, nutraukti "
"įdiegimą.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - paketų neįdiegti (tik parsisiųsti)\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1762,7 +1883,7 @@ msgstr ""
"pareikalautus\n"
" paketus, kurie prašo pašalinimų.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1774,37 +1895,43 @@ msgstr ""
" ruošiamasi įdiegti ar atnaujinti,\n"
" standartiškai yra %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - trumpos operacijos ilgis, standartiškai yra %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, fuzzy, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy - paskirti neaiškią paiešką (toks pat kaip -y).\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, fuzzy, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src - sekantis paketas yra pirminis (toks pat kaip -s).\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr " --install-src - įdiegti tik pirminį paketą (be dvejetainių).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - prieš ką nors atliekant, iš cache pašalinti rpm.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - rpms iš cache neišvalyti.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1813,7 +1940,7 @@ msgstr ""
" --allow-nodeps - leisti vartotojo paklausti dėl paketų be priklausomybių\n"
" tikrinimo įdiegimo.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1822,12 +1949,12 @@ msgstr ""
" --allow-force - allow asking user to install packages without\n"
" dependencies checking and integrity.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - rpm įdiegimui naudokite kitą pradinį.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1837,47 +1964,47 @@ msgstr ""
"medžio, naudinga \n"
" įdiegti chroot su --root parinktimi.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - tolimų bylų atkūrimui naudokite wget.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - tolimų bylų atkūrimui naudokite curl.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, fuzzy, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --curl - tolimų bylų atkūrimui naudokite curl.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - apriboti parsiuntimo greitį.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1887,7 +2014,7 @@ msgstr ""
" (--no-resume išjungia funkciją, standartiškai ji yra "
"išjungta).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1897,7 +2024,7 @@ msgstr ""
"prievado numeris\n"
" bus 1080 (formatas yra toks <proxyhost[:port]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1908,7 +2035,7 @@ msgstr ""
" tarpiniame serveryje (formatas yra tkos<vartotojas:"
"slaptažodis>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1917,7 +2044,7 @@ msgstr ""
" --bug - išvesti klaidų ataskaitą kataloge, kuris nurodytas\n"
" sekančiu argumentu.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, fuzzy, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1927,7 +2054,7 @@ msgstr ""
" (--no-verify-rpm funkciją išjungia, standartiškai ji yra "
"įjungta).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, fuzzy, c-format
msgid ""
" --test - only verify if the installation can be achieved "
@@ -1935,39 +2062,44 @@ msgid ""
msgstr ""
" --test - patikrinti, ar įdiegimas gali būti įvykdytas teisingai.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - neįtraukti kelio, atskirto kableliu.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - neįtraukti doc bylų.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, fuzzy, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --no-uninstall - niekada neklausiti dėl paketo pašalinimo, nutraukti "
"įdiegimą.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --url - spausdinti žymens url: url.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - spausdinti žymens aprašymą: aprašymas.\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - paketai, kurie neturi būti diegiami\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - paketai, kurie neturi būti diegiami\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1976,60 +2108,60 @@ msgstr ""
" --more-choices - kai randama keletas paketų, vietoje standartinių\n"
" leisti pasirinkti.\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - rpms iš cache neišvalyti.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, 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:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - komandinėje eilutėje išrinkti visus atitikimus.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - paketo suradimui leisti paiešką pasiūlymuose.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - paketo suradimui paieškos pasiūlymuose neatlikti.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - paslėptoji veiksena.\n"
-#: ../urpmi:157
+#: ../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:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, 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:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2038,7 +2170,7 @@ msgstr ""
"Katalogas [%s] jau yra, klaidų ataskaitai naudokite kitą katalogą arba "
"esantį ištrinkite"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Klaidų ataskaitai negaliu sukurti katalogo [%s]"
@@ -2048,7 +2180,7 @@ msgstr "Klaidų ataskaitai negaliu sukurti katalogo [%s]"
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2057,46 +2189,48 @@ msgstr ""
"Klaida: %s prijungta tik skaitymui.\n"
"Operacijos vykdymui naudokite --allow-force"
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (atnaujinti)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (atnaujinti)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (įdiegti)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (įdiegti)"
-#: ../urpmi:447
+#: ../urpmi:454
#, 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:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Koks Jūsų pasirinkimas? (1-%d)"
-#: ../urpmi:481
+#: ../urpmi:498
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2107,7 +2241,7 @@ msgstr ""
"kurie yra senesni nei dabar įdiegti:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2118,19 +2252,19 @@ msgstr ""
"kurie yra senesni nei dabar įdiegti:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Ar vis tiek tęsti?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (T/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2139,7 +2273,7 @@ msgstr ""
"Pareikalautas paketas negali būti įdiegtas:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2148,7 +2282,7 @@ msgstr ""
"Pareikalautas paketas negali būti įdiegtas:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2159,7 +2293,7 @@ msgstr ""
"turi būti pašalinti, kad kitus būtų galima atnaujinti:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2170,7 +2304,7 @@ msgstr ""
"turi būti pašalinti, kad kitus būtų galima atnaujinti:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2179,7 +2313,7 @@ msgstr ""
"Šie paketai turi būti pašalinti tam, kad kitus būtų galima atnaujinti:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2188,12 +2322,17 @@ msgstr ""
"Šie paketai turi būti pašalinti tam, kad kitus būtų galima atnaujinti:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2202,12 +2341,12 @@ msgstr ""
"Išvardintų priklausomybių įdiegimiui jūs turite būti pradiniu:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2215,100 +2354,17 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../urpmi:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Kai būsite pasiruošę, paspauskite Enter..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Atšaukti"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "Šie paketai turi netinkamus ženklus"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Šie paketai turi netinkamus ženklus"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Ar norite tęsti įdiegimą ?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Įdiegimas nepavyko"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "paskirstomas %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "iš %2$s įdiegiamas %1$s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "įdiegiama %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Pabandyti įdiegimą be priklausomybių tikrinimo? (t/N) "
-
-#: ../urpmi:776
-#, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Pabandyti įdiegimą priverstinai (--force)? (t/N) "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d įdiegimo operacijos nepavyko"
-msgstr[1] "%d įdiegimo operacijos nepavyko"
-msgstr[2] "%d įdiegimo operacijos nepavyko"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Įdiegimas galimas"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Paketas(-ai) jau įdiegti"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Paketas(-ai) jau įdiegti"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "Paketas(-ai) jau įdiegti"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "Paketas(-ai) jau įdiegti"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "iš naujo paleidžiama urpmi"
@@ -2441,49 +2497,49 @@ msgstr " -v - verbose veiksena.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "negaliu atnaujinti laikmenos \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Įtraukti laikmeną gali tik supervartotojas"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "Bus sukurta konfigūracijos byla [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "Negaliu sukurti konfigūracijos bylos [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "nebūtina duoti <atitinkamas hdlist kelias> su --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<atitinkamas hdlist kelias> nėra\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "negaliu sukurti laikmenos \"%s\"\n"
@@ -2645,17 +2701,17 @@ msgstr " -a - išrinkti visas laikmenas.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - neaiškus laikmenų pavadinimų sutapimas.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Pašalinti laikmeną galima tik supervartotojui"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "nėra ką pašalinti (laikmenos pridėjimui naudokite urpmi.addmedia)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2712,17 +2768,17 @@ msgstr " -a - išrinkti visas neišimamas laikmenas.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - vykdyti hdlist bylų sudarymą.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Atnaujinti laikmenas gali tik supervartotojas"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "nėra ką atnaujinti (laikmenos pridėjimui naudokite urpmi.addmedia)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2731,22 +2787,22 @@ msgstr ""
"atnaujintino įrašo nėra\n"
"(vienas iš %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "ignoruojama laikmena %s"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "įgalinama laikmena %s"
-#: ../urpmq:43
+#: ../urpmq:40
#, fuzzy, c-format
msgid ""
"urpmq version %s\n"
@@ -2763,7 +2819,7 @@ msgstr ""
"\n"
"naudojimas:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2772,38 +2828,38 @@ msgstr ""
" --searchmedia - pareikalautų (arba atnaujintų) paketų paieškai naudokite "
"tik duotąją laikmeną.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - paskirti neaiškią paiešką (toks pat kaip -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - išvardyti galimus paketus.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - pateikti galimų laikmenų sąrašą.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - pateikti galimų laikmenų ir jų url sąrašą.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
" --list-nodes - kai naudojamas --parallel, išvardyti visus mazgus.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - išvardyti visus lygiagrečiuosius slapyvardžius.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
@@ -2811,12 +2867,12 @@ msgstr ""
" --dump-config - konfigūraciją perrašyti urpmi.addmedia argumento "
"formoje.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr " --src - sekantis paketas yra pirminis (toks pat kaip -s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
@@ -2824,12 +2880,12 @@ msgstr ""
" --sources - parodyti visus pirminius paketus prieš juos parsiunčiant "
"(tik pradiniam).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --url - spausdinti žymens url: url.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2839,22 +2895,22 @@ msgstr ""
"medžio.\n"
" Šis leidimas apklausia distro.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - atspausdinti changelog.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - spausdinti suvestinę.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - atbulinė paieška to, kas reikalauja paketo.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2864,58 +2920,58 @@ msgstr ""
" - išplėstinė atbulinė paieška (apima ir virtualius "
"paketus).\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -p - iškoti paketo suradimo pateiktyse.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr ""
" -c - išvedimą užbaigti paketu, kuris turi būti pašalintas.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - išplėsti paketo priklausomybių užklausą.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - spausdinti grupes kartu su pavadinimu.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - naudingą informaciją spausdinti žmogui suprantama forma.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - paketo bylas sudėti į sąrašą.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - paslėptoji veiksena.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr ""
" -r - atspausdinti versiją ir leidimą kartu su pavadinimu.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - sekantis paketas yra pradinis (tas pats kaip --src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2923,46 +2979,46 @@ msgid ""
msgstr ""
" -u - paketą pašalinti, jei yra įdiegta naujesnė jo versija.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - skirti neaiškią paiešką (tas pats kaip --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - panašiai kaip -y, bet yra vykdoma nekreipiant dėmesio į "
"didžiąsiais ir mažąsias raides.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " apklausiami komandinėje eilutėje duoti pavadinimai arba rpm bylos.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-mazgas gali būti naudojamas tik su --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"Pastaba: kadangi nei viena surasta laikmena nenaudoja hdlists, urpmf negali "
"išvesti jokio rezultato\n"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2970,11 +3026,22 @@ msgstr ""
"Pastaba: kadangi nei viena surasta laikmena nenaudoja hdlists, urpmf negali "
"išvesti jokio rezultato\n"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Nerastas changelog\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Sekantys paketai turi blogus ženklus:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Ar norite tęsti įdiegimą ?"
+
#, fuzzy
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Kad galėtumėte dalintis katalogais, jūs turite būti atpažintas"
@@ -3297,9 +3364,5 @@ msgstr "Nerastas changelog\n"
#~ "%s"
#, fuzzy
-#~ msgid "unable to write file [%s]"
-#~ msgstr "Įjungti ar išjungti bendrą naudojimąsi bylomis"
-
-#, fuzzy
#~ msgid "retrieving mirrors at %s ..."
#~ msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
diff --git a/po/lv.po b/po/lv.po
index ece196c0..b57e3038 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+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"
@@ -21,7 +21,7 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
"2);\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, fuzzy, c-format
msgid "RPM installation"
msgstr "Sagatavoju instalēšanu"
@@ -31,7 +31,7 @@ msgstr "Sagatavoju instalēšanu"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Labi"
@@ -81,7 +81,7 @@ msgstr "_Uzstādīt"
msgid "_Save"
msgstr "_Saglabāt"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "At_celt"
@@ -103,17 +103,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Saglabāt pakotņu izvēli"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Lūdzu gaidiet..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, fuzzy, c-format
msgid "Must be root"
msgstr "Peles ports"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -124,42 +124,42 @@ msgstr ""
"%s\n"
"vai piekrītat?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Uzmanību"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Labi"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "Atjaunināt"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, fuzzy, c-format
msgid " (to install)"
msgstr "Instalēšanas beigas"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Ir nepieciešama viena no sekojošām pakotnēm:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Pārtraukt"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -167,19 +167,19 @@ msgid ""
"Continue installation anyway?"
msgstr "Tiks noņemtas sekojošas pakotnes"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, 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:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, 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:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, fuzzy, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
@@ -187,36 +187,42 @@ msgstr[0] "%d pakotnes"
msgstr[1] "%d pakotnes"
msgstr[2] "%d pakotnes"
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, fuzzy, c-format
msgid "Package installation..."
msgstr "Sagatavoju instalēšanu"
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "nevar dabūt koda pakotnes, pārtraucu"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Sagatavoju..."
+
+#: ../gurpmi2:246
+#, fuzzy, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instalēju pakotnes..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Lūdzu ielieciet datu nesēju \"%s\" ierīcē [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, fuzzy, c-format
msgid "Downloading package `%s'..."
msgstr "Instalēju pakotnes..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr "Sekojošām pakotnēm ir slikti paraksti"
+msgid "_Done"
+msgstr "Izdarīts"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -224,41 +230,27 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../gurpmi2:292 ../urpme:142
-#, fuzzy, c-format
-msgid "removing %s"
-msgstr "Atvienoju %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Sagatavoju..."
-
-#: ../gurpmi2:302
-#, fuzzy, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instalēju pakotnes..."
-
-#: ../gurpmi2:334
-#, fuzzy, c-format
-msgid "_Done"
-msgstr "Izdarīts"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Instalēšana neizdevās"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "viss jau ir instalēts"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Instalēšana pabeigta"
+#: ../gurpmi2:312 ../urpme:139
+#, fuzzy, c-format
+msgid "removing %s"
+msgstr "Atvienoju %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -295,7 +287,7 @@ msgstr ""
"\n"
"\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, fuzzy, c-format
msgid "Only superuser is allowed to install packages"
msgstr "nevaru instalēt pakotni %s"
@@ -305,98 +297,98 @@ msgstr "nevaru instalēt pakotni %s"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, fuzzy, c-format
msgid "unable to open rpmdb"
msgstr "Nevar atvērt failu %s\n"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nederīgs rpm faila vārds [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, fuzzy, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "atgūstu hdlists failu..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...atgūšana veikta"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...atgūšana neizdevās: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "nav iespējams piekļūt rpm failam [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "nav iespējams piekļūt rpm failam [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, fuzzy, c-format
msgid "unable to register rpm file"
msgstr "nav iespējams piekļūt rpm failam [%s]"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "kļūda reģistrējot lokālās pakotnes"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr ""
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, fuzzy, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "nevar nolasīt izvēlnes failu:%s"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "uzbūvēju hdlist synthesis failu priekš datu nesēja \"%s\""
@@ -583,7 +575,12 @@ msgstr "pakotne %s nav atrasta."
msgid "malformed URL: [%s]"
msgstr "nepareizi izveidots ievads: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, fuzzy, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "nav iespējams nolasīt rpm failu [%s] no datu nesēja \"%s\""
@@ -593,43 +590,48 @@ msgstr "nav iespējams nolasīt rpm failu [%s] no datu nesēja \"%s\""
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, fuzzy, c-format
msgid "unable to create transaction"
msgstr "Neizdevās izveidot ssh identitāti"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "nevaru noņemt pakotni %s"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr ""
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "nevaru instalēt pakotni %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "Instalēju pakotni %s"
+
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing package %s"
msgstr "Instalēju pakotni %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "tiek instalēta %s\n"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, fuzzy, c-format
msgid "More information on package %s"
msgstr "Vairāk informācijas par pakotni..."
@@ -659,11 +661,104 @@ msgstr "Saglabāt pakotņu izvēli"
msgid "Cannot connect to ldap uri:"
msgstr "Nevaru pieslēgties serverim"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "urpmi datubāze noslēgta"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Uzmanību"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "urpmi datubāze noslēgta"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "Sekojošām pakotnēm ir slikti paraksti"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Sekojošām pakotnēm ir slikti paraksti"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Vēlaties turpināt instalēšanu?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Instalēšana neizdevās"
+
+#: ../urpm/main_loop.pm:133
+#, fuzzy, c-format
+msgid "distributing %s"
+msgstr "tiek instalēta %s\n"
+
+#: ../urpm/main_loop.pm:148
+#, fuzzy, c-format
+msgid "installing %s from %s"
+msgstr "tiek instalēta %s\n"
+
+#: ../urpm/main_loop.pm:150
+#, fuzzy, c-format
+msgid "installing %s"
+msgstr "tiek instalēta %s\n"
+
+#: ../urpm/main_loop.pm:187
+#, 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:205
+#, 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:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "Instalēšana neizdevās"
+msgstr[1] "Instalēšana neizdevās"
+msgstr[2] "Instalēšana neizdevās"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Instalēšana ir iespējama"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "viss jau ir instalēts"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "viss jau ir instalēts"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "viss jau ir instalēts"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "viss jau ir instalēts"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -716,7 +811,7 @@ msgstr "nevar izveidot datu nesēju \"%s\"\n"
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "uzbūvēju hdlist synthesis failu priekš datu nesēja \"%s\""
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "nevar piekļūt \"%s\" hdlist failam, datu nesējs tiek ignorēts"
@@ -807,7 +902,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Meklēt instalētos fontus"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr ""
@@ -874,144 +969,149 @@ msgstr "Nevar atvērt failu %s\n"
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:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, fuzzy, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "nevar izveidot datu nesēju \"%s\"\n"
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, fuzzy, c-format
msgid "selecting multiple media: %s"
msgstr "izvēlos vairākas vides: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "noņemu datu nesēju \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "Konfigurēju printeri \"%s\"..."
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "Izvēlnes konfigurācija saglabāta"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "Servera konfigurācija"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "datu nesējs \"%s\" nav izvēlēts"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "eksaminēju hdlist failu [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "eksaminēju synthesis failu [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "būvēju hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, fuzzy, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problēma nolasot datu nesēja \"%s\" synthesis failu"
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, fuzzy, c-format
msgid "...copying failed"
msgstr "...kopēšana veikta"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopēju \"%s\" apraksta failu ..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...kopēšana veikta"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "[%s] kopēšana neizdevās"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, fuzzy, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "saraksta fails priekš \"%s\" ir tukšs"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, fuzzy, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "[%s] kopēšana neizdevās"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, fuzzy, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "saraksta fails priekš \"%s\" ir tukšs"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, fuzzy, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...atgūšana neizdevās: %s"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "netika atrasti rpm faili no [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "nolasu rpm failus no [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "neizdevās nolasīt rpm failus no [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1019,74 +1119,74 @@ msgid ""
"medium."
msgstr ""
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, fuzzy, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "atgūstu hdlists failu..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, fuzzy, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "saraksta fails priekš \"%s\" ir tukšs"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, fuzzy, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "kopēju \"%s\" apraksta failu ..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, fuzzy, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "nevaru ierakstīt \"%s\" saraksta failu"
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, fuzzy, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "nevaru ierakstīt \"%s\" saraksta failu"
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, fuzzy, c-format
msgid "writing list file for medium \"%s\""
msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "pievienoju datu nesēju %s."
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "nevaru izanalizēt \"%s\" hdlist failu"
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problēma nolasot datu nesēja \"%s\" synthesis failu"
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, fuzzy, c-format
msgid "reading headers from medium \"%s\""
msgstr "problēma nolasot datu nesēja \"%s\" synthesis failu"
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "jJYy"
@@ -1146,47 +1246,52 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "nav iespējams piekļūt datu nesējam \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Nav pakotnes ar nosaukumu %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Sekojošas pakotnes satur %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "trūkstošs kdesu"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "viss jau ir instalēts"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, fuzzy, c-format
msgid "due to unsatisfied %s"
msgstr "trūkstošs kdesu"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, fuzzy, c-format
msgid "trying to promote %s"
msgstr "Nav nekā, ko noņemt.\n"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, fuzzy, c-format
msgid "in order to keep %s"
msgstr "Loga rāmja tēma"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "nevaru instalēt pakotni %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "%s konflikē ar %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, fuzzy, c-format
msgid "unrequested"
msgstr "Konkvests"
@@ -1206,6 +1311,16 @@ msgstr ""
msgid "Missing signature (%s)"
msgstr "Neesoši ieraksti"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "nevar saglabāt konfigurācijas failu [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Neveiksmīga Pieteikšanās"
+
#: ../urpme:40
#, fuzzy, c-format
msgid ""
@@ -1222,8 +1337,8 @@ msgstr ""
"\n"
"Pielietojums:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1239,18 +1354,18 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - pārbaudīt, vai instalācija var tikt veikta korekti.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr ""
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --list - izvadīt sarakstu ar pieejamām pakotnēm.\n"
@@ -1260,8 +1375,8 @@ msgstr " --list - izvadīt sarakstu ar pieejamām pakotnēm.\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --wget - lietot wget, lai iegūtu attālinātos failus.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --wget - lietot wget, lai iegūtu attālinātos failus.\n"
@@ -1278,19 +1393,19 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr ""
" -h - mēģināt atrast un lietot synthesis vai hdlist failu.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr ""
" -h - mēģināt atrast un lietot synthesis vai hdlist failu.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " -v - runīgais režīms.\n"
@@ -1300,37 +1415,37 @@ msgstr " -v - runīgais režīms.\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -c - iztīrīt iesākumu kešatmiņas direktoriju.\n"
-#: ../urpme:76
+#: ../urpme:73
#, fuzzy, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Tikai root drīkst instalēt pakotnes"
-#: ../urpme:107
+#: ../urpme:104
#, fuzzy, c-format
msgid "unknown packages"
msgstr "%d pakotnes"
-#: ../urpme:107
+#: ../urpme:104
#, fuzzy, c-format
msgid "unknown package"
msgstr "%d pakotnes"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, fuzzy, c-format
msgid "removing package %s will break your system"
msgstr "pakotnes %s noņemšana sabojās Jūsu sistēmu\n"
-#: ../urpme:121
+#: ../urpme:118
#, fuzzy, c-format
msgid "Nothing to remove"
msgstr "Nav iezīmes ko noņemt!"
-#: ../urpme:126
+#: ../urpme:123
#, fuzzy, c-format
msgid "Checking to remove the following packages"
msgstr "Ir nepieciešama viena no sekojošām pakotnēm:"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1339,12 +1454,12 @@ 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)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
@@ -1352,12 +1467,12 @@ msgstr[0] "Instalēju pakotni %s"
msgstr[1] "Instalēju pakotni %s"
msgstr[2] "Instalēju pakotni %s"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (j/N) "
-#: ../urpme:160
+#: ../urpme:157
#, fuzzy, c-format
msgid "Removal failed"
msgstr "Neveiksmīga Pieteikšanās"
@@ -1383,12 +1498,12 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --help - izvadīt šo palīdzības ziņojumu.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, fuzzy, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr " --update - izveidot atjaunināšanas datu nesēju.\n"
@@ -1399,12 +1514,12 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../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"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, fuzzy, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1415,7 +1530,7 @@ msgstr " --update - izveidot atjaunināšanas datu nesēju.\n"
msgid " --use-distrib - use the given path to access media\n"
msgstr " --update - izveidot atjaunināšanas datu nesēju.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1425,7 +1540,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --help - izvadīt šo palīdzības ziņojumu.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, fuzzy, c-format
msgid " --update - use only update media.\n"
msgstr " --update - izveidot atjaunināšanas datu nesēju.\n"
@@ -1563,87 +1678,97 @@ msgstr " --help - izvadīt šo palīdzības ziņojumu.\n"
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr " --list - izvadīt sarakstu ar pieejamām pakotnēm.\n"
#: ../urpmf:73
#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr " --list - izvadīt sarakstu ar pieejamām pakotnēm.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - drukāt iezīmi: novecojušas (vairākas rindiņas)."
-#: ../urpmf:74
+#: ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr " --list - izvadīt sarakstu ar pieejamām pakotnēm.\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, fuzzy, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - drukāt iezīmi: nodrošina (vairākas rindiņas)."
-#: ../urpmf:76
+#: ../urpmf:77
#, fuzzy, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - drukāt iezīmi: nepieciešamas (vairākas rindiņas)."
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --help - izvadīt šo palīdzības ziņojumu.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, fuzzy, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --group - drukāt iezīmi: grupa."
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - drukāt iezīmi: novecojušas (vairākas rindiņas)."
+
+#: ../urpmf:81
#, fuzzy, c-format
msgid " --summary - summary\n"
msgstr " --summary - drukāt iezīmi: kopsavilkums."
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr " --help - izvadīt šo palīdzības ziņojumu.\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr " -v - runīgais režīms.\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr " --list - izvadīt sarakstu ar pieejamām pakotnēm.\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, fuzzy, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -v - runīgais režīms.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
-#: ../urpmi:79
+#: ../urpmi:75
#, fuzzy, c-format
msgid ""
"urpmi version %s\n"
@@ -1659,60 +1784,60 @@ msgstr ""
"\n"
"Pielietojums:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
msgstr " --update - izveidot atjaunināšanas datu nesēju.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr ""
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr " --update - izveidot atjaunināšanas datu nesēju.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr ""
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr ""
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
"installation.\n"
msgstr ""
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr ""
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
" packages that lead to removals.\n"
msgstr ""
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1720,110 +1845,116 @@ msgid ""
" default is %d.\n"
msgstr ""
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr ""
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr ""
-#: ../urpmi:105
+#: ../urpmi:101
#, fuzzy, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --list - izvadīt sarakstu ar pieejamām pakotnēm.\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - izņemt rpm no kešatmiņas, pirms darīt ko citu.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, fuzzy, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --clean - izņemt rpm no kešatmiņas, pirms darīt ko citu.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
" dependencies checking.\n"
msgstr ""
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
" dependencies checking and integrity.\n"
msgstr ""
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, fuzzy, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --wget - lietot wget, lai iegūtu attālinātos failus.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
" to install a chroot with --root option.\n"
msgstr ""
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - lietot wget, lai iegūtu attālinātos failus.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - lietot curl, lai iegūtu attālinātos failus.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, fuzzy, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --curl - lietot curl, lai iegūtu attālinātos failus.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr ""
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
" (--no-resume disables it, default is disabled).\n"
msgstr ""
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1833,7 +1964,7 @@ msgstr ""
" ka ir 1080 pēc noklusēšanas (formāts ir <proxy_hosts[:"
"ports]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1843,21 +1974,21 @@ msgstr ""
" priekš proxy autentifikācijas (formāts ir <lietotājs:"
"parole>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
" next arg.\n"
msgstr ""
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
" (--no-verify-rpm disables it, default is enabled).\n"
msgstr ""
-#: ../urpmi:140
+#: ../urpmi:137
#, fuzzy, c-format
msgid ""
" --test - only verify if the installation can be achieved "
@@ -1865,104 +1996,110 @@ msgid ""
msgstr ""
" --test - pārbaudīt, vai instalācija var tikt veikta korekti.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr ""
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr ""
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --help - izvadīt šo palīdzības ziņojumu.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - drukāt iezīmui: apraksts."
-#: ../urpmi:147
+#: ../urpmi:144
#, 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:148
+#: ../urpmi:145
+#, 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:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:150
+#: ../urpmi:148
#, 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:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, fuzzy, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -q - klusais režīms.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, fuzzy, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -f - forsēt hdlist failu ģenerēšanu.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, fuzzy, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -f - forsēt hdlist failu ģenerēšanu.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - klusais režīms.\n"
-#: ../urpmi:157
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
-#: ../urpmi:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi:243
+#: ../urpmi:241
#, 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:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Nevarēju izveidot direktoriju [%s] kļūdu ziņojumam"
@@ -1972,53 +2109,55 @@ msgstr "Nevarēju izveidot direktoriju [%s] kļūdu ziņojumam"
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "Atjaunināt"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "Atjaunināt"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "Instalēšanas beigas"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "Instalēšanas beigas"
-#: ../urpmi:447
+#: ../urpmi:454
#, 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:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Kāda ir jūsu izvēle? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2026,7 +2165,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2034,33 +2173,33 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Tad turpināt?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (J/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
"%s"
msgstr "Dažas pakotnes nepieciešams noņemt"
-#: ../urpmi:504
+#: ../urpmi:521
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s"
msgstr "Dažas pakotnes nepieciešams noņemt"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2071,7 +2210,7 @@ msgstr ""
"%s\n"
"vai piekrītat?"
-#: ../urpmi:537
+#: ../urpmi:554
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2082,26 +2221,31 @@ msgstr ""
"%s\n"
"vai piekrītat?"
-#: ../urpmi:544
+#: ../urpmi:561
#, 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:545
+#: ../urpmi:562
#, 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:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2110,12 +2254,12 @@ msgstr ""
"Jums jābūt root, lai instalētu sekojošas atkarības:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2123,100 +2267,17 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../urpmi:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Nospiediet Enter, kad gatavs..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Atcelt"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "Sekojošām pakotnēm ir slikti paraksti"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Sekojošām pakotnēm ir slikti paraksti"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Vēlaties turpināt instalēšanu?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Instalēšana neizdevās"
-
-#: ../urpmi:711
-#, fuzzy, c-format
-msgid "distributing %s"
-msgstr "tiek instalēta %s\n"
-
-#: ../urpmi:726
-#, fuzzy, c-format
-msgid "installing %s from %s"
-msgstr "tiek instalēta %s\n"
-
-#: ../urpmi:728
-#, fuzzy, c-format
-msgid "installing %s"
-msgstr "tiek instalēta %s\n"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Vai mēģināt instalēt bez atkarību pārbaudes? (j/N) "
-
-#: ../urpmi:776
-#, 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) "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "Instalēšana neizdevās"
-msgstr[1] "Instalēšana neizdevās"
-msgstr[2] "Instalēšana neizdevās"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Instalēšana ir iespējama"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "viss jau ir instalēts"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "viss jau ir instalēts"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "viss jau ir instalēts"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "viss jau ir instalēts"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr ""
@@ -2344,49 +2405,49 @@ msgstr " -v - runīgais režīms.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "nevar atjaunot datu nesēju \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, fuzzy, c-format
msgid "Only superuser is allowed to add media"
msgstr "Tikai root drīkst instalēt pakotnes"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "rakstu konfigurācijas failu [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, fuzzy, c-format
msgid "Can't create config file [%s]"
msgstr "rakstu konfigurācijas failu [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "nav nepieciešams uzrādīt <hdlist relatīvo ceļu> ar --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<relative path of hdlist> trūkst\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "nevar izveidot datu nesēju \"%s\"\n"
@@ -2547,17 +2608,17 @@ msgstr " -q - klusais režīms.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -q - klusais režīms.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, fuzzy, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Tikai root drīkst instalēt pakotnes"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "nav ko noņemt (lietojiet urpmi.addmedia, lai pievienotu datu nesēju)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, fuzzy, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2612,18 +2673,18 @@ msgstr " -v - runīgais režīms.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - forsēt hdlist failu ģenerēšanu.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, fuzzy, c-format
msgid "Only superuser is allowed to update media"
msgstr "Tikai root drīkst instalēt pakotnes"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
"nav ko atjaunināt (lietojiet urpmi.addmedia, lai pievienotu datu nesēju)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2632,22 +2693,22 @@ msgstr ""
"atjuninājumā trūkst kāda ieraksta\n"
"(viens no %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "ignoring media %s"
msgstr "noņemu datu nesēju \"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "enabling media %s"
msgstr "noņemu datu nesēju \"%s\""
-#: ../urpmq:43
+#: ../urpmq:40
#, fuzzy, c-format
msgid ""
"urpmq version %s\n"
@@ -2663,143 +2724,143 @@ msgstr ""
"\n"
"Pielietojums:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
"packages.\n"
msgstr " --update - izveidot atjaunināšanas datu nesēju.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr ""
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - izvadīt sarakstu ar pieejamām pakotnēm.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, fuzzy, c-format
msgid " --list-media - list available media.\n"
msgstr " --list - izvadīt sarakstu ar pieejamām pakotnēm.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, fuzzy, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list - izvadīt sarakstu ar pieejamām pakotnēm.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, fuzzy, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr " --list - izvadīt sarakstu ar pieejamām pakotnēm.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, fuzzy, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list - izvadīt sarakstu ar pieejamām pakotnēm.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
-#: ../urpmq:65
+#: ../urpmq:62
#, fuzzy, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr " --list - izvadīt sarakstu ar pieejamām pakotnēm.\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr ""
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --help - izvadīt šo palīdzības ziņojumu.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
" This permit to querying a distro.\n"
msgstr ""
-#: ../urpmq:84
+#: ../urpmq:81
#, fuzzy, c-format
msgid " --changelog - print changelog.\n"
msgstr " --help - izvadīt šo palīdzības ziņojumu.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - drukāt iezīmi: kopsavilkums."
-#: ../urpmq:87
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " -f - forsēt hdlist failu ģenerēšanu.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, fuzzy, c-format
msgid ""
" --whatrequires-recursive\n"
" - extended reverse search (includes virtual packages).\n"
msgstr " -f - forsēt hdlist failu ģenerēšanu.\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -f - forsēt hdlist failu ģenerēšanu.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, fuzzy, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " dota komandrindā; bez pakotnes vārda)."
-#: ../urpmq:94
+#: ../urpmq:91
#, fuzzy, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -q - klusais režīms.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, fuzzy, c-format
msgid " -g - print groups with name also.\n"
msgstr " -q - klusais režīms.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, fuzzy, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -f - forsēt hdlist failu ģenerēšanu.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, fuzzy, c-format
msgid " -l - list files in package.\n"
msgstr " --list - izvadīt sarakstu ar pieejamām pakotnēm.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - klusais režīms.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, fuzzy, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -v - runīgais režīms.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, fuzzy, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -u - noņemt pakotni, ja ir uzinstalēta jaunāka versija.\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2807,53 +2868,61 @@ msgid ""
msgstr ""
" -u - noņemt pakotni, ja ir uzinstalēta jaunāka versija.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
-#: ../urpmq:104
+#: ../urpmq:101
#, fuzzy, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " --list - izvadīt sarakstu ar pieejamām pakotnēm.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
-#: ../urpmq:181
+#: ../urpmq:180
#, fuzzy, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--synthesis nevar tikt lietots ar --media, --update vai --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:425
#, fuzzy, c-format
msgid "No changelog found\n"
msgstr "Cietņi netika atrasti"
#, fuzzy
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr "Sekojošām pakotnēm ir slikti paraksti"
+
+#, fuzzy
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Jums ir jābūt autorizētam, lai koplietotu katalogus"
@@ -3044,9 +3113,5 @@ msgstr "Cietņi netika atrasti"
#~ msgstr "Turpināt"
#, fuzzy
-#~ msgid "unable to write file [%s]"
-#~ msgstr "nevar saglabāt konfigurācijas failu [%s]"
-
-#, fuzzy
#~ msgid "retrieving mirrors at %s ..."
#~ msgstr "atgūstu hdlists failu..."
diff --git a/po/mk.po b/po/mk.po
index d7addbd5..e692efc1 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+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"
@@ -19,7 +19,7 @@ msgstr ""
"X-Generator: KBabel 1.10.1\n"
"Plural-Forms: nplurals=2; plural= n==1 || n%10==1 ? 0 : 1\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "RPM инсталација"
@@ -29,7 +29,7 @@ msgstr "RPM инсталација"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Во ред"
@@ -96,7 +96,7 @@ msgstr "_Инсталирај"
msgid "_Save"
msgstr "_Зачувај"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Откажи"
@@ -118,17 +118,17 @@ msgstr ""
msgid "No packages specified"
msgstr "нема пакет именуван како %s"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Ве молиме почекајте..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "Мора да сте root"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -139,42 +139,42 @@ msgstr ""
"%s\n"
"Да продолжам?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Предупредување"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Во ред"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (за надоградување)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (за инсталирање)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "Избор на пакети"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Потребен е еден од следниве пакети:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Откажи"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -185,14 +185,14 @@ msgstr ""
"%s\n"
"Да продолжам?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
"За да се задоволат зависностите, следниов пакет ќе биде инсталиран (%d MB)"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -200,47 +200,49 @@ msgstr ""
"За да се задоволат зависностите, ќе се инсталираат следниве %d пакети:\n"
"%s\n"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, fuzzy, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "%d пакети"
msgstr[1] "%d пакети"
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Инсталација на пакетот..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "не можам да ги добија изворните пакети, прекинувам"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Се подготвувам..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Инсталирам пакет `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Ве молиме внесете го медиумот именуван како \"%s\" во уредот [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Го преземам пакетот `%s'..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Следниве пакети имаа лоши електронски потписи:\n"
-"%s\n"
-"\n"
-"Дали сакате да продолжите со инсталацијата?"
+msgid "_Done"
+msgstr "_Завршено"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -251,41 +253,27 @@ msgstr ""
"%s\n"
"Можеби сакате да ја ажурирате вашата urpmi база на податоци"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "отстранувам %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Се подготвувам..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Инсталирам пакет `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Завршено"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Инсталацијата не успеа"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Се е веќе инсталирано"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Инсталирањето заврши"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "отстранувам %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -320,7 +308,7 @@ msgstr " -g - испишува групу заедно со ими
msgid " defaults to %s.\n"
msgstr " стандардните се %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Само суперкорисникот има дозвола за инсталирање на пакети"
@@ -330,98 +318,98 @@ msgstr "Само суперкорисникот има дозвола за ин
msgid "Running urpmi in restricted mode..."
msgstr "urpmi се вклучува во затворен режим.."
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "не можам да отворам rpmdb"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "невалидно име на rpm датотеката [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "преземам rpm датотека [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...преземањето заврши"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...преземањето не успеа: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "не можам да пристапам до rpm датотеката [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "не можам да пренесам \"%s\" во датотека [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "не можам да ја регистрирам rpm датотеката"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "грешка при регистрирање на локалните пакети"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Оваа акција не е дозволена додека работи во затворен режим"
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "лоша декларација на прокси во командната линија\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: не можам да ја прочитам rpm датотеката \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "изградена е hdlist synthesis датотека за медиумот \"%s\""
@@ -612,7 +600,12 @@ msgstr "пакетот %s не е пронајден."
msgid "malformed URL: [%s]"
msgstr "неисправен внес: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "преземам rpm датотеки од медиумот \"%s\"..."
@@ -622,7 +615,7 @@ msgstr "преземам rpm датотеки од медиумот \"%s\"..."
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -630,37 +623,42 @@ msgstr ""
"создадена трансакција за инсталирање на %s (отстрани=%d, инсталирај=%d, "
"ажурирај=%d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "не можам да создадам трансакција"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "не можам да екстрактирам rpm од delta-rpm пакетот %s"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "додавам пакет %s (id=%d, eid=%d, ажурирај=%d, датотека=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "не можам да го инсталирам пакетот %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "го отстранувам пакетот %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "го отстранувам пакетот %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "инсталирање на %s од %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Повеќе информации за пакетот %s"
@@ -690,11 +688,103 @@ msgstr "нема пакет именуван како %s"
msgid "Cannot connect to ldap uri:"
msgstr "Не можам да алоцирам записи за мапа на бои"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "базата на податоци на urpmi е заклучена"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Предупредување"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "базата на податоци на urpmi е заклучена"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "Следниве пакети имаат лоши потписи"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Следниве пакети имаат лоши потписи"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Дали сакате да продолжите со инсталацијата ?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Инсталацијата не успеа"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "дистрибуирам %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "инсталирање на %s од %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "инсталирам %s"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Обидете се со инсталација без проверка на зависности? (y/N) "
+
+#: ../urpm/main_loop.pm:205
+#, fuzzy, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "Обидете се инсталација дури уште посилно (--force)? (y/N) "
+
+#: ../urpm/main_loop.pm:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d неуспешни трансакциии на инсталацијата"
+msgstr[1] "%d неуспешни трансакциии на инсталацијата"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Возможна е инсталација"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "Се е веќе инсталирано"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Се е веќе инсталирано"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "Се е веќе инсталирано"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Се е веќе инсталирано"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -746,7 +836,7 @@ msgstr "се обидувам да изберем непостоечки мед
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "изградена е hdlist synthesis датотека за медиумот \"%s\""
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr ""
@@ -844,7 +934,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Почеток на барањето: %s крај: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "изведувам втор пат за пресметување на зависностите\n"
@@ -911,67 +1001,72 @@ msgstr ""
"не можам да пристапам на првиот медиум за инсталација (не е пронајдена "
"датотека на hdlist)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "се обидувам да изберем непостоечки медиум \"%s\""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "избирам повеќе медиуми: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "го отстранувам медиумот \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "реконфигурирање на urpmi за медиумот \"%s\""
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...реконфигурирањето не успеа"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "реконфигурирањето заврши"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "не е избран медиумот \"%s\""
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "ја испитувам датотеката hdlist [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "ја испитувам датотеката synthesis [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "градам hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -980,78 +1075,78 @@ msgstr ""
"Не можам да направам synthesis датотека за медиумот \"%s\". Можеби вашата "
"hdlist е оштетена."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr ""
"проблем при читање на датотеката hdlist или synthesis на медиумот \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "запишувам датотека со листа за медиумот \"%s\""
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...копирањето не успеа"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "се копира датотеката за опис на \"%s\"..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...копирањето заврши"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "копирањето на [%s] не успеа (датотеката е премногу мала)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "пресметувам md5sum на копираниот изворен hdlist (или synthesis)"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "копирањето на [%s] не успеа (md5sum не се совпаѓа)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "пресметувам md5sum на преземаниот изворен hdlist (или synthesis)"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...преземањето не успеа: md5sum не се совпаѓа"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "не се пронајдени rpm датотеки од [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "читам rpm датотеки од [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "не можам да ги прочитам rpm датотеките од [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "нема rpm датотеки за читање"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1062,74 +1157,74 @@ msgstr ""
"ова може да се случи ако рачно сте го монтирале директориумот при создавање "
"на медиумот."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "не е пронајдена hdlist датотека за медиумот \"%s\""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "преземам изворен hdlist (или synthesis) на \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "пронајден е пробан hdlist (или synthesis) како %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "не е пронајдена hdlist датотека за медиумот \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "испитувам датотека со јавен клуч од \"%s\"..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...внесен клуч %s од датотека со јавен клуч од \"%s\""
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "не можам да внесам датотека со јавен клуч од \"%s\""
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "запишувам датотека со листа за медиумот \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "додаден медиум %s"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "не можам да ја пренесам hdlist датотеката на \"%s\""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "проблем при читање на датотеката synthesis на медиумот \"%s\""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "ги читам заглавјата од медиумот \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "Dd"
@@ -1189,47 +1284,52 @@ msgstr "нејасен медиум \"%s\" означен како отстра
msgid "unable to access medium \"%s\""
msgstr "не можам да пристапам на медиумот \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Нема пакет именуван како %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Следниве пакети содржат %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "поради недостаток на %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Се е веќе инсталирано"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "поради незадоволени %s"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "се обидувам да промовирам %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "за да се задржи %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "за да се инсталира %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "поради конфликти со %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "непобарано"
@@ -1249,6 +1349,16 @@ msgstr "Невалиден ID на клучот (%s)"
msgid "Missing signature (%s)"
msgstr "Недостасува потпис (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Не може да се направи конфигурациона датотека [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Копирањето не успеа"
+
#: ../urpme:40
#, fuzzy, c-format
msgid ""
@@ -1265,8 +1375,8 @@ msgstr ""
"\n"
"употреба:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - ја испишува оваа помошна порака.\n"
@@ -1281,19 +1391,19 @@ msgstr " --auto - автоматски изберете пакет со
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - проверете дали отстранувањето ќе заврши успешно.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr ""
" --force - принуди преживување дури и ако некои пакети не постојат.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - дистрибуиран urpmi низ машини со прекари.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr ""
@@ -1305,8 +1415,8 @@ msgstr ""
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - користи друг root за отстранување на rpm.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - користи друг root за инсталирање на rpm.\n"
@@ -1326,18 +1436,18 @@ msgstr ""
"корисно\n"
" за (де)инсталирање на chroot со опцијата --root.\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr ""
" --probe-synthesis - се обидува да пронајде и користи synthesis датотека.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - се обидува да пронајде и користи hdlist датотека.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - опширен режим.\n"
@@ -1348,37 +1458,37 @@ msgid " -a - select all packages matching expression.\n"
msgstr ""
" -a - избери ги сите пакети кои се совпаѓаат со изразот.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Само на суперкорисникот му е дозволено да отстранува пакети"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "непознати пакети"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "непознат пакет"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "отстранувањето на пакетот %s ќе го растури вашиот систем"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Нема за отстранување"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Проверка за отстранување на следниве пакети"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1390,24 +1500,24 @@ msgstr[1] ""
"За да се задоволат зависностите, следниве %d пакети ќе бидат отстранети (%d "
"MB)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "го отстранувам пакетот %s"
msgstr[1] "го отстранувам пакетот %s"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (y/N) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Отстранувањето не успеа"
@@ -1433,13 +1543,13 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --help - ја испишува оваа помошна порака.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - користи одредена околина (типично извештај за бубачка).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1451,13 +1561,13 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - го користи само дадениот медиум, одделено со запирка.\n"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1472,7 +1582,7 @@ msgstr ""
" --synthesis - ја користи дадената синтеза наместо базата на податоци на "
"urpmi.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1484,7 +1594,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - не испишува идентични линии.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - користи само ажуриран медиум.\n"
@@ -1620,84 +1730,96 @@ msgstr " --group - го испишува тагот на групата:
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr " --name - ги испишува само имињата на пакетите.\n"
#: ../urpmf:73
#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr " --name - ги испишува само имињата на пакетите.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr ""
" --obsoletes - го испишува тагот на пакетите кои ќе бидат отстранети или "
"заменети: сите отстранети или заменети.\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr ""
" --packager - го испишува тагот на личноста која го направила пакетот: "
"личност која го направила пакетот.\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, fuzzy, c-format
msgid " --provides - provides tags\n"
msgstr ""
" --provides - го испишува тагот што всушност инсталира пакетот: сите за "
"инсталирање.\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, fuzzy, c-format
msgid " --requires - requires tags\n"
msgstr ""
" --requires - го испишува тагот што всушност му е потребно на пакетот "
"што ќе се инсталира: сите што се потребни.\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --size - го испишува тагот на големината: големина.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, fuzzy, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - го испишува тагот на изворниот rpm: изворен rpm.\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr ""
+" --obsoletes - го испишува тагот на пакетите кои ќе бидат отстранети или "
+"заменети: сите отстранети или заменети.\n"
+
+#: ../urpmf:81
#, fuzzy, c-format
msgid " --summary - summary\n"
msgstr " --summary, -S - испишува резиме.\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr " --url - го испишува тагот на url: url.\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr " --verbose - опширен режим.\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -l - листа на датотеките во пакетот.\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - испишува верзија, објавување и архитектура со име.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "употребувам одредена околина на %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1706,12 +1828,12 @@ msgstr ""
"Забелешка: бидејќи ниеден пребаран медиум не користи hdlist, urpmf не можеше "
"да врати било каков резултат\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Можеби сакате да употребите --name за да барате имиња на пакети.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, fuzzy, c-format
msgid ""
"urpmi version %s\n"
@@ -1728,7 +1850,7 @@ msgstr ""
"\n"
"употреба:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1736,37 +1858,37 @@ msgstr ""
" --searchmedia - го користи само дадениот медиум за пребарување на "
"бараните (или ажурираните) пакети.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr ""
" --auto-select - автоматски ги избира пакетите за ажурирање на системот.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
" --auto-select - автоматски ги избира пакетите за ажурирање на системот.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, fuzzy, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - оневозможи MD5SUM датотечна проверка.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, fuzzy, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - присили ажурирање на gpg клучот.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1775,12 +1897,12 @@ msgstr ""
" --no-uninstall - никогаш не бара да се отстрани пакетот, прекини ја "
"инсталацијата.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - не ги инсталира пакетите (само ги презема)\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1790,7 +1912,7 @@ msgstr ""
"бараните\n"
" пакети кои водат до отстранување.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1801,38 +1923,44 @@ msgstr ""
" ќе се инсталираат или ќе бидат ажурирани,\n"
" стандардно е %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - мала должина на трансакцијата, стандардно е %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, fuzzy, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr ""
" --fuzzy - принудува барање на обележани пакети (исто како -y).\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, fuzzy, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src - наредниот пакет е изворен пакет (исто како -s).\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr " --install-src - инсталирај само изворни пакети (без бинарни).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - отстрани rpm од кешот пред се друго.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - не ги бриши rpm пакетите од кешот.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1842,7 +1970,7 @@ msgstr ""
"без\n"
" проверка на зависности.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1852,12 +1980,12 @@ msgstr ""
"без\n"
" проверка на зависностите и интегритетот.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - користи друг root за инсталирање на rpm.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1867,47 +1995,47 @@ msgstr ""
"корисно\n"
" за инсталирање на chroot со опцијата --root.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - користи wget за преземање на далечни датотеки.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - користи curl за преземање на далечни датотеки.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, fuzzy, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --curl - користи curl за преземање на далечни датотеки.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - ограничи ја брзината на преземање.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1916,7 +2044,7 @@ msgstr ""
" --resume - продолжи со трансферот на делумно-преземени датотеки\n"
" (--no-resume го оневозможува, стандардно е оневозможен).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1927,7 +2055,7 @@ msgstr ""
" претпоставува дека е 1080 (форматот е <проксихост[:порта]"
">).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1936,7 +2064,7 @@ msgstr ""
" --proxy-user - одреди корисник и лозинка за користење на прокси\n"
" автентикација (форматот е <user:password>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1945,7 +2073,7 @@ msgstr ""
" --bug - запиши извештај за бубачка во директориум индициран од\n"
" следниот аргумент.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, fuzzy, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1955,46 +2083,51 @@ msgstr ""
" (--no-verify-rpm го оневозможува, стандардно е "
"овозможен).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, fuzzy, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr " --test - проверете дали инсталацијата ќе заврши успешно.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - исфрли ја патеката одделена со запирка.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - исфрли ги документираните датотеки.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, fuzzy, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --no-uninstall - никогаш не бара да се отстрани пакетот, прекини ја "
"инсталацијата.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --url - го испишува тагот на url: url.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - го испишува тагот на описот: опис.\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - инсталација на пакети што треба да се прескокне\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - инсталација на пакети што треба да се прескокне\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2004,63 +2137,63 @@ msgstr ""
"избори\n"
" отколку стандарниот.\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - не ги бриши rpm пакетите од кешот.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - надградува само пакети со иста архитектура.\n"
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - избери ги сите совпаѓања на командната линија.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - дозволи пребарување за наоѓање на пакет.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - не пребарувај за наоѓање на пакет.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - тивок режим.\n"
-#: ../urpmi:157
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
" имињата или rpm датотеките дадени на командната линија ќе бидат "
"инсталирани.\n"
-#: ../urpmi:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
"Што може да се направи со бинарните rpm датотеки кога се користи --install-"
"src"
-#: ../urpmi:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2069,7 +2202,7 @@ msgstr ""
"Директориумот [%s] веќе постои, ве молиме користете друг директориум за "
"пријавување на бубачка или избришете го"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Не можам да го создадам директориумот [%s] за извештај на бубачка"
@@ -2079,7 +2212,7 @@ msgstr "Не можам да го создадам директориумот [%
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2088,34 +2221,36 @@ msgstr ""
"Грешка: %s изгледа дека е монтиран само за читање.\n"
"Користете --allow-force за да принудете операцијата."
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (за надоградување)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (за надоградување)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (за инсталирање)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (за инсталирање)"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2124,12 +2259,12 @@ msgstr ""
"За да се задоволат зависностите, следниве %d пакети ќе бидат отстранети (%d "
"MB)"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Кој е вашиот избор? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2140,7 +2275,7 @@ msgstr ""
"кои се постари од инсталираните:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2151,19 +2286,19 @@ msgstr ""
"кои се постари од инсталираните:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Продолжуваме?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (D/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2172,7 +2307,7 @@ msgstr ""
"Некои од бараните пакети не можат да се инсталираат:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2181,7 +2316,7 @@ msgstr ""
"Некои од бараните пакети не можат да се инсталираат:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2192,7 +2327,7 @@ msgstr ""
"треба да се отстранат за да други се надоградат:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2203,7 +2338,7 @@ msgstr ""
"треба да се отстранат за да други се надоградат:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2212,7 +2347,7 @@ msgstr ""
"Следниве пакети треба да се отстранат за да други се надоградат:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2221,12 +2356,17 @@ msgstr ""
"Следниве пакети треба да се отстранат за да други се надоградат:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2235,111 +2375,29 @@ msgstr ""
"Треба да се root за да ги инсталирате следниве зависности:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, 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:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Притиснете Ентер кога сте подготвени..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Откажи"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "Следниве пакети имаат лоши потписи"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Следниве пакети имаат лоши потписи"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Дали сакате да продолжите со инсталацијата ?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Инсталацијата не успеа"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "дистрибуирам %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "инсталирање на %s од %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "инсталирам %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Обидете се со инсталација без проверка на зависности? (y/N) "
-
-#: ../urpmi:776
-#, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Обидете се инсталација дури уште посилно (--force)? (y/N) "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d неуспешни трансакциии на инсталацијата"
-msgstr[1] "%d неуспешни трансакциии на инсталацијата"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Возможна е инсталација"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Се е веќе инсталирано"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Се е веќе инсталирано"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "Се е веќе инсталирано"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "Се е веќе инсталирано"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "рестартирам urpmi"
@@ -2472,49 +2530,49 @@ msgstr " -v - опширен режим.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "не можам да го ажурирам медиумот \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Само на суперкорисникот му е дозволено да додава медиуми"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "Ќе се направи конфигурациона датотека [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "Не може да се направи конфигурациона датотека [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "нема потреба да давате <релативна патека на hdlist> со --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "недостасува <релативна патека на hdlist>\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "не можам да го креирам медиумот \"%s\"\n"
@@ -2674,18 +2732,18 @@ msgstr " -a - избери ги сите медиуми.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - совпаѓање на имињата на обележани медиуми.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Само на суперкорисникот му е дозволено да отстранува медиуми"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr ""
"нема за отстранување (користете urpmi.addmedia за додавање на медиум)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2743,17 +2801,17 @@ msgstr " -a - избери ги сите неотстранливи
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - принуди генерирање на hdlist датотеки.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Само на суперкорисникот му е дозволено да ажурира медиуми"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "нема за ажурирање (користете urpmi.addmedia за додавање на медиум)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2762,22 +2820,22 @@ msgstr ""
"недостасува внесот за ажурирање\n"
"(еден од %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "игнорирање на медиумот %s"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "овозможување на медиумот %s"
-#: ../urpmq:43
+#: ../urpmq:40
#, fuzzy, c-format
msgid ""
"urpmq version %s\n"
@@ -2793,7 +2851,7 @@ msgstr ""
"\n"
"употреба:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2802,38 +2860,38 @@ msgstr ""
" --searchmedia - го користи само дадениот медиум за пребарување на "
"бараните (или ажурираните) пакети.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr ""
" --fuzzy - принудува барање на обележани пакети (исто како -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - листа на достапни пакети.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - листа на достапни медиуми.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - листа на достапни медиуми и нивните url.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr " --list-nodes - листа достапни точки кога се користи --parallel.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - листа достапни паралелни прекари.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
@@ -2841,24 +2899,24 @@ msgstr ""
" --dump-config - отфрли ја конфигурационата датотека во форма на urpmi."
"addmedia аргумент.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr " --src - наредниот пакет е изворен пакет (исто како -s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr ""
" --sources - давај ги сите изворни пакети пред преземање (само root).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --url - го испишува тагот на url: url.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2867,23 +2925,23 @@ msgstr ""
" --use-distrib - брзо конфигурирај го urpmi од дистрибуционо дрво.\n"
" Ова дозволува да ставите на чекање дистрибуција.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - испишува измени во евиденцијата.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - испишува резиме.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr ""
" --whatrequires - обратно барање на она што му е потребно на пакетот.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2893,57 +2951,57 @@ msgstr ""
" - продолжено обратно барање (вклучува и виртуелни "
"пакет).\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -p - барај за наоѓање на пакет.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr ""
" -c - комплетна излезна листа со пакетот кој треба да се "
"отстрани.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - продолжено чекање на зависностите на пакетот.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - испишува групу заедно со имињата.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - испишува корисни информации читлива за луѓе.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - листа на датотеките во пакетот.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - тивок режим.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - испишува верзија и објавување заедно со името.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - наредниот пакет е изворен пакет (исто како --src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2951,48 +3009,48 @@ msgid ""
msgstr ""
" -u - отстрани пакет ако веќе е инсталирана понова верзија.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
" -y - принудива барање на обележани пакети (исто како --"
"fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - како -y, но принудува совпаѓање на различноста на "
"буквите.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " потребни се имиња или rpm датотеки дадени на командната линија.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes може да се употребува само со --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"Забелешка: бидејќи ниеден пребаран медиум не користи hdlist, urpmf не можеше "
"да врати било каков резултат\n"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -3000,11 +3058,22 @@ msgstr ""
"Забелешка: бидејќи ниеден пребаран медиум не користи hdlist, urpmf не можеше "
"да врати било каков резултат\n"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Не е пронајдена измена на евиденцијата\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Следниве пакети имаа лоши електронски потписи:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Дали сакате да продолжите со инсталацијата?"
+
#, fuzzy
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Треба да сте авторизиран за да споделувате директориуми"
diff --git a/po/mn.po b/po/mn.po
index 7619551b..4c20b99d 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+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"
@@ -18,7 +18,7 @@ msgstr ""
"X-Generator: KBabel 1.0.1\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, fuzzy, c-format
msgid "RPM installation"
msgstr "Суулгалтын бэлтгэл"
@@ -28,7 +28,7 @@ msgstr "Суулгалтын бэлтгэл"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Ок"
@@ -76,7 +76,7 @@ msgstr "_Суулгах"
msgid "_Save"
msgstr "_Хадгалах"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Хүчингүй"
@@ -98,17 +98,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Тухайлсан тушаал алга"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, fuzzy, c-format
msgid "Please wait..."
msgstr "Хүлээнэ үү."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr ""
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -116,42 +116,42 @@ msgid ""
"Continue installation anyway?"
msgstr "г с вы?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Анхааруулга"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Ок"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr ""
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, fuzzy, c-format
msgid " (to install)"
msgstr "ямх"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Дараах багцуудын нэг нь шаардлагатай:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, fuzzy, c-format
msgid "_Abort"
msgstr "Таслах"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -159,55 +159,61 @@ msgid ""
"Continue installation anyway?"
msgstr "г с вы?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Дараах багцууд суулгагдах гэж байна"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Дараах багцууд суулгагдах гэж байна"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, fuzzy, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "Тааруухан багц"
msgstr[1] "Тааруухан багц"
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Багц суулгалт..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, fuzzy, c-format
msgid "unable to get source packages, aborting"
msgstr "%s багцийг устгаж болсонгүй"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Бэлдэж байна..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "`%s' (%s/%s) багцийг суулгаж байна..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "с с"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "`%s' багцыг татан авч байна..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr "Дараах багцууд суулгагдах гэж байна"
+msgid "_Done"
+msgstr "Биелэгдэв"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -218,41 +224,27 @@ msgstr ""
"%s\n"
"Та магадгүй urpmi баазаа шинэчлэх хэрэгтэй байх"
-#: ../gurpmi2:292 ../urpme:142
-#, fuzzy, c-format
-msgid "removing %s"
-msgstr "%s-г устгаж байна"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Бэлдэж байна..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "`%s' (%s/%s) багцийг суулгаж байна..."
-
-#: ../gurpmi2:334
-#, fuzzy, c-format
-msgid "_Done"
-msgstr "Биелэгдэв"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Суулгалтын асуудал"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Бүх зүйл хэдийн суусан байна"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, fuzzy, c-format
msgid "Installation finished"
msgstr "Суулгалт боломжтой"
+#: ../gurpmi2:312 ../urpme:139
+#, fuzzy, c-format
+msgid "removing %s"
+msgstr "%s-г устгаж байна"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -285,7 +277,7 @@ msgstr " --all - бүх тагуудыг хэвлэх.\n"
msgid " defaults to %s.\n"
msgstr " --list - боломжтой багцуудын жагсаалт.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, fuzzy, c-format
msgid "Only superuser is allowed to install packages"
msgstr "%s багцийг суулгаж болсонгүй"
@@ -295,98 +287,98 @@ msgstr "%s багцийг суулгаж болсонгүй"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "rpmdb-г нээж болсонгүй"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "буруу rpm файлын нэр [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "rpm файлыг хүлээн авч байна [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...хүлээн авалт дууслаа"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...хүлээн авалт бүтэлгүйтлээ: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "[%s] rpm файл руу хандаж болсонгүй"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "[%s] rpm файл руу хандаж болсонгүй"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "rpm файлыг бүртгэж болсонгүй"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, fuzzy, c-format
msgid "error registering local packages"
msgstr "локал"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "тушаалын мөрөнд буруу proxy зарлалт\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: rpm файлыг уншиж чадахгүй \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, fuzzy, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "с"
@@ -575,7 +567,12 @@ msgstr "с бол."
msgid "malformed URL: [%s]"
msgstr "с"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, fuzzy, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "rpm файлыг хүлээн авч байна [%s] ..."
@@ -585,43 +582,48 @@ msgstr "rpm файлыг хүлээн авч байна [%s] ..."
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, fuzzy, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr "с"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, fuzzy, c-format
msgid "unable to create transaction"
msgstr "ssh таних тэмдэг үүсгэх боломжгүй"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "%s багцийг устгаж болсонгүй"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, fuzzy, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "с с"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "%s багцийг суулгаж болсонгүй"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "%s багцийг устгалт"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "%s багцийг устгалт"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "%s-ийг суулгаж байна\n"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, fuzzy, c-format
msgid "More information on package %s"
msgstr "%s багцийг устгалт"
@@ -651,11 +653,103 @@ msgstr "Тухайлсан тушаал алга"
msgid "Cannot connect to ldap uri:"
msgstr ""
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, c-format
+msgid "%s database locked. waiting..."
+msgstr ""
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Анхааруулга"
+
+#: ../urpm/lock.pm:65
#, c-format
msgid "%s database locked"
msgstr ""
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "Дараах багцууд суулгагдах гэж байна"
+
+#: ../urpm/main_loop.pm:100
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
+msgstr "Дараах багцууд суулгагдах гэж байна"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Та суулгалтыг үргэлжлүүлэхийг хүсэж байна уу?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "Суулгалтын асуудал"
+
+#: ../urpm/main_loop.pm:133
+#, fuzzy, c-format
+msgid "distributing %s"
+msgstr "%s-ийг суулгаж байна\n"
+
+#: ../urpm/main_loop.pm:148
+#, fuzzy, c-format
+msgid "installing %s from %s"
+msgstr "%s-ийг суулгаж байна\n"
+
+#: ../urpm/main_loop.pm:150
+#, fuzzy, c-format
+msgid "installing %s"
+msgstr "%s-ийг суулгаж байна\n"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Хамаарлыг шалгахгүйгээр суулгахыг оролдох уу? (y/N) "
+
+#: ../urpm/main_loop.pm:205
+#, fuzzy, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "Reyna т N "
+
+#: ../urpm/main_loop.pm:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "Суулгалт боломжтой"
+msgstr[1] "Суулгалт боломжтой"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Суулгалт боломжтой"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "Бүх зүйл хэдийн суусан байна"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Бүх зүйл хэдийн суусан байна"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "Бүх зүйл хэдийн суусан байна"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Бүх зүйл хэдийн суусан байна"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -703,7 +797,7 @@ msgstr "с"
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "с"
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, fuzzy, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "[%s] rpm файл руу хандаж болсонгүй"
@@ -790,7 +884,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Суулгагдсан бичгийн хэвүүдийг хайх"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, fuzzy, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "секунд"
@@ -855,144 +949,149 @@ msgstr "rpmdb-г нээж болсонгүй"
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "үгүй"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, fuzzy, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "с"
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, fuzzy, c-format
msgid "selecting multiple media: %s"
msgstr "с"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, fuzzy, c-format
msgid "removing medium \"%s\""
msgstr "%s багцийг устгалт"
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "с."
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "Цэсний тохируулга хадгалагдсан"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "Серверийн тохируулга"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "с бол"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, fuzzy, c-format
msgid "examining hdlist file [%s]"
msgstr "hdlist [%s]-ийг байгуулж байна"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, fuzzy, c-format
msgid "examining synthesis file [%s]"
msgstr "MD5SUM файлыг шалгаж байна"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "hdlist [%s]-ийг байгуулж байна"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, fuzzy, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "аас с"
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "жигсаалт с"
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...хуулалт бүтэлгүйтэв"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, fuzzy, c-format
msgid "copying description file of \"%s\"..."
msgstr "Тодорхойлолт аас с."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...хуулждууслаа"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "аас с"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, fuzzy, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "аас"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, fuzzy, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "аас с"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, fuzzy, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "аас"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, fuzzy, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...хүлээн авалт бүтэлгүйтлээ: %s"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "[%s]-ээс ямар нэг rpm олдсонгүй"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, fuzzy, c-format
msgid "reading rpm files from [%s]"
msgstr "[%s]-ээс ямар нэг rpm олдсонгүй"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, fuzzy, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "[%s] rpm файл руу хандаж болсонгүй"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1000,74 +1099,74 @@ msgid ""
"medium."
msgstr ""
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "[%s]-ээс ямар нэг rpm олдсонгүй"
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, fuzzy, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "hdlists файлыг хүлээн авч байна..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, fuzzy, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "аас с."
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, fuzzy, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "[%s]-ээс ямар нэг rpm олдсонгүй"
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, fuzzy, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "\"%s\" хэвлэгчийн устгаж байна..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, fuzzy, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "%s файлыг нээж болохгүй байна\n"
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, fuzzy, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "%s файлыг нээж болохгүй байна\n"
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, fuzzy, c-format
msgid "writing list file for medium \"%s\""
msgstr "жигсаалт с"
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "%s файлыг нээж болохгүй байна\n"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, fuzzy, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "[%s] тохируулгын файлыг бичиж болсонгүй"
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, fuzzy, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "аас с"
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, fuzzy, c-format
msgid "reading headers from medium \"%s\""
msgstr "с"
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "NnүҮ"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "YyтТ"
@@ -1127,47 +1226,52 @@ msgstr "с"
msgid "unable to access medium \"%s\""
msgstr "[%s] rpm файл руу хандаж болсонгүй"
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, fuzzy, c-format
msgid "No package named %s"
msgstr "%s нэртэй багц байхгүй байна"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Дараах багцууд %s: %s-ийг агуулж байна"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr ""
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Бүх зүйл хэдийн суусан байна"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, fuzzy, c-format
msgid "trying to promote %s"
msgstr "Юу ч үгүй"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, fuzzy, c-format
msgid "in order to keep %s"
msgstr "ямх"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "%s багцийг суулгаж болсонгүй"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr ""
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr ""
@@ -1187,6 +1291,16 @@ msgstr ""
msgid "Missing signature (%s)"
msgstr ""
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "[%s] тохируулгын файлыг бичиж болсонгүй"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Хуулалт бүтэлгүйтэв"
+
#: ../urpme:40
#, fuzzy, c-format
msgid ""
@@ -1204,8 +1318,8 @@ msgstr ""
"\n"
"Ашиглалт: \n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - Энэ тусламжийг хэвлэх.\n"
@@ -1220,18 +1334,18 @@ msgstr "Автоматаар сонгогдсон багцуудыг харуу
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr ""
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, fuzzy, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr "аас"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --list - боломжтой багцуудын жагсаалт.\n"
@@ -1241,8 +1355,8 @@ msgstr " --list - боломжтой багцуудын жагсаал
msgid " --root - use another root for rpm removal.\n"
msgstr "Мөр"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr "Мөр"
@@ -1259,17 +1373,17 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr "аас"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr ""
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr "Нарийвчилан харах бол Esc товч дарна уу"
@@ -1279,37 +1393,37 @@ msgstr "Нарийвчилан харах бол Esc товч дарна уу"
msgid " -a - select all packages matching expression.\n"
msgstr " -c - түр санах ойн хавтасын толгойг цэвэрлэх.\n"
-#: ../urpme:76
+#: ../urpme:73
#, fuzzy, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "бол"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "үл мэдэгдэх багцууд"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "үл мэдэгдэх багц"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "%s багцийг устгах нь таны системийн ажиллагааг таслах болно"
-#: ../urpme:121
+#: ../urpme:118
#, fuzzy, c-format
msgid "Nothing to remove"
msgstr "Юу ч үгүй"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Дараах багцуудыг устгахаар шалгаж байна"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1317,24 +1431,24 @@ msgid_plural ""
msgstr[0] "тийш МБ"
msgstr[1] "тийш МБ"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "%s багцийг устгалт"
msgstr[1] "%s багцийг устгалт"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (y/N) "
-#: ../urpme:160
+#: ../urpme:157
#, fuzzy, c-format
msgid "Removal failed"
msgstr "Хуулалт бүтэлгүйтэв"
@@ -1361,12 +1475,12 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --help - Энэ тусламжийг хэвлэх.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1377,12 +1491,12 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1393,7 +1507,7 @@ msgstr ""
msgid " --use-distrib - use the given path to access media\n"
msgstr "аас"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, fuzzy, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr "аас"
@@ -1403,7 +1517,7 @@ msgstr "аас"
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --all - бүх тагуудыг хэвлэх.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr ""
@@ -1537,87 +1651,97 @@ msgstr " --help - Энэ тусламжийг хэвлэх.\n"
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr " --all - бүх тагуудыг хэвлэх.\n"
#: ../urpmf:73
+#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr " --all - бүх тагуудыг хэвлэх.\n"
+
+#: ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr ""
-#: ../urpmf:74
+#: ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr " --list - боломжтой багцуудын жагсаалт.\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr ""
-#: ../urpmf:76
+#: ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr ""
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --all - бүх тагуудыг хэвлэх.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr ""
-#: ../urpmf:79
+#: ../urpmf:80
+#, c-format
+msgid " --suggests - suggests tags\n"
+msgstr ""
+
+#: ../urpmf:81
#, fuzzy, c-format
msgid " --summary - summary\n"
msgstr " --all - бүх тагуудыг хэвлэх.\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr " --all - бүх тагуудыг хэвлэх.\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr "Нарийвчилан харах бол Esc товч дарна уу"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr " --list - боломжтой багцуудын жагсаалт.\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, fuzzy, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr "нэр"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, fuzzy, c-format
msgid "using specific environment on %s\n"
msgstr "с"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
-#: ../urpmi:79
+#: ../urpmi:75
#, fuzzy, c-format
msgid ""
"urpmi version %s\n"
@@ -1634,60 +1758,60 @@ msgstr ""
"\n"
"Ашиглалт: \n"
-#: ../urpmi:88
+#: ../urpmi:84
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr ""
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr "„mdkupdate“ хэрэгслээс багцуудыг шинэчилэхэд алдаа.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr ""
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr ""
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
"installation.\n"
msgstr ""
-#: ../urpmi:97
+#: ../urpmi:93
#, fuzzy, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr "үгүй"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
" packages that lead to removals.\n"
msgstr ""
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1695,103 +1819,109 @@ msgid ""
" default is %d.\n"
msgstr ""
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr ""
-#: ../urpmi:104
+#: ../urpmi:100
#, fuzzy, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr "т"
-#: ../urpmi:105
+#: ../urpmi:101
#, fuzzy, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --list - боломжтой багцуудын жагсаалт.\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, fuzzy, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr "үгүй"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr ""
-#: ../urpmi:108
+#: ../urpmi:104
#, fuzzy, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr "ямх"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
" dependencies checking.\n"
msgstr ""
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
" dependencies checking and integrity.\n"
msgstr ""
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, fuzzy, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr "Мөр"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
" to install a chroot with --root option.\n"
msgstr ""
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr ""
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr ""
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr ""
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr ""
-#: ../urpmi:129
+#: ../urpmi:126
#, fuzzy, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1800,7 +1930,7 @@ msgstr ""
"\n"
" үгүй бол"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, fuzzy, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1809,7 +1939,7 @@ msgstr ""
"бол\n"
" бол<proxyhost[:port]>"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, fuzzy, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1818,14 +1948,14 @@ msgstr ""
"\n"
" бол<user:password>"
-#: ../urpmi:135
+#: ../urpmi:132
#, fuzzy, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
" next arg.\n"
msgstr "гаралт ямх\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, fuzzy, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1834,110 +1964,115 @@ msgstr ""
"\n"
" үгүй бол"
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr ""
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr ""
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr ""
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --all - бүх тагуудыг хэвлэх.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr "Тодорхойлолт Тодорхойлолт Тодорхойлолт"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
-#: ../urpmi:148
+#: ../urpmi:145
+#, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr ""
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:150
+#: ../urpmi:148
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr "ямх"
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, fuzzy, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -c - түр санах ойн хавтасын толгойг цэвэрлэх.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, fuzzy, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr "ямх"
-#: ../urpmi:154
+#: ../urpmi:152
#, fuzzy, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr "ямх"
-#: ../urpmi:155
+#: ../urpmi:153
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --all - бүх тагуудыг хэвлэх.\n"
-#: ../urpmi:157
+#: ../urpmi:155
#, fuzzy, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr "Нээх"
-#: ../urpmi:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "Хийгдсэн"
-#: ../urpmi:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr ""
-#: ../urpmi:244
+#: ../urpmi:242
#, fuzzy, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "с"
@@ -1947,53 +2082,55 @@ msgstr "с"
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, c-format
msgid "%s: %s (to upgrade)"
msgstr ""
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, c-format
msgid "%s (to upgrade)"
msgstr ""
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "ямх"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "ямх"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "тийш МБ"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Таны сонголт юу бэ? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2001,7 +2138,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2009,33 +2146,33 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Ямар ч байсан үргэлжлүүлэх үү?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (Y/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
"%s"
msgstr "Бүх зүйл хэдийн суусан байна"
-#: ../urpmi:504
+#: ../urpmi:521
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s"
msgstr "Бүх зүйл хэдийн суусан байна"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2043,7 +2180,7 @@ msgid ""
"%s\n"
msgstr "г с вы?"
-#: ../urpmi:537
+#: ../urpmi:554
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2051,137 +2188,60 @@ msgid ""
"%s\n"
msgstr "г с вы?"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
msgstr "Дараах багцууд суулгагдах гэж байна"
-#: ../urpmi:545
+#: ../urpmi:562
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
"%s"
msgstr "Дараах багцууд суулгагдах гэж байна"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, fuzzy, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
"%s\n"
msgstr "Та г с"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, 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:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Бэлэн болонгуут Enter товчоо дарна уу..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Хүчингүй"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "Дараах багцууд суулгагдах гэж байна"
-
-#: ../urpmi:672
-#, fuzzy, c-format
-msgid "The following packages have bad signatures"
-msgstr "Дараах багцууд суулгагдах гэж байна"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Та суулгалтыг үргэлжлүүлэхийг хүсэж байна уу?"
-
-#: ../urpmi:692
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Суулгалтын асуудал"
-
-#: ../urpmi:711
-#, fuzzy, c-format
-msgid "distributing %s"
-msgstr "%s-ийг суулгаж байна\n"
-
-#: ../urpmi:726
-#, fuzzy, c-format
-msgid "installing %s from %s"
-msgstr "%s-ийг суулгаж байна\n"
-
-#: ../urpmi:728
-#, fuzzy, c-format
-msgid "installing %s"
-msgstr "%s-ийг суулгаж байна\n"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Хамаарлыг шалгахгүйгээр суулгахыг оролдох уу? (y/N) "
-
-#: ../urpmi:776
-#, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Reyna т N "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "Суулгалт боломжтой"
-msgstr[1] "Суулгалт боломжтой"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Суулгалт боломжтой"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Бүх зүйл хэдийн суусан байна"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Бүх зүйл хэдийн суусан байна"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "Бүх зүйл хэдийн суусан байна"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "Бүх зүйл хэдийн суусан байна"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr ""
@@ -2295,51 +2355,51 @@ msgstr " -v - Ажилуулах горим.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "%s файлыг нээж болохгүй байна\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, fuzzy, c-format
msgid "Only superuser is allowed to add media"
msgstr "бол"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "[%s] тохируулгын файлыг бичиж болсонгүй"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, fuzzy, c-format
msgid "Can't create config file [%s]"
msgstr "[%s] тохируулгын файлыг бичиж болсонгүй"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, fuzzy, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "с<relative path of hdlist>"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, fuzzy, c-format
msgid "<relative path of hdlist> missing\n"
msgstr ""
"с\n"
"<relative path of hdlist>"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, fuzzy, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "%s багцийг устгаж болсонгүй"
@@ -2498,17 +2558,17 @@ msgstr " --all - бүх тагуудыг хэвлэх.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr "Нээх"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, fuzzy, c-format
msgid "Only superuser is allowed to remove media"
msgstr "бол"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, fuzzy, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "юу ч үгүй"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, fuzzy, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2558,39 +2618,39 @@ msgstr " -c - түр санах ойн хавтасын толго
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -c - түр санах ойн хавтасын толгойг цэвэрлэх.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, fuzzy, c-format
msgid "Only superuser is allowed to update media"
msgstr "бол"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, fuzzy, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "юу ч үгүй"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, fuzzy, c-format
msgid ""
"the entry to update is missing\n"
"(one of %s)\n"
msgstr "бол г аас с"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "ignoring media %s"
msgstr "с"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "enabling media %s"
msgstr "с"
-#: ../urpmq:43
+#: ../urpmq:40
#, fuzzy, c-format
msgid ""
"urpmq version %s\n"
@@ -2607,196 +2667,204 @@ msgstr ""
"\n"
"Ашиглалт: \n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
"packages.\n"
msgstr ""
-#: ../urpmq:56
+#: ../urpmq:53
#, fuzzy, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr "т"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - боломжтой багцуудын жагсаалт.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, fuzzy, c-format
msgid " --list-media - list available media.\n"
msgstr " --list - боломжтой багцуудын жагсаалт.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, fuzzy, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list - боломжтой багцуудын жагсаалт.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, fuzzy, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr " --list - боломжтой багцуудын жагсаалт.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, fuzzy, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list - боломжтой багцуудын жагсаалт.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
-#: ../urpmq:65
+#: ../urpmq:62
#, fuzzy, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr " --list - боломжтой багцуудын жагсаалт.\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr ""
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --all - бүх тагуудыг хэвлэх.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
" This permit to querying a distro.\n"
msgstr ""
-#: ../urpmq:84
+#: ../urpmq:81
#, fuzzy, c-format
msgid " --changelog - print changelog.\n"
msgstr " --all - бүх тагуудыг хэвлэх.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --all - бүх тагуудыг хэвлэх.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " -c - түр санах ойн хавтасын толгойг цэвэрлэх.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, fuzzy, c-format
msgid ""
" --whatrequires-recursive\n"
" - extended reverse search (includes virtual packages).\n"
msgstr " -c - түр санах ойн хавтасын толгойг цэвэрлэх.\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr "ямх"
-#: ../urpmq:93
+#: ../urpmq:90
#, fuzzy, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - түр санах ойн хавтасын толгойг цэвэрлэх.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, fuzzy, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -c - түр санах ойн хавтасын толгойг цэвэрлэх.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, fuzzy, c-format
msgid " -g - print groups with name also.\n"
msgstr " --all - бүх тагуудыг хэвлэх.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, fuzzy, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - хэрэгтэй мэдээллийг хүн уншиж болохоор хэлбэрээр хэвлэх.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, fuzzy, c-format
msgid " -l - list files in package.\n"
msgstr " --list - боломжтой багцуудын жагсаалт.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " --all - бүх тагуудыг хэвлэх.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, fuzzy, c-format
msgid " -r - print version and release with name also.\n"
msgstr " --all - бүх тагуудыг хэвлэх.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, fuzzy, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr "с бол"
-#: ../urpmq:102
+#: ../urpmq:99
#, fuzzy, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
msgstr "бол"
-#: ../urpmq:103
+#: ../urpmq:100
#, fuzzy, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr "т"
-#: ../urpmq:104
+#: ../urpmq:101
#, fuzzy, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr "Нээх"
-#: ../urpmq:105
+#: ../urpmq:102
#, fuzzy, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr "Нээх"
-#: ../urpmq:181
+#: ../urpmq:180
#, fuzzy, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "жигсаалт"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:425
#, fuzzy, c-format
msgid "No changelog found\n"
msgstr "Зураг олдсонгүй"
#, fuzzy
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr "Дараах багцууд суулгагдах гэж байна"
+
+#, fuzzy
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Та хавтаснуудыг бусдад түгээхийн тулд шалгагдсан байх хэрэгтэй"
@@ -3021,10 +3089,6 @@ msgstr "Зураг олдсонгүй"
#~ msgstr "Үргэлжилүүлэх"
#, fuzzy
-#~ msgid "unable to write file [%s]"
-#~ msgstr "[%s] тохируулгын файлыг бичиж болсонгүй"
-
-#, fuzzy
#~ msgid ""
#~ " --distrib-XXX - automatically create a medium for XXX part of a\n"
#~ " distribution, XXX may be main, contrib, updates or\n"
diff --git a/po/ms.po b/po/ms.po
index 8dfa09fd..44b49852 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2005-11-26 15:30+0800\n"
"Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
"Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -18,7 +18,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "Pemasangan RPM"
@@ -28,7 +28,7 @@ msgstr "Pemasangan RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -81,7 +81,7 @@ msgstr "_Pasang"
msgid "_Save"
msgstr "_Simpan"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Batal"
@@ -101,17 +101,17 @@ msgstr "Pilihan tidak diketahui %s"
msgid "No packages specified"
msgstr "Tiada pakej dinyatakan"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Sila tunggu..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "Mesti menjadi root"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -119,42 +119,42 @@ msgid ""
"Continue installation anyway?"
msgstr "semua telah diinstal"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Amaran"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (untuk naiktaraf)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (untuk memasang)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "Pilihan pakej"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Salah satu pakej berikut diperlukan:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Batal"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -165,13 +165,13 @@ msgstr ""
"%s\n"
"Teruskan?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, 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:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -179,47 +179,49 @@ msgstr ""
"Untuk memenuhi kebergantungan, %d pakej berikut perlu dipasang:\n"
"%s\n"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Pemasangan pakej..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "tidak dapat mengambil pakej asal, batal"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Menyediakan..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Install pakej `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Masukkan media \"%s\" ke peranti [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Memuatturun pakej `%s'..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Pakej berikut mengandungi tandatangan tidak sah:\n"
-"%s\n"
-"\n"
-"Adakah anda hendak meneruskan pemasangan ?"
+msgid "_Done"
+msgstr "_Selesai"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -227,41 +229,27 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "membuang %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Menyediakan..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Install pakej `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Selesai"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Instalasi gagal"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "semua telah diinstal"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Pemasangan selesai"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "membuang %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -295,7 +283,7 @@ msgstr " -f - cetak versi, keluaran dan arch dgn nama.\n"
msgid " defaults to %s.\n"
msgstr " default adalah %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Hanya superuser yang boleh menginstal pakej"
@@ -305,98 +293,98 @@ msgstr "Hanya superuser yang boleh menginstal pakej"
msgid "Running urpmi in restricted mode..."
msgstr "Melaksanakan urpmi dalam mod terhad..."
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "tidak dapat membuka rpmdb"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nama fail rpm [%s] tidak sah"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "mengambil fail rpm [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...capaian selesai"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...gagal terambil: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "gagal akses fail rpm [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "tidak dapat menghurai \"%s\" dalam fail [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "tidak dapat mendaftarkan fail rpm"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "ralat pendaftaran pakej setempat"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr ""
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: tidak dapat membaca fail rpm \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "bangunkan fail sintesis hdlist utk media \"%s\""
@@ -583,7 +571,12 @@ msgstr "pakej %s tidak dijumpai."
msgid "malformed URL: [%s]"
msgstr "input cacat: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "mendapatkan fail rpm dari media \"%s\"..."
@@ -593,43 +586,48 @@ msgstr "mendapatkan fail rpm dari media \"%s\"..."
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "tidak dapat mencipta transaksi"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, 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:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr ""
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "tidak dapat memasang pakej %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "membuang pakej %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "membuang pakej %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "Tapisan From:"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Lebih maklumat pada pakej %s"
@@ -659,11 +657,109 @@ msgstr "Tiada pakej dinyatakan"
msgid "Cannot connect to ldap uri:"
msgstr ""
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "database urpmi terkunci"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Amaran"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "database urpmi terkunci"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr ""
+"mengambil\n"
+" pakej berikut berjaya:\n"
+"\n"
+
+#: ../urpm/main_loop.pm:100
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
+msgstr ""
+"mengambil\n"
+" pakej berikut berjaya:\n"
+"\n"
+
+#: ../urpm/main_loop.pm:101
+#, fuzzy, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Apa yang anda ingin lakukan sekarang?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Instalasi gagal"
+
+#: ../urpm/main_loop.pm:133
+#, fuzzy, c-format
+msgid "distributing %s"
+msgstr "Mulakan %s:"
+
+#: ../urpm/main_loop.pm:148
+#, fuzzy, c-format
+msgid "installing %s from %s"
+msgstr "Tapisan From:"
+
+#: ../urpm/main_loop.pm:150
+#, fuzzy, c-format
+msgid "installing %s"
+msgstr "Memasang %s-%s-%s... "
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Cuba instalasi tanpa periksa kebergantungan? (y/T) "
+
+#: ../urpm/main_loop.pm:205
+#, fuzzy, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "Cuba instalasi lebih keras (--force)? (y/T) "
+
+#: ../urpm/main_loop.pm:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "Gagal menerima %s: %s"
+msgstr[1] "Gagal menerima %s: %s"
+
+#: ../urpm/main_loop.pm:258
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "Pemasangan sekecil mungkin"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "semua telah diinstal"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "semua telah diinstal"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "semua telah diinstal"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "semua telah diinstal"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -713,7 +809,7 @@ msgstr "cubaan untuk memilih media tidak wujud \"%s\""
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "bangunkan fail sintesis hdlist utk media \"%s\""
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "gagal mengakses fail hdlist \"%s\", media diabaikan"
@@ -802,7 +898,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Carian mula: %s tamat: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr ""
@@ -867,144 +963,149 @@ msgstr "tidak dapat membuka rpmdb"
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:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "cubaan untuk memilih media tidak wujud \"%s\""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "memilih pelbagai media: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "hapus media \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "mengulangtetap urpmi untuk media \"%s\""
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...gagal mengulangtetap"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "selesai ulangtetap"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "media \"%s\" tidak dipilih"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "periksa baca fail hdlist [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "periksa file sintesis [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "bangun hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, fuzzy, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "bangunkan fail sintesis hdlist utk media \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "menulis senarai fail untuk media \"%s\""
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...gagal menyalin"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "fail deskripsi \"%s\" sedang disalin"
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...salin selesai"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "salinan [%s] gagal (md5sum tidak sepadan)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "mengira md5sum salinan sumber hdlist (atau sintesis)"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "salinan [%s] gagal (md5sum tidak sepadan)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, fuzzy, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "mengira md5sum salinan sumber hdlist (atau sintesis)"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...gagal terambil: md5sum tidak sepadan"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "tiada fail rpm dijumpai dari [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "membaca fail rpm dari [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "tidak dapat membaca fail rpm dari [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "tiada rpms dibaca"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1012,74 +1113,74 @@ msgid ""
"medium."
msgstr ""
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "fail hdlist utk media \"%s\" tak dijumpai"
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "mencapai hdlist sumber (atau sintesis) \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "menjumpai hdlist dikesan (atau sintesis) seperti %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "fail hdlist utk media \"%s\" tak dijumpai"
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "memeriksa fail pubkey \"%s\"..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, fuzzy, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "tidak dapat mengimport fail pubkey \"%s\""
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "tidak dapat mengimport fail pubkey \"%s\""
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "menulis senarai fail untuk media \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "media %s ditambahkan"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "gagal mengolah fail hdlist \"%s\""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "masalah membaca fail sintesis untuk media \"%s\""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "membaca pengepala dari media \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "NnTt"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "Yy"
@@ -1139,47 +1240,52 @@ msgstr "media ketidaksinambungan \"%s\" bertanda removable, seharusnya tidak"
msgid "unable to access medium \"%s\""
msgstr "gagal akses media \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Tiada pakej bernama %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Pakej berikut mengandungi %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "kerana kehilangan %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "semua telah diinstal"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "kerana ketidakpuasan %s"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "cuba untuk menaikkan %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "untuk menyimpan %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "untuk memasang %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "kerana konflik dengan %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr ""
@@ -1199,6 +1305,16 @@ msgstr "Kekunci ID tidak sah (%s)"
msgid "Missing signature (%s)"
msgstr "Tandatangan tiada (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Kehilangan fail konfig $PARENTCONFIG."
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "...gagal menyalin"
+
#: ../urpme:40
#, fuzzy, c-format
msgid ""
@@ -1215,8 +1331,8 @@ msgstr ""
"\n"
"penggunaan:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1231,18 +1347,18 @@ msgstr " -a - pilih semua yg sama dgn baris perintah.\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr " --force - paksa instal meskipun beberapa pakej tiada.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr "Tidak dapat menulis tag!"
@@ -1252,8 +1368,8 @@ msgstr "Tidak dapat menulis tag!"
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - guna root lain untuk membuang rpm.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - guna root lain untuk membuang rpm.\n"
@@ -1270,17 +1386,17 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr ""
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr ""
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - mod verbos.\n"
@@ -1290,37 +1406,37 @@ msgstr " --verbose - mod verbos.\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - pilih semua yg sama dgn baris perintah.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Hanya superuser dibenarkan untuk membuang pakej"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "pakej tidak diketahui"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "pakej tidak diketahui"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr ""
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Tiada untuk dibuang"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Memeriksa untuk membuang pakej berikut"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1332,24 +1448,24 @@ msgstr[1] ""
"Untuk memenuhi kebergantungan, %d pakej berikut perlu dipasang:\n"
"%s\n"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "membuang pakej %s"
msgstr[1] "membuang pakej %s"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (y/T) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Pembuangan gagal"
@@ -1375,12 +1491,12 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - cetak nombor versi alatan ini.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1391,12 +1507,12 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, fuzzy, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --update - guna hanya kemaskini media.\n"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1407,7 +1523,7 @@ msgstr ""
msgid " --use-distrib - use the given path to access media\n"
msgstr " --update - guna hanya kemaskini media.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1417,7 +1533,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - jangan cetak baris yang sama.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - guna hanya kemaskini media.\n"
@@ -1549,87 +1665,97 @@ msgstr "Kumpulan:"
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr "Nama Pakej"
#: ../urpmf:73
#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr "Nama Pakej"
+
+#: ../urpmf:74
+#, fuzzy, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr "Senarai tag:\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr "Tidak dapat menulis tag!"
-#: ../urpmf:75
+#: ../urpmf:76
#, fuzzy, c-format
msgid " --provides - provides tags\n"
msgstr "Senarai tag:\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, fuzzy, c-format
msgid " --requires - requires tags\n"
msgstr "Senarai tag:\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr "Versi Dipasang"
-#: ../urpmf:78
+#: ../urpmf:79
#, fuzzy, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr "nama fail rpm [%s] tidak sah"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr "Senarai tag:\n"
+
+#: ../urpmf:81
#, fuzzy, c-format
msgid " --summary - summary\n"
msgstr "Ringkasan"
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr "URL"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr "Vendor:"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr "Cache Fail Pakej Jauh"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - cetak versi, keluaran dan arch dgn nama.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, fuzzy, c-format
msgid "using specific environment on %s\n"
msgstr "Buat partisyen pada pemacu spesifik (ondisk)"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
-#: ../urpmi:79
+#: ../urpmi:75
#, fuzzy, c-format
msgid ""
"urpmi version %s\n"
@@ -1645,60 +1771,60 @@ msgstr ""
"\n"
"penggunaan:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
msgstr " --update - guna hanya kemaskini media.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr ""
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr " --update - guna hanya kemaskini media.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr ""
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr ""
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
"installation.\n"
msgstr ""
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr ""
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
" packages that lead to removals.\n"
msgstr ""
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1706,241 +1832,252 @@ msgid ""
" default is %d.\n"
msgstr ""
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr ""
-#: ../urpmi:104
+#: ../urpmi:100
#, fuzzy, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy - lakukan pencarian fuzzy (sama dengan -y).\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, fuzzy, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src - pakej berikut adalah pakej sumber (sama dgn -s).\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
-#: ../urpmi:107
+#: ../urpmi:103
#, fuzzy, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --noclean - jaga rpm tidak dipakai dalam kache.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, fuzzy, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - jaga rpm tidak dipakai dalam kache.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
" dependencies checking.\n"
msgstr ""
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
" dependencies checking and integrity.\n"
msgstr ""
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, fuzzy, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - guna root lain untuk membuang rpm.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
" to install a chroot with --root option.\n"
msgstr ""
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - guna wget utk mengambil fail jauh.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - guna curl utk mengambil fail jauh.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, fuzzy, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --curl - guna curl utk mengambil fail jauh.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr ""
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
" (--no-resume disables it, default is disabled).\n"
msgstr ""
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../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 ""
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
" authentication (format is <user:password>).\n"
msgstr ""
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
" next arg.\n"
msgstr ""
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
" (--no-verify-rpm disables it, default is enabled).\n"
msgstr ""
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr ""
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr ""
-#: ../urpmi:142
+#: ../urpmi:139
#, fuzzy, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr "-x PAT --exclude=PAT Asing fail yang sepadan PAT."
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr "Rekabentuk Sasaran:"
-#: ../urpmi:145
+#: ../urpmi:142
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr "Pakej Hilang"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
-#: ../urpmi:148
+#: ../urpmi:145
+#, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr ""
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:150
+#: ../urpmi:148
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - jaga rpm tidak dipakai dalam kache.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - pilih semua yg sama dgn baris perintah.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - izinkan carian dlm sediaada utk mencari pakej.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - jangan cari dalam tersedia utk mencari pakej.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - mod diam.\n"
-#: ../urpmi:157
+#: ../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:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr ""
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr ""
@@ -1950,41 +2087,43 @@ msgstr ""
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (untuk naiktaraf)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (untuk naiktaraf)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (untuk memasang)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (untuk memasang)"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -1993,12 +2132,12 @@ msgstr ""
"Untuk memenuhi kebergantungan, %d pakej berikut perlu dipasang:\n"
"%s\n"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Pilihan Anda? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2006,7 +2145,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2014,33 +2153,33 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "%s %s pemasangan pada hos %s"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (Y/t) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
"%s"
msgstr "semua telah diinstal"
-#: ../urpmi:504
+#: ../urpmi:521
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s"
msgstr "semua telah diinstal"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2051,7 +2190,7 @@ msgstr ""
"%s\n"
"Teruskan?"
-#: ../urpmi:537
+#: ../urpmi:554
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2062,7 +2201,7 @@ msgstr ""
"%s\n"
"Teruskan?"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2072,7 +2211,7 @@ msgstr ""
"%s\n"
"Teruskan?"
-#: ../urpmi:545
+#: ../urpmi:562
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2082,12 +2221,17 @@ msgstr ""
"%s\n"
"Teruskan?"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2096,119 +2240,31 @@ msgstr ""
"Anda perlu menjadi root utk install kebergantungan berikutnya:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, 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:623
+#: ../urpmi:632
#, fuzzy, c-format
msgid "Press Enter when ready..."
msgstr ""
"Tekan <Enter> untuk mengulangbut sistem anda.\n"
"\n"
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Batal"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr ""
-"mengambil\n"
-" pakej berikut berjaya:\n"
-"\n"
-
-#: ../urpmi:672
-#, fuzzy, c-format
-msgid "The following packages have bad signatures"
-msgstr ""
-"mengambil\n"
-" pakej berikut berjaya:\n"
-"\n"
-
-#: ../urpmi:673
-#, fuzzy, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Apa yang anda ingin lakukan sekarang?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Instalasi gagal"
-
-#: ../urpmi:711
-#, fuzzy, c-format
-msgid "distributing %s"
-msgstr "Mulakan %s:"
-
-#: ../urpmi:726
-#, fuzzy, c-format
-msgid "installing %s from %s"
-msgstr "Tapisan From:"
-
-#: ../urpmi:728
-#, fuzzy, c-format
-msgid "installing %s"
-msgstr "Memasang %s-%s-%s... "
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Cuba instalasi tanpa periksa kebergantungan? (y/T) "
-
-#: ../urpmi:776
-#, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Cuba instalasi lebih keras (--force)? (y/T) "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "Gagal menerima %s: %s"
-msgstr[1] "Gagal menerima %s: %s"
-
-#: ../urpmi:825
-#, fuzzy, c-format
-msgid "Installation is possible"
-msgstr "Pemasangan sekecil mungkin"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "semua telah diinstal"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "semua telah diinstal"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "semua telah diinstal"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "semua telah diinstal"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, fuzzy, c-format
msgid "restarting urpmi"
msgstr "Mengulanghidup $prog:"
@@ -2329,49 +2385,49 @@ msgstr " -v - mod verbos.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "gagal kemaskini media \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, fuzzy, c-format
msgid "Only superuser is allowed to add media"
msgstr "Hanya superuser yang boleh menginstal pakej"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "Fail tetapan PXE: %s"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, fuzzy, c-format
msgid "Can't create config file [%s]"
msgstr "Kehilangan fail konfig $PARENTCONFIG."
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "tak perlu memberikan <path relatif hdlist> dgn --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<path relatif hdlist> hilang\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "gagal membuat media \"%s\"\n"
@@ -2531,17 +2587,17 @@ msgstr " -a - pilih semua media.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -a - pilih semua yg sama dgn baris perintah.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, fuzzy, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Hanya superuser dibenarkan untuk membuang pakej"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "tiada penghapusan (guna urpmi.addmedia utk tambah media)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2595,18 +2651,18 @@ msgstr " -a - pilih semua media non-removable.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - paksa buat fail hdlist.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, fuzzy, c-format
msgid "Only superuser is allowed to update media"
msgstr "Hanya superuser yang boleh menginstal pakej"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
"tiada apa-apa yang perlu dikemaskini (guna urpmi.addmedia utk tambah media)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2615,22 +2671,22 @@ msgstr ""
"masukan kemaskini hilang\n"
"(satu dari %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "ignoring media %s"
msgstr "Pemeriksaan Media"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "enabling media %s"
msgstr "Pemeriksaan Media"
-#: ../urpmq:43
+#: ../urpmq:40
#, fuzzy, c-format
msgid ""
"urpmq version %s\n"
@@ -2646,144 +2702,144 @@ msgstr ""
"\n"
"penggunaan:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
"packages.\n"
msgstr " --update - guna hanya kemaskini media.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - lakukan pencarian fuzzy (sama dengan -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, fuzzy, c-format
msgid " --list - list available packages.\n"
msgstr "Up2date - Pakej Yang Ada"
-#: ../urpmq:60
+#: ../urpmq:57
#, fuzzy, c-format
msgid " --list-media - list available media.\n"
msgstr "Ralat mendapatkan senarai pakej yang ada"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr ""
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
-#: ../urpmq:63
+#: ../urpmq:60
#, fuzzy, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr "Ralat mendapatkan senarai pakej yang ada"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr " --src - pakej berikut adalah pakej sumber (sama dgn -s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr ""
" --sources - beri semua pakej sumber sebelum muatturun (hanya root).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr "Rekabentuk Sasaran:"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
" This permit to querying a distro.\n"
msgstr ""
-#: ../urpmq:84
+#: ../urpmq:81
#, fuzzy, c-format
msgid " --changelog - print changelog.\n"
msgstr "Pengurus Pencetak"
-#: ../urpmq:85
+#: ../urpmq:82
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr "Pengurus Pencetak"
-#: ../urpmq:87
+#: ../urpmq:84
#, fuzzy, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " -p - izinkan carian dlm sediaada utk mencari pakej.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, fuzzy, c-format
msgid ""
" --whatrequires-recursive\n"
" - extended reverse search (includes virtual packages).\n"
msgstr " -p - izinkan carian dlm sediaada utk mencari pakej.\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -p - izinkan carian dlm sediaada utk mencari pakej.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, fuzzy, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -d - tambah pencarian ke kebergantungan pakej.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - tambah pencarian ke kebergantungan pakej.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, fuzzy, c-format
msgid " -g - print groups with name also.\n"
msgstr " -f - cetak versi, keluaran dan arch dgn nama.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, fuzzy, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -f - paksa buat fail hdlist.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, fuzzy, c-format
msgid " -l - list files in package.\n"
msgstr "Up2date - Senarai Pakej (pendaftaran)"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - mod diam.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, fuzzy, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -f - cetak versi, keluaran dan arch dgn nama.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - pakej berikut adalah pakej sumber (sama dgn --src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, fuzzy, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2791,52 +2847,63 @@ msgid ""
msgstr ""
" -s - pakej berikut adalah pakej sumber (sama dgn --src).\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - lakukan pencarian fuzzy (sama dengan --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, fuzzy, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -a - pilih semua yg sama dgn baris perintah.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " dicarikan nama atau fail rpm yg tertera pada baris perintah.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr ""
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Tiada log perubahan dijumpai\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Pakej berikut mengandungi tandatangan tidak sah:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Adakah anda hendak meneruskan pemasangan ?"
+
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Anda harus jadi root utk menggunakan --use-distrib"
diff --git a/po/mt.po b/po/mt.po
index 061f3c85..e2d5bd6e 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+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"
@@ -21,7 +21,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.3\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, fuzzy, c-format
msgid "RPM installation"
msgstr "Installazzjoni tas-sistema"
@@ -31,7 +31,7 @@ msgstr "Installazzjoni tas-sistema"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -97,7 +97,7 @@ msgstr "Installa"
msgid "_Save"
msgstr "Ikteb"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "I_kkanċella"
@@ -119,17 +119,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Ebda kmand speċifikat"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, fuzzy, c-format
msgid "Please wait..."
msgstr "Stenna ftit."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, fuzzy, c-format
msgid "Must be root"
msgstr "Port tal-maws"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -139,42 +139,42 @@ msgstr ""
"Xi pakketti mitluba ma jistgħux jiġu nstallati:\n"
"%s"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Twissija"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "Aġġornament"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, fuzzy, c-format
msgid " (to install)"
msgstr "Oħroġ mill-installazzjoni"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Wieħed minn dawn il-pakketti huwa meħtieġ:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, fuzzy, c-format
msgid "_Abort"
msgstr "Waqqaf"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -184,7 +184,7 @@ msgstr ""
"Dawn il-pakketti jridu jitneħħew qabel oħrajn jiġu aġġornati:\n"
"%s"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
@@ -192,55 +192,56 @@ msgstr ""
"Biex nissodisfa d-dipendenzi, dawn il-pakketti jridu jiġu nstallati wkoll (%"
"d MB)"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, 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:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Installazzjoni ta' pakketti..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "ma nistax inġib il-pakketti tas-sors, se noħroġ"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Qed nipprepara..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Qed jiġi nstallat \"%s\" (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Jekk jogħġbok daħħal id-diska mmarkata \"%s\" fl-apparat [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Qed jitniżżel il-pakkett \"%s\"..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Dawn il-pakketti għandhom firma ħażina:\n"
-"\n"
-"%s\n"
-"\n"
-"Trid tkompli bl-installazzjoni?"
+msgid "_Done"
+msgstr "Lest"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -252,41 +253,27 @@ msgstr ""
"%s\n"
"Forsi trid taġġorna d-database urpmi"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "qed jitneħħa %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Qed nipprepara..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Qed jiġi nstallat \"%s\" (%s/%s)..."
-
-#: ../gurpmi2:334
-#, fuzzy, c-format
-msgid "_Done"
-msgstr "Lest"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "installazzjoni falliet"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "kollox diġà installat"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Installazzjoni lesta"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "qed jitneħħa %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -321,7 +308,7 @@ msgstr " -g - uri l-gruppi flimkien ma' l-isem.\n"
msgid " defaults to %s.\n"
msgstr " l-istandard huwa %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Is-\"superuser\" biss għandu l-awtorità jistalla pakketti"
@@ -331,98 +318,98 @@ msgstr "Is-\"superuser\" biss għandu l-awtorità jistalla pakketti"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "ma nistax niftaħ rpmdb"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "isem tal-fajl rpm [%s] invalidu"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "qed jinġab il-fajl rpm [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...qari lest"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...qari falla: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "ma nistax naċċessa l-fajl rpm [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "ma nistax nifli \"%s\" fil-fajl [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "ma nistax nirreġistra l-fajl rpm"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "problema fir-reġistrazzjoni ta' pakketti lokali"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "dikjarazzjoni ta' \"proxy\" ħażina fil-linja ta' kmand\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: ma nistax naqra l-fajl rpm \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "ibni l-fajl ta' sintesi tal-hdlist għas-sors \"%s\""
@@ -611,7 +598,12 @@ msgstr "pakkett %s ma nstabx."
msgid "malformed URL: [%s]"
msgstr "input iffurmat ħażin [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "qed jinġabu l-fajls rpm mis-sors \"%s\"..."
@@ -621,43 +613,48 @@ msgstr "qed jinġabu l-fajls rpm mis-sors \"%s\"..."
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, 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:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "ma nistax noħloq tranżazzjoni"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "ma nistax inneħħi l-pakkett %s"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "qed jiġi miżlud pakkett \"%s\" (id=%d eid=%d, aġġorna=%d, fajl=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "ma nistax ninstalla l-pakkett %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "ed jitneħħa l-pakkett %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "ed jitneħħa l-pakkett %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "qed jiġi nstallat %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Iżjed informazzjoni dwar pakkett %s"
@@ -687,11 +684,103 @@ msgstr "Ebda kmand speċifikat"
msgid "Cannot connect to ldap uri:"
msgstr ""
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "database urpmi imsakkar"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Twissija"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "database urpmi imsakkar"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "Dawn il-pakketti fihom firem ħżiena"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Dawn il-pakketti fihom firem ħżiena"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Trid tkompli l-installazzjoni ?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "installazzjoni falliet"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "qed jiġi distribwit %s"
+
+#: ../urpm/main_loop.pm:148
+#, fuzzy, c-format
+msgid "installing %s from %s"
+msgstr "qed jiġi nstallat %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "qed jiġi nstallat %s"
+
+#: ../urpm/main_loop.pm:187
+#, 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:205
+#, 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:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d tranżazzjonijiet ta' installazzjoni fallew"
+msgstr[1] "%d tranżazzjonijiet ta' installazzjoni fallew"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Installazzjoni possibbli"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "kollox diġà installat"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "kollox diġà installat"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "kollox diġà installat"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "kollox diġà installat"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -742,7 +831,7 @@ msgstr "qed nipprova naċċessa sors ineżistenti \"%s\""
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "ibni l-fajl ta' sintesi tal-hdlist għas-sors \"%s\""
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "ma nistax naċċessa l-fajl hdlist ta' \"%s\", sors injorat"
@@ -833,7 +922,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Fittex fonts installati"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "Qed ngħaddi t-tieni passata biex niddetermina dipendenzi\n"
@@ -900,144 +989,149 @@ msgstr ""
"ma nistax naċċessa l-ewwel sors ta' installazzjoni (ma nstabx il-fajl "
"hdlists)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "qed nipprova naċċessa sors ineżistenti \"%s\""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "qed nagħżel sors multiplu: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "qed jitneħħa s-sors \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "qed jiġi rikonfigurat urpmi għas-sors \"%s\"..."
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...rikonfigurazzjoni falliet"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "rikonfigurazzjoni lesta"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "sors \"%s\" mhuwiex magħżul"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "qed jiġi eżaminat il-fajl hdlist [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "qed jiġi eżaminat il-fajl ta' sinteżi [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "qed jinbena hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problema fil-qari tal-hdlist jew sinteżi għas-sors \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "qed jinkiteb il-fajl b'lista għas-sors \"%s\""
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...ikkupjar falla"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "qed nikkopja l-fajl ta' deskrizzjoni ta' \"%s\""
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...ikkupjar lest"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, 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:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "qed nikkalkula md5sum tal-hdlist jew sinteżi kkupjat"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "l-ikkuppjar tal-fajl [%s] falla (md5sum ma qablitx)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "qed tiġi kalkulata l-md5sum għall-hdlist jew sinteżi tas-sors imniżżel"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...qari falla: md5sum ma qablitx"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "ebda fajls rpm ma nstabu minn [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "qed jinqraw fajls rpm minn [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "ma setgħux jinqraw l-fajls rpm minn [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1048,74 +1142,74 @@ msgstr ""
"dan jista' jiġri jekk timmonta d-direttorju manwalment waqt li qed jinħoloq "
"is-sors."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ma nstabx fajl hdlists għas-sors \"%s\""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "qed jinġab l-hdlist jew sinteżi sors għal \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "sibt l-hdlist (jew sinteżi) bħala %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "ma nstabx fajl hdlists għas-sors \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "qed jiġi eżaminat fajl pubkey ta' \"%s\"..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...ċifrarju %s importat mill-fajl pubkey ta' \"%s\""
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "ma stajtx nimporta fajl pubkey ta' \"%s\""
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "qed jinkiteb il-fajl b'lista għas-sors \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "ġie miżjud is-sors %s"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "ma nistax nifli l-fajl hdlist ta' \"%s\""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problema fil-qari tas-sinteżi għas-sors \"%s\""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "qed naqra l-\"headers\" mis-sors \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "LlNn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "IiYy"
@@ -1175,47 +1269,52 @@ msgstr "sors \"%s\" immarkat li jista' jitneħħa, imma m'hux"
msgid "unable to access medium \"%s\""
msgstr "ma nistax naċċessa s-sors \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Ebda pakkett imsejjaħ %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Dawn il-pakketti fihom %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "minħabba %s nieqes"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "kollox diġà installat"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "minħabba %s mhux sodisfatt"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "qed nipprova nippromwovi %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "sabiex inżomm %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "sabiex ninstalla %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "minħabba konflitt ma' %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "mhux mitlub"
@@ -1235,6 +1334,16 @@ msgstr "ID taċ-ċifrarju invalidu (%s)"
msgid "Missing signature (%s)"
msgstr "Firma nieqsa (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "ma setax jinkiteb il-fajl [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Ikkupjar falla"
+
#: ../urpme:40
#, fuzzy, c-format
msgid ""
@@ -1252,8 +1361,8 @@ msgstr ""
"\n"
"użu:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1268,19 +1377,19 @@ msgstr " --auto - agħżel pakkett awtomatikament fl-għażla.\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - ivverifika li l-installazzjoni tista' ssir sew.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr ""
" --force - imponi l-invokazzjoni anke jekk xi pakketti ma jeżistux.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - iddistribwixxi urpmi fuq il-magni ta' alias.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - uri t-tag \"packager\": pakkeġġjatur.\n"
@@ -1290,8 +1399,8 @@ msgstr " --packager - uri t-tag \"packager\": pakkeġġjatur.\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - uża root ieħor għall-installazzjoni rpm.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - uża root ieħor għall-installazzjoni rpm.\n"
@@ -1310,17 +1419,17 @@ msgstr ""
" --use-distrib - ikkonfigura urpmi dak il-ħin minn distrib, utli "
"biex tinstalla jew tneħħi chroot permezz ta' --root.\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - ipprova sib il-fajl \"synthesis\".\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - ipprova sib il-fajl \"hdlist\".\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " -verbose - modalità b'ħafna dettalji.\n"
@@ -1330,37 +1439,37 @@ msgstr " -verbose - modalità b'ħafna dettalji.\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - agħżel kull ma jaqbel fuq il-linja tal-kmand.\n"
-#: ../urpme:76
+#: ../urpme:73
#, fuzzy, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Is-\"superuser\" biss għandu l-awtorità ineħħi sorsi"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "pakketti mhux magħrufa"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "pakkett mhux magħruf"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "jekk tneħħi l-pakkett %s is-sistema ma tibqax taħdem sew"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "M'hemm xejn x'inneħħi"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Qed niċċekkja biex jitneħħa wieħed minn dawn il-pakketti"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1370,24 +1479,24 @@ msgstr[0] ""
msgstr[1] ""
"Biex nissodisfa d-dipendenzi, dawn il-pakketti jridu jitneħħew ukoll (%d MB)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "ed jitneħħa l-pakkett %s"
msgstr[1] "ed jitneħħa l-pakkett %s"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (i/L) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Tneħħija falliet"
@@ -1414,13 +1523,13 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --help - uri dan il-messaġġ ta' għajnuna.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - uża ambjent speċifiku (tipikament f'rapport ta' bug).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr " --excludemedia - eskludi s-sorsi msemmija, separati b'virgoli.\n"
@@ -1431,12 +1540,12 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../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"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1448,7 +1557,7 @@ msgstr ""
msgid " --use-distrib - use the given path to access media\n"
msgstr " --synthesis - uża s-sinteżi mogħti minflok id-database urpmi.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - uża s-sinteżi mogħti minflok id-database urpmi.\n"
@@ -1458,7 +1567,7 @@ msgstr " --synthesis - uża s-sinteżi mogħti minflok id-database urpmi.\n"
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - turix linji identiċi.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - uża s-sorsi ta' aġġornament biss.\n"
@@ -1594,76 +1703,86 @@ msgstr " --group - uri l-grupp.\n"
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr " --name - uri biss l-ismijiet tal-pakketti.\n"
#: ../urpmf:73
#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr " --name - uri biss l-ismijiet tal-pakketti.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - ipprintja l-kontenut ta' \"obsoletes\"\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr " --packager - uri t-tag \"packager\": pakkeġġjatur.\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, fuzzy, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - uri \"provides\" - kull ma jipprovdi\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, fuzzy, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - uri \"requires\": kull ma jeħtieġ\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --size - uri d-daqs.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, fuzzy, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - print tag \"sourcerpm\": rpm tas-sors.\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - ipprintja l-kontenut ta' \"obsoletes\"\n"
+
+#: ../urpmf:81
#, fuzzy, c-format
msgid " --summary - summary\n"
msgstr " --summary - uri t-tag \"summary\": sommarju.\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr " --url - uri l-url.\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr " -verbose - modalità b'ħafna dettalji.\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -l - illistja l-fajls fil-pakkett.\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - uri verżjoni, ħarġa u arkitettura flimkien ma' l-isem.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "qed jintuża ambjent speċifiku fuq %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1672,12 +1791,12 @@ msgstr ""
"Nota: peress li ebda sors imfittex ma juża hdlists, urpmf ma setax "
"jirritorna riżultati\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Forsi trid tuża --name biex tfittex ismijiet tal-pakketti.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, fuzzy, c-format
msgid ""
"urpmi version %s\n"
@@ -1694,43 +1813,43 @@ msgstr ""
"\n"
"użu:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
msgstr " --media - uża biss is-sorsi llistjati b'virgoli.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr ""
" --auto-select - agħżel pakketti awtomatikament biex taġġorna s-sistema.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
" --auto-select - agħżel pakketti awtomatikament biex taġġorna s-sistema.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, fuzzy, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - tiċċekkjax MD5SUM.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, fuzzy, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - ġiegħel iċ-ċifrarju gpg jiġi aġġornat.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1739,13 +1858,13 @@ msgstr ""
" --no-uninstall - tistaqsi qatt biex tneħħi pakkett, waqqaf l-"
"installazzjoni.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, fuzzy, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr ""
" --install-src - installa biss pakketti bis-sorsi (mingħajr binarji).\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1755,7 +1874,7 @@ msgstr ""
"existing packages if possible, reject requested\n"
" packages that lead to removals.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1766,40 +1885,46 @@ msgstr ""
"jew\n"
" aġġornati iżjed mill-pakketti mitluba; impliċitament %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - tul qasir ta' tranżazzjoni, impliċitament %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, fuzzy, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy - imponi tfittix \"fuzzy\" (l-istess bħal -y).\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, fuzzy, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr ""
" --src - il-pakkett li jmiss huwa pakkett sors (l-istess bħal -"
"s).\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
" --install-src - installa biss pakketti bis-sorsi (mingħajr binarji).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - neħħi rpms mill-cache qabel affarijiet oħra.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, fuzzy, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - żomm rpms mhux użati fil-cache.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1808,7 +1933,7 @@ msgstr ""
" --allow-nodeps - ippermetti li l-user jiġi mistoqsi jekk iridx jinstalla\n"
" pakketti mingħajr ma jiġu ċċekkjati d-dipendenzi.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1818,12 +1943,12 @@ msgstr ""
" pakketti mingħajr ma jiġu ċċekkjati d-dipendenzi \n"
" u integrità.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - uża root ieħor għall-installazzjoni rpm.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1833,47 +1958,47 @@ msgstr ""
"distribuzzjoni,\n"
" utli meta qed tinstalla fuq chroot bl-għażla --root.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - uża wget biex iġġib fajls remoti.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - uża curl biex iġġib fajls remoti.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, fuzzy, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --curl - uża curl biex iġġib fajls remoti.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - illimita r-rata ta' tniżżil.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1882,7 +2007,7 @@ msgstr ""
" --resume - kompli t-trasferiment ta' fajls parzjalment imniżżla\n"
" (--no-resume jitfih - impliċitament mitfi).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1893,7 +2018,7 @@ msgstr ""
" li huwa 1080 impliċitament (format huwa <proxyhost[:port]"
">).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1903,7 +2028,7 @@ msgstr ""
"awtentikazzjoni\n"
" tal-proxy (format huwa <user:password>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1912,7 +2037,7 @@ msgstr ""
" --bug - ipproduċi rapport ta' bug fid-direttorju indikat "
"fl- argument li jmiss.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, fuzzy, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1921,47 +2046,53 @@ msgstr ""
" --verify-rpm - ivverifika l-firma tal-pakkett qabel tinstalla.\n"
" (--no-verify-rpm itfih, impliċitament mixgħul).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, fuzzy, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr " --test - ivverifika li l-installazzjoni tista' ssir sew.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - eskludi direttorji separati b'virgoli.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - eskludi fajls ta' dokumentazzjoni.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, fuzzy, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --no-uninstall - tistaqsi qatt biex tneħħi pakkett, waqqaf l-"
"installazzjoni.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --url - uri l-url.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - uri t-tag \"description\": deskrizzjoni\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
" --skip - pakketti li l-installazzjoni tagħhom għandha tinqabeż\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr ""
+" --skip - pakketti li l-installazzjoni tagħhom għandha tinqabeż\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1970,61 +2101,61 @@ msgstr ""
" --more-choices - meta jinstabu iżjed minn pakkett wieħed, ipproponi iżjed\n"
" għażliet minn dak impliċitu.\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - żomm rpms mhux użati fil-cache.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, 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:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - ippermetti tfittix fil-\"provides\" biex issib pakkett.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - tfittixx fil-\"provides\" biex issib pakkett.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - modalità kwieta.\n"
-#: ../urpmi:157
+#: ../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:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, 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:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2033,7 +2164,7 @@ msgstr ""
"Direttorju [%s] diġà jeżisti, jekk jogħġbok agħżel direttorju ieħor għar-"
"rapport jew ħassru"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Ma nistax noħloq id-direttorju [%s] għar-rapport tal-bug"
@@ -2043,41 +2174,43 @@ msgstr "Ma nistax noħloq id-direttorju [%s] għar-rapport tal-bug"
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "Aġġornament"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "Aġġornament"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "Oħroġ mill-installazzjoni"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "Oħroġ mill-installazzjoni"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2085,12 +2218,12 @@ msgid ""
msgstr ""
"Biex nissodisfa d-dipendenzi, dawn il-pakketti jridu jitneħħew ukoll (%d MB)"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "X'tagħżel? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2098,7 +2231,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2106,19 +2239,19 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Trid tkompli xorta?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (I/l) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2127,7 +2260,7 @@ msgstr ""
"Xi pakketti mitluba ma jistgħux jiġu nstallati:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2136,7 +2269,7 @@ msgstr ""
"Xi pakketti mitluba ma jistgħux jiġu nstallati:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2147,7 +2280,7 @@ msgstr ""
"jitneħħew sabiex oħrajn jiġu aġġornati:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2158,7 +2291,7 @@ msgstr ""
"jitneħħew sabiex oħrajn jiġu aġġornati:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2167,7 +2300,7 @@ msgstr ""
"Dawn il-pakketti jridu jitneħħew qabel oħrajn jiġu aġġornati:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2176,12 +2309,17 @@ msgstr ""
"Dawn il-pakketti jridu jitneħħew qabel oħrajn jiġu aġġornati:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2190,111 +2328,29 @@ msgstr ""
"Trid tkun \"root\" biex tinstalla dawn id-dipendenzi:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, 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:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Agħfas Enter meta tlesti..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Ikkanċella"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "Dawn il-pakketti fihom firem ħżiena"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Dawn il-pakketti fihom firem ħżiena"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Trid tkompli l-installazzjoni ?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "installazzjoni falliet"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "qed jiġi distribwit %s"
-
-#: ../urpmi:726
-#, fuzzy, c-format
-msgid "installing %s from %s"
-msgstr "qed jiġi nstallat %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "qed jiġi nstallat %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Trid tinstalla mingħajr ma niċċekkja d-dipendenzi? (i/L) "
-
-#: ../urpmi:776
-#, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Trid tipprova b'iżjed qawwa (--force)? (i/L)"
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d tranżazzjonijiet ta' installazzjoni fallew"
-msgstr[1] "%d tranżazzjonijiet ta' installazzjoni fallew"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Installazzjoni possibbli"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "kollox diġà installat"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "kollox diġà installat"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "kollox diġà installat"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "kollox diġà installat"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "qed jiġi ristartjat urpmi"
@@ -2423,49 +2479,49 @@ msgstr " -v - modalità b'ħafna dettalji (verbose).\n"
msgid "unable to update medium \"%s\"\n"
msgstr "ma nistax naġġorna s-sors \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Is-\"superuser\" biss għandu l-awtorità iżid sorsi"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "ikteb fajl ta' konfigurazzjoni [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, fuzzy, c-format
msgid "Can't create config file [%s]"
msgstr "ikteb fajl ta' konfigurazzjoni [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "m'hemmx għalfejn tagħti <isem tal-hdlist relattiv> ma' --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<isem tal-hdlist relattiv> mhux speċifikat\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "ma nistax noħloq sors \"%s\"\n"
@@ -2626,17 +2682,17 @@ msgstr " -a - agħżel is-sorsi kollha.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - tfittix \"fuzzy\" fuq ismijiet ta' sorsi.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Is-\"superuser\" biss għandu l-awtorità ineħħi sorsi"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "xejn x'inneħħi (uża urpmi.addmedia biex iżżid sors)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2690,17 +2746,17 @@ msgstr " -a - agħżel is-sorsi kollha li ma jitneħħewx.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - ġiegħel il-fajls hdlist jiġu ġenerati.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Is-\"superuser\" biss għandu l-awtorità jaġġorna sorsi"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "m'hemm xejn x'naġġorna (uża urpmi.addmedia biex iżżid sors)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2709,22 +2765,22 @@ msgstr ""
"l-element li trid taġġorna m'hux hemm\n"
"(wieħed minn %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "ignoring media %s"
msgstr "Editja s-sors \"%s\":"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "enabling media %s"
msgstr "qed jitneħħa s-sors \"%s\""
-#: ../urpmq:43
+#: ../urpmq:40
#, fuzzy, c-format
msgid ""
"urpmq version %s\n"
@@ -2741,44 +2797,44 @@ msgstr ""
"\n"
"użu:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
"packages.\n"
msgstr " --media - uża biss is-sorsi llistjati b'virgoli.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - imponi tfittix \"fuzzy\" (l-istess bħal -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - uri l-pakketti disponibbli kollha.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - illistja s-sorsi disponibbli.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - illistja s-sorsi disponibbli u l-urls tagħhom.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr " --list-nodes - illistja nodi disponibbli għal --parallel.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - elenka l-aliases paralleli disponibbli.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
@@ -2786,14 +2842,14 @@ msgstr ""
" --dump-config - uri l-konfigurazzjoni fil-forma ta' argument għal\n"
" urpmi.addmedia.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr ""
" --src - il-pakkett li jmiss huwa pakkett sors (l-istess bħal -"
"s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
@@ -2801,12 +2857,12 @@ msgstr ""
" --sources - agħti l-pakketti sorsi kollha qabel tniżżilhom (root "
"biss).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --url - uri l-url.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2816,24 +2872,24 @@ msgstr ""
"distribuzzjoni.\n"
" Dak jippermettilek tikkwerja lid-distro.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - uri \"changelog\": lista ta' tibdiliet.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - uri t-tag \"summary\": sommarju.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr ""
" --whatrequires - tfittix bil-kontra, għal dak li jirrikjedi dan il-"
"pakkett.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, fuzzy, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2842,55 +2898,55 @@ msgstr ""
" -R - tfittix bil-kontra, għal dak li jirrikjedi dan il-"
"pakkett.\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -p - fittex fil-\"provides\" biex issib pakkett.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - output komplet bil-pakkett li se jitneħħa.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - estendi t-tfittix għad-dipendenzi tal-pakketti.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - uri l-gruppi flimkien ma' l-isem.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - uri informazzjoni utli f'forma li tinftiehem.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - illistja l-fajls fil-pakkett.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - modalità kwieta.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - uri verżjoni u ħarġa flimkien ma' l-isem.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - il-pakkett li jmiss huwa sors (l-istess bħal --src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2899,48 +2955,48 @@ msgstr ""
" -u - neħħi pakkett jekk diġà hemm verżjoni iżjed riċenti "
"nstallata.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
" -y - ġiegħel tfittix \"fuzzy\" (l-istess bħal --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - bħal -y, imma ma jiddistingwix bejn ittri kbar/żgħar.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
" ismijiet jew fajls rpm li jingħataw fuq il-linja tal-kmand jiġu "
"spezzjonati.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes tista' tintuża biss ma' --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"Nota: peress li ebda sors imfittex ma juża hdlists, urpmf ma setax "
"jirritorna riżultati\n"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2948,12 +3004,25 @@ msgstr ""
"Nota: peress li ebda sors imfittex ma juża hdlists, urpmf ma setax "
"jirritorna riżultati\n"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Ma nstabx changelog\n"
#, fuzzy
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Dawn il-pakketti għandhom firma ħażina:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Trid tkompli bl-installazzjoni?"
+
+#, fuzzy
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Trid tkun \"root\" biex tuża dan il-kmand ! \n"
@@ -3214,9 +3283,6 @@ msgstr "Ma nstabx changelog\n"
#~ "Xi pakketti mitluba ma jistgħux jiġu nstallati:\n"
#~ "%s"
-#~ msgid "unable to write file [%s]"
-#~ msgstr "ma setax jinkiteb il-fajl [%s]"
-
#~ msgid ""
#~ " --distrib-XXX - automatically create a medium for XXX part of a\n"
#~ " distribution, XXX may be main, contrib, updates or\n"
diff --git a/po/nb.po b/po/nb.po
index 446f3da1..58538a5a 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nb\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2006-08-18 02:05+0200\n"
"Last-Translator: Per Øyvind Karlsen <pkarlsen@mandriva.com>\n"
"Language-Team: Norwegian Bokmål <cooker-i18n@mandrivalinux.com>\n"
@@ -25,7 +25,7 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "RPM-installasjon"
@@ -35,7 +35,7 @@ msgstr "RPM-installasjon"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Feil: klarte ikke å finne fil %s, vil avbryte handling"
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -101,7 +101,7 @@ msgstr "_Installer"
msgid "_Save"
msgstr "_Lagre"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Avbryt"
@@ -121,17 +121,17 @@ msgstr "Ukjent valg %s"
msgid "No packages specified"
msgstr "Ingen pakker spesifisert"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Vennligst vent..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "Må være root"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -142,42 +142,42 @@ msgstr ""
"%s\n"
"Fortsett installasjonen uansett?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Advarsel"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (å oppgradere)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (å installere)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "Pakkevalg"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "En av følgende pakker behøves:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Avbryt"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -188,61 +188,63 @@ msgstr ""
"%s\n"
"Fortsett installasjon uansett?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
"For å tilfredstille avhengigheter, så vil de følgende pakkene bli installert"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
"For å tilfredstille avhengigheter, så vil de følgende pakkene bli installert"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, fuzzy, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d pakker, %d MB)"
msgstr[1] "(%d pakker, %d MB)"
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Pakkeinstallasjon..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "kunne ikke få tak i kildepakker, avslutter"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Forbereder..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Installerer pakke «%s» (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Sett inn mediumet kalt «%s» på enhet [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Laster ned pakke «%s»..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"De følgende pakkene har ugyldige signaturer:\n"
-"%s\n"
-"\n"
-"Vil du fortsette installasjonen?"
+msgid "_Done"
+msgstr "_Ferdig"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -253,41 +255,27 @@ msgstr ""
"%s\n"
"Du ønsker antageligvis å oppdatere urpmi-databasen din"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "fjerner %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Forbereder..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Installerer pakke «%s» (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Ferdig"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, c-format
msgid "Installation failed:"
msgstr "Installasjon mislyktes:"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Pakken(e) er allerede installert"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Installasjon ferdig"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "fjerner %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -322,7 +310,7 @@ msgstr " -g - vis grupper også med navn.\n"
msgid " defaults to %s.\n"
msgstr " standard er %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Bare superbruker har adgang til å installere pakker"
@@ -332,98 +320,98 @@ msgstr "Bare superbruker har adgang til å installere pakker"
msgid "Running urpmi in restricted mode..."
msgstr "Kjører urpmi i begrenset modus..."
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "kunne ikke åpne rpmdb"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "ugyldig rpm-filnavn [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "mottar rpm-fil [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...ferdig mottatt"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...mottak mislyktes: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "kunne ikke nå rpm-fil [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "klarte ikke å lese spec-fil %s [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "ikke i stand til å registrere rpm-fil"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Inkompatibel arkitektur for rpm [%s]"
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "feil ved registrering av lokale pakker"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Denne operasjonen er ikke lovlig under kjøring i begrenset modus"
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "ugyldig proxydeklarasjon på kommandolinjen\n"
-#: ../urpm/args.pm:135
-#, fuzzy, c-format
-msgid "chroot directory doesn't exist"
-msgstr "Omgivelsekatalog %s eksisterer ikke"
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: kan ikke lese rpm-fil «%s»\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
+#, fuzzy, c-format
+msgid "chroot directory doesn't exist"
+msgstr "Omgivelsekatalog %s eksisterer ikke"
+
+#: ../urpm/args.pm:424
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr "For mange argumenter\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "bygd hdlistesyntese-fil for medium «%s»"
@@ -614,7 +602,12 @@ msgstr "pakke %s er ikke funnet."
msgid "malformed URL: [%s]"
msgstr "misdannet URL: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "mottar rpm-filer fra medium «%s»..."
@@ -624,7 +617,7 @@ msgstr "mottar rpm-filer fra medium «%s»..."
msgid "[repackaging]"
msgstr "[gjenpakking]"
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -632,37 +625,42 @@ msgstr ""
"opprettet transaksjon for installasjon på %s (fjern=%d, installer=%d, "
"oppgrader=%d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "kunne ikke opprette transaksjon"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, 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:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "legger til pakke %s (id=%d, eid=%d, oppdater=%d, fil=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "kunne ikke installere pakke %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "fjerner pakke %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "fjerner pakke %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "installerer %s fra %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Mer informasjon om pakke %s"
@@ -692,11 +690,103 @@ msgstr "Ingen pakker spesifisert"
msgid "Cannot connect to ldap uri:"
msgstr "Kan ikke koble til tjeneren"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "urpmi-database låst"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Advarsel"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "urpmi-database låst"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "Følgende pakker har ugyldige signaturer"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Følgende pakker har ugyldige signaturer"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Ønsker du å fortsette installasjonen ?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Installasjon mislyktes"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "distribuerer %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "installerer %s fra %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "installerer %s"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Prøv å installere uten å sjekke avhengigheter? (j/N) "
+
+#: ../urpm/main_loop.pm:205
+#, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "Prøv enda hardere å installere (--force)? (j/N) "
+
+#: ../urpm/main_loop.pm:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d installasjonstransjaksjon mislyktes"
+msgstr[1] "%d installasjonstransjaksjon mislyktes"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Installasjon er mulig"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "Pakken(e) er allerede installert"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Pakken(e) er allerede installert"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "Pakken(e) er allerede installert"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Pakken(e) er allerede installert"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -746,7 +836,7 @@ msgstr "prøver å velge ikke-eksisterende medium «%s»"
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "bygd hdlistesyntese-fil for medium «%s»"
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "kunne ikke nå hdlistefil til «%s», medium ignorert"
@@ -838,7 +928,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Søk start: %s slutt: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "utfører andre rundgang for å beregne avhengigheter\n"
@@ -904,67 +994,72 @@ msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"kan ikke få adgang til første installasjonsmedium (ingen hdlistefiler funnet)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "prøver å velge ikke-eksisterende medium «%s»"
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "velger flere medier: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "fjerner medium «%s»"
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "setter opp urpmi for medier «%s» på nytt"
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...oppsett på nytt mislyktes"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "oppsett på nytt fullført"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Feil ved generering av navnefil: avhengighet %d ikke funnet"
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr "Feil ved generering av navnefil: Kan ikke skrive til fil (%s)"
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "medium «%s» er ikke valgt"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "sjekker hdlistefil [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "sjekker syntesefil [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "bygger hdliste [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -973,77 +1068,77 @@ msgstr ""
"Ikke i stand til å bygge syntesefil for medium «%s». Din hdlistefil kan være "
"korrupt."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problem med å lese syntesefil av medium «%s»"
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "skriver listefil for medium «%s»"
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...kopiering mislyktes"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopierer beskrivelsesfil av «%s»..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...kopiering ferdig"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopiering av [%s] mislyktes (fil er mistenkelig liten)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "regner ut md5sum til kopierte kildehdliste (eller syntese)"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "kopiering av [%s] mislyktes (md5sum stemmer ikke)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "regner ut md5sum av mottatt kildehdliste (eller syntese)"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...mottak mislyktes: md5sum stemmer ikke overens"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "ingen rpm-filer funnet fra [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "leser rpm-filer fra [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "kunne ikke lese rpm-filer fra [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "ingen rpm'er lest"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1054,74 +1149,74 @@ msgstr ""
"dette kan ha skjedd hvis du monterte katalogen manuelt når mediumet ble "
"opprettet."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ingen hdlistefil funnet for medium «%s»"
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "mottar kildehdliste (eller syntese) av «%s»..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "fant testet hdliste (eller syntese) som %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "ingen hdlistefil funnet for medium «%s»"
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "undersøker fil med offentlig nøkkel til «%s»..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...importerer nøkkel %s fra fil med offentlig nøkkell til «%s»"
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "kunne ikke importere fil med offentlig nøkkel til «%s»"
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "skriver listefil for medium «%s»"
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "lagt til medium %s"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "ikke i stand til å tolke hdlistefil til «%s»"
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problem med å lese syntese-fil av medium «%s»"
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "leser hoder fra medium «%s»"
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "JjYy"
@@ -1181,47 +1276,52 @@ msgstr "usammenhengende medium «%s» merket fjernbart, men er det ikke"
msgid "unable to access medium \"%s\""
msgstr "kunne ikke nå medium «%s»"
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Ingen pakke kalt %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Følgende pakker inneholder %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "pga. manglende %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Pakken(e) er allerede installert"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "pga. utilfredsstilt %s"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "prøver å promotere %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "for å kunne beholde %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "for å kunne installere %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "pga. konflikter med %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "ikke forespurt"
@@ -1241,6 +1341,16 @@ msgstr "Ugyldig nøkkelid (%s)"
msgid "Missing signature (%s)"
msgstr "Mangler signatur (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Kan ikke skrive oppsettfil [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Kopiering mislyktes"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1257,8 +1367,8 @@ msgstr ""
"\n"
"bruk:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - vis denne hjelpemeldingen.\n"
@@ -1274,19 +1384,19 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - kontrollér at fjerningen kan bli riktig gjennomført.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr ""
" --force - tving påkallelse selv om noen pakker ikke eksisterer.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - distribuert urpmi over maskiner av alias.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Gjenpakk filene før sletting\n"
@@ -1296,8 +1406,8 @@ msgstr " --repackage - Gjenpakk filene før sletting\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - bruk en annen rot for rpm-fjerning.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - bruk en annen rot for rpm-installasjon.\n"
@@ -1317,17 +1427,17 @@ msgstr ""
"brukbart\n"
" for å (av)installere en chroot med --root.\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - prøv å finn og bruk syntesefilen.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - prøv å finne og bruke hdlistefil.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - informativt modus.\n"
@@ -1337,37 +1447,37 @@ msgstr " --verbose - informativt modus.\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - velg alle pakker som matcher uttrykket.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Bare superbruker har adgang til å fjerne pakker"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "ukjente pakker"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "ukjent pakke"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "fjerning av pakke %s vil ødelegge systemet ditt"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Ingenting å fjerne"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Sjekker fjerning av følgende pakker"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1377,24 +1487,24 @@ msgstr[0] ""
msgstr[1] ""
"For å tilfredsstille avhengigheter vil følgende %d pakker bli fjernet (%d MB)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "Fjern %d pakker?"
msgstr[1] "Fjern %d pakker?"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (j/N) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Fjerning mislyktes"
@@ -1420,12 +1530,12 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - vis dette verktøyets versjonnummer.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr " --env - bruk spesifikt miljø (typisk en feilrapport).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr " --excludemedia - ikke bruk gitte medie, delt med komma.\n"
@@ -1438,12 +1548,12 @@ msgstr ""
" --literal, -l - ikke sjekk søkestrenger, bruk argumenter som bokstavelige "
"strenger.\n"
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - bruk bare gitte medie, delt med komma.\n"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1456,7 +1566,7 @@ msgid " --use-distrib - use the given path to access media\n"
msgstr ""
" --synthesis - bruk den gitte syntese i stedet for urpmi-database.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1467,7 +1577,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - ikke vis identiske linjer.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - bruk bare oppdateringsmedie.\n"
@@ -1604,76 +1714,86 @@ msgid " --group - group\n"
msgstr " --group - gruppe\n"
#: ../urpmf:72
+#, fuzzy, c-format
+msgid " --license - license\n"
+msgstr " --name - pakkenavn\n"
+
+#: ../urpmf:73
#, c-format
msgid " --name - package name\n"
msgstr " --name - pakkenavn\n"
-#: ../urpmf:73
+#: ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - foreldelsesetiketter\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr " --packager - pakkebygger\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - tilbudsetiketter\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - avhengighetsetiketter\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, c-format
msgid " --size - installed size\n"
msgstr " --size - installert størrelse\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - navn på kilde-rpm\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - foreldelsesetiketter\n"
+
+#: ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr " --summary - sammendrag\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, c-format
msgid " --url - url\n"
msgstr " --url - url\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, c-format
msgid " --vendor - vendor\n"
msgstr " --vendor - leverandør\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -m - mediet i hvilken pakke som ble funnet\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - vis versjon, utgivelse og arkitektur med navn.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Ugyldig format: du kan bare bruke flerverdietiketter"
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "bruker spesifikt miljø på %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1682,12 +1802,12 @@ msgstr ""
"Merk: siden inget medie som er blitt søkt gjennom bruker hdlister, så var "
"ikke urpmf i stand til å returnere noe resultat\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Det kan være at du ønsker å bruke --name for å søke etter pakkenavn.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1703,7 +1823,7 @@ msgstr ""
"\n"
"bruk:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1711,7 +1831,7 @@ msgstr ""
" --searchmedia - bruk bare det oppgitte medie for å søke etter forespurte "
"pakker.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
@@ -1719,30 +1839,30 @@ msgid ""
msgstr ""
" --auto - ikke-interaktivt modus, anta standardsvar til spørsmål.\n"
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr ""
" --auto-select - velg automatisk pakker for oppgradering av systemet.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
" --auto-select - velg automatisk pakker for oppgradering av systemet.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, fuzzy, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - deaktiver MD5SUM-filsjekking.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, fuzzy, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - tving oppdatering av gpg-nøkkel.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1751,12 +1871,12 @@ msgstr ""
" --no-uninstall - aldri spørr om å avinstallere en pakke, avbryt "
"installasjonen.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - ikke installer pakker (bare last ned)\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1765,7 +1885,7 @@ msgstr ""
" --keep - behold eksisterende pakker hvis mulig, avvis forespurte\n"
" pakker som fører til fjerning.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1777,37 +1897,43 @@ msgstr ""
" skal bli installert eller oppgradert,\n"
" standard er %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - liten transaksjonslengde, standard er %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy, -y - pålegg uklart søk.\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src, -s - neste pakke er en kildepakke.\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr " --install-src - installer bare kildepakke (ingen binære).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - fjern rpm fra mellomlager før noe annet.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - ikke fjern rpm-pakker fra cache.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1816,7 +1942,7 @@ msgstr ""
" --allow-nodeps - tillat å spørre bruker om å installere pakker uten\n"
" sjekking av avhengigheter.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1825,12 +1951,12 @@ msgstr ""
" --allow-force - tillat å spørre bruker om å installere pakker uten\n"
" sjekking av avhengigheter og integritet.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - bruk en annen rot for rpm-installasjon.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1839,47 +1965,47 @@ msgstr ""
" --use-distrib - setter opp urpmi fortgående fra et distrib-tre, nyttig\n"
" for å installere en chroot med --root-valg.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - bruk wget til å motta eksterne filer.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - bruk curl til å motta eksterne filer.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, fuzzy, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --curl - bruk curl til å motta eksterne filer.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr " --curl-options - ekstra valg som skal gis til curl\n"
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr " --rsync-options- ekstra valg som skal gis til rsync\n"
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr " --wget-options - ekstra valg som skal gis til wget\n"
-#: ../urpmi:127
+#: ../urpmi:124
#, fuzzy, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr " --curl-options - ekstra valg som skal gis til curl\n"
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - sett grense på nedlastningshastigheten.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1888,7 +2014,7 @@ msgstr ""
" --resume - gjenoppta overføring av delvis nedlastede filer\n"
" (--no-resume deaktiverer det, deaktivert er standard).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1897,7 +2023,7 @@ msgstr ""
" --proxy - bruk spesifisert HTTP-proxy, portnummeret antas\n"
" å være 1080 som standard (format er <proxyhost[:port]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1906,7 +2032,7 @@ msgstr ""
" --proxy-user - spesifiser bruker og passord til bruk for proxy\n"
" autentisering (format er <bruker:passord>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1915,7 +2041,7 @@ msgstr ""
" --bug - skriv ut en feilrapport i katalog indikert av\n"
" neste argument.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1924,7 +2050,7 @@ msgstr ""
" --verify-rpm - kontrollér rpm-signatur før installasjon\n"
" (--no-verify-rpm deaktiverer det, standard er aktivert).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
@@ -1933,38 +2059,43 @@ msgstr ""
" --test - kontrollér bare at installasjonen kan bli vellykket "
"gjennomført.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - ekskluder sti separert med komma.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - ekskluder dokumentfiler.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr " --ignoresize - ikke sjekk for ledig diskplass før installasjon.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr ""
" --ignorearch - tillat å installere rpm'er for ulike arkitekturer.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - ikke kjør pakkers skript\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - pakker som installasjon av bør hoppes over\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - pakker som installasjon av bør hoppes over\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1973,47 +2104,47 @@ msgstr ""
" --more-choices - når flere valgte pakker blir funner, foreslå flere valg\n"
" enn hva som er standard.\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - ikke lås rpm-database.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - bare oppgrader pakker med samme arkitektur.\n"
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - velg alle treff på kommandolinjen.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - tillat søk i tilbud for å finne pakke.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - ikke søk i tilbud for å finne pakke.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - stillemodus.\n"
-#: ../urpmi:157
+#: ../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:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2022,12 +2153,12 @@ msgstr ""
"Feil: For å generere en feilrapport, spesifisér de vanlige "
"kommandolinjeargumentene med --bug.\n"
-#: ../urpmi:220
+#: ../urpmi:218
#, 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:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2036,7 +2167,7 @@ msgstr ""
"Katalogen [%s] eksisterer allerede, bruk en annen katalog for "
"feilrapportering eller slett den"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Kan ikke opprette katalog [%s] for feilrapport"
@@ -2046,7 +2177,7 @@ msgstr "Kan ikke opprette katalog [%s] for feilrapport"
msgid "Environment directory %s does not exist"
msgstr "Omgivelsekatalog %s eksisterer ikke"
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2055,34 +2186,36 @@ msgstr ""
"Feil: %s ser ut til å være montert skrivebeskyttet.\n"
"Bruk --allow-force for å tvinge operasjonen."
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr "Oppdaterer medie...\n"
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (å oppgradere)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (å oppgradere)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (å installere)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (å installere)"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2090,12 +2223,12 @@ msgid ""
msgstr ""
"For å tilfredsstille avhengigheter vil følgende %d pakker bli fjernet (%d MB)"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Hva er ditt valg? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2106,7 +2239,7 @@ msgstr ""
"som er eldre enn de som er installert:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2117,7 +2250,7 @@ msgstr ""
"som er eldre enn de som er installert:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, c-format
msgid ""
"\n"
@@ -2126,12 +2259,12 @@ msgstr ""
"\n"
"Fortsett installasjon likevel?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (J/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2140,7 +2273,7 @@ msgstr ""
"Noen av de forespurte pakkene kan ikke installeres:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2149,7 +2282,7 @@ msgstr ""
"Noen av de forespurte pakkene kan ikke installeres:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2160,7 +2293,7 @@ msgstr ""
"må fjernes for at andre skal bli oppgradert:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2171,7 +2304,7 @@ msgstr ""
"må fjernes for at andre skal bli oppgradert:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2180,7 +2313,7 @@ msgstr ""
"Følgende pakker må fjernes for at andre skal bli oppgradert:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2189,12 +2322,17 @@ msgstr ""
"Følgende pakker må fjernes for at andre skal bli oppgradert:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(kun test, fjerning vil egentlig ikke bli gjennomført)"
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2203,111 +2341,29 @@ msgstr ""
"Du må være root for å installere følgende avhengigheter:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(kun test, installasjon vil egentlig ikke bli gjennomført)"
-#: ../urpmi:597
+#: ../urpmi:617
#, fuzzy, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Fortsett installasjonen med de %d pakkene? (%d MB)"
msgstr[1] "Fortsett installasjonen med de %d pakkene? (%d MB)"
-#: ../urpmi:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Trykk Enter når det er klart..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Avbryt"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "Følgende pakker har ugyldige signaturer"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Følgende pakker har ugyldige signaturer"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Ønsker du å fortsette installasjonen ?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Installasjon mislyktes"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "distribuerer %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "installerer %s fra %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "installerer %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Prøv å installere uten å sjekke avhengigheter? (j/N) "
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Prøv enda hardere å installere (--force)? (j/N) "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d installasjonstransjaksjon mislyktes"
-msgstr[1] "%d installasjonstransjaksjon mislyktes"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Installasjon er mulig"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Pakken(e) er allerede installert"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Pakken(e) er allerede installert"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "Pakken(e) er allerede installert"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "Pakken(e) er allerede installert"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "starter urpmi på nytt"
@@ -2440,32 +2496,32 @@ msgstr " -v - informativt modus.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "kunne ikke oppdatere medium «%s»\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Bare superbruker har adgang til å legge til medie"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "Vil skrive oppsettfil [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "Kan ikke skrive oppsettfil [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "ingen grunn til å gi <relativ sti til hdliste> med --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
@@ -2474,17 +2530,17 @@ msgstr ""
"\n"
"Ønsker du å installere medie «%s»"
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<relativ sti til hdliste> mangler\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "kunne ikke opprette medium «%s»\n"
@@ -2649,17 +2705,17 @@ msgstr " -a - velg alle medier.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - uklart treff på medienavn.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Bare superbruker har adgang til å fjerne medie"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "ingenting å fjerne (bruk urpmi.addmedia for å legge til et medie)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2715,17 +2771,17 @@ msgstr " -a - velg alle ikke-fjernbare medier.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - tving generasjon av hdlstefiler.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Bare superbruker har adgang til å oppdatere medier"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "ingenting å oppdatere (bruk urpmi.addmedia for å legge til et medie)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2734,22 +2790,22 @@ msgstr ""
"oppføringen til oppdatering mangler\n"
"(en av %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "«%s»"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "ignorerer medie %s"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "aktiverer medie %s"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2765,7 +2821,7 @@ msgstr ""
"\n"
"bruk:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2774,61 +2830,61 @@ msgstr ""
" --searchmedia - bruk bare det oppgitte medie for å søke etter forespurte "
"(eller oppdaterte) pakker.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - pålegg uklart søk (samme som -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - lister opp tilgjengelige pakker.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - lister opp tilgjengelige medier.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - lister tilgjengelige medier og deres url.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr " --list-nodes - lister opp tilgjengelige når --parallel brukes.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - lister opp tilgjengelige parallell-aliaser.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
" --dump-config - dump oppsettet i form av et urpmi.addmedia-argument.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr " --src - neste pakke er en kildepakke (samme som -s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr " --sources - gir alle kildepakker før nedlasting (kun root).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr ""
" --ignorearch - tillat å spørre etter rpm'er for ulike arkitekturer.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2837,22 +2893,22 @@ msgstr ""
" --use-distrib - setter opp urpmi fortgående fra ett distrib-tre.\n"
" Dette tillater å forespøre en distro.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - vis changelog.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - vis sammendrag.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - reversert søk til hva som krever pakke.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2861,56 +2917,56 @@ msgstr ""
" --whatrequires-recursive\n"
" - utvidet reversert søk (inkluderer virtuell pakker).\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -p - søk i tilbud for å finne pakke.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr ""
" -c - fullstendig utskrift med pakke som skal bli fjernet.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - utvid forespørsel til pakkeavhengigheter.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - vis grupper også med navn.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - vis verdigfull informasjon i menneskelig lesbart format.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - list opp filer i pakke.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - stillemodus.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - vis versjon og utgivelse også med navn.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - neste pakke er en kildepakke (samme som --src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2919,45 +2975,45 @@ msgstr ""
" -u - fjerner pakke hvis en nyere versjon allerede er "
"installert.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - pålegg uklart søk (samme som --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - som -y, men tvinger samvsvar med store og små bokstaver.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " navn eller rpm-filer gitt på kommandolinjem er forespurt.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes kan bare brukes med --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"Merk: siden inget medie som er blitt søkt gjennom bruker hdlister, så var "
"ikke urpmf i stand til å returnere noe resultat\n"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2965,11 +3021,22 @@ msgstr ""
"Merk: siden inget medie som er blitt søkt gjennom bruker hdlister, så var "
"ikke urpmf i stand til å returnere noe resultat\n"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Ingen changelog funnet\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "De følgende pakkene har ugyldige signaturer:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Vil du fortsette installasjonen?"
+
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Du må være root for å bruke --use-distrib"
diff --git a/po/nl.po b/po/nl.po
index dd8a46a0..8c6b4796 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2007-08-14 23:50+0200\n"
"Last-Translator: Reinout van Schouwen <reinout@gmail.com>\n"
"Language-Team: Nederlands\n"
@@ -24,7 +24,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "RPM-installatie"
@@ -34,7 +34,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:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -103,7 +103,7 @@ msgstr "_Installeren"
msgid "_Save"
msgstr "_Opslaan"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Annuleren"
@@ -123,17 +123,17 @@ msgstr "Onbekende optie '%s'"
msgid "No packages specified"
msgstr "Geen pakketten gespecificeerd"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Even geduld..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "Dient 'root' te zijn"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -144,42 +144,42 @@ msgstr ""
"%s\n"
"Toch verdergaan met installatie?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Waarschuwing"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (op te waarderen)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr "(te installeren)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "Pakketkeuze"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Eén van de volgende pakketten is benodigd:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Afbreken"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -191,7 +191,7 @@ msgstr ""
"%s\n"
"Toch verdergaan met installatie?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
@@ -199,7 +199,7 @@ msgstr ""
"Om aan afhankelijkheden te voldoen, wordt het volgende pakket geïnstalleerd:"
# Should use ngettext plural forms :-/
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -207,47 +207,49 @@ msgstr ""
"Om aan de afhankelijkheden te voldoen worden de volgende pakketten "
"geïnstalleerd:"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, 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:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Pakket-installatie..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "kan bronpakketten niet ontvangen, bezig met afbreken"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Voorbereiden..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Bezig met installeren van pakket `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Gelieve het medium genaamd \"%s\" in apparaat [%s] te plaatsen"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Downloaden van pakket `%s'..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"De volgende pakketten hebben onjuiste handtekeningen\n"
-"%s\n"
-"\n"
-"Wilt u de installatie voortzetten?"
+msgid "_Done"
+msgstr "_Klaar"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -258,41 +260,27 @@ msgstr ""
"%s\n"
"Misschien moet u de urpmi database opwaarderen"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "verwijderen van %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Voorbereiden..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Bezig met installeren van pakket `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Klaar"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, c-format
msgid "Installation failed:"
msgstr "Installatie mislukt:"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "De pakketten zijn reeds geïnstalleerd"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Installatie voltooid"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "verwijderen van %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -328,7 +316,7 @@ msgstr " -f - volledige rpm-naam tonen (NVRA).\n"
msgid " defaults to %s.\n"
msgstr " standaard is %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Alleen de beheerder mag pakketten installeren"
@@ -338,100 +326,100 @@ msgstr "Alleen de beheerder mag pakketten installeren"
msgid "Running urpmi in restricted mode..."
msgstr "Urpmi uitvoeren in beperkte modus..."
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "kon rpmdb niet openen"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
"%d rpm-kopteksten in buffer gevonden, %d verouderde kopteksten worden "
"verwijderd"
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "ongeldige rpm-bestandsnaam [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "bezig met ontvangen van rpm bestand [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...klaar met ontvangst"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...ontvangst mislukt: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "kon rpm-bestand [%s] niet benaderen"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "niet in staat spec-bestand %s te analyseren [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "kon rpm-bestand niet registreren"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Niet-compatibele architectuur voor rpm [%s]"
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "registreren van lokale pakketten is mislukt"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, 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:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "ongeldige proxy-aanduiding op opdrachtregel\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr "chroot-map bestaat niet"
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: kon rpm bestand \"%s\" niet lezen\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
+#, c-format
+msgid "chroot directory doesn't exist"
+msgstr "chroot-map bestaat niet"
+
+#: ../urpm/args.pm:424
#, c-format
msgid "Can't use %s without %s"
msgstr "Kan %s niet gebruiken zonder %s"
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
#, c-format
msgid "Can't use %s with %s"
msgstr "Kan %s niet gebruiken samen met %s"
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr "Te veel argumenten\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "hdlist synthesis bestand opgebouwd voor medium \"%s\""
@@ -620,7 +608,12 @@ msgstr "pakket %s is niet gevonden."
msgid "malformed URL: [%s]"
msgstr "ongeldige URL: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "bezig met ontvangen van rpm bestanden van medium \"%s\"..."
@@ -630,7 +623,7 @@ msgstr "bezig met ontvangen van rpm bestanden van medium \"%s\"..."
msgid "[repackaging]"
msgstr "[opnieuw verpakken]"
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -638,37 +631,42 @@ msgstr ""
"transactie aangemaakt om te installeren op %s (verwijderen=%d, installeren=%"
"d, vernieuwen=%d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "Niet in staat om transactie aan te maken."
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, 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:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "toevoegen van pakket %s (id=%d, eid=%d, update=%d, bestand=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "kon volgend pakket niet installeren: %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "bezig met verwijderen van pakket %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "bezig met verwijderen van pakket %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "geïnstalleerde rpms (%s) worden verwijderd uit %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Meer informatie over pakket %s"
@@ -698,11 +696,104 @@ msgstr "Geen basis gedefinieerd"
msgid "Cannot connect to ldap uri:"
msgstr "Kan geen verbinding maken ldap-uri:"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "%s-database gesloten"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Waarschuwing"
+
+#: ../urpm/lock.pm:65
#, c-format
msgid "%s database locked"
msgstr "%s-database gesloten"
+#: ../urpm/main_loop.pm:99
+#, c-format
+msgid "The following package has bad signature"
+msgstr "Het volgende pakket is voorzien van een onjuiste handtekening"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "De volgende pakketten bevatten een onjuiste handtekening"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Wilt u doorgaan met de installatie?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Installatie mislukt"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "bezig met distribueren van %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "installeren van %s vanaf %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "bezig met installeren van %s"
+
+#: ../urpm/main_loop.pm:187
+#, 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:205
+#, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "Installatie trachten te forceren (--force)? (j/N) "
+
+#: ../urpm/main_loop.pm:247
+#, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d installatie-transactie mislukt"
+msgstr[1] "%d installatie-transacties mislukt"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Installatie is mogelijk"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr "Pakketten zijn bijgewerkt"
+
+#: ../urpm/main_loop.pm:271
+#, c-format
+msgid "Package %s is already installed"
+msgstr "Pakket %s is reeds geïnstalleerd"
+
+#: ../urpm/main_loop.pm:272
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "De pakketten %s zijn reeds geïnstalleerd"
+
+#: ../urpm/main_loop.pm:275
+#, c-format
+msgid "Package %s can not be installed"
+msgstr "Pakket %s kan niet worden geïnstalleerd"
+
+#: ../urpm/main_loop.pm:276
+#, c-format
+msgid "Packages %s can not be installed"
+msgstr "Pakketten %s kunnen niet worden geïnstalleerd"
+
#: ../urpm/md5sum.pm:23
#, c-format
msgid "examining %s file"
@@ -752,7 +843,7 @@ msgstr "\"synthesis\" dient niet ingesteld te zijn (medium \"%s\")"
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "\"synthesis\" dient ingesteld te zijn (medium \"%s\")"
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "kon hdlist bestand \"%s\" niet benaderen, medium genegeerd"
@@ -845,7 +936,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Zoek begin: %s eind: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "uitvoeren tweede fase, controleren van afhankelijkheden\n"
@@ -911,69 +1002,74 @@ 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:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "probeert een niet-bestaand medium \"%s\" te selecteren"
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "selecteren van meerdere media: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "bezig met verwijderen van medium \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "herconfigureren van urpmi voor medium \"%s\"..."
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...herconfiguratie mislukt"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "herconfiguratie voltooid"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, 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:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
"Fout bij het genererenvan namenbestand: Kan niet naar bestand schrijven (%s)"
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "medium \"%s\" is bijgewerkt"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "bezig met onderzoeken hdlist bestand [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "onderzoeken van het synthesis-bestand [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "bezig met bouwen hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -982,77 +1078,77 @@ msgstr ""
"Niet in staat om het synthesis bestand voor medium \"%s\" te bouwen. Uw "
"hdlist bestand is mogelijk corrupt."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "probleem met lezen van hdlist of synthesis bestand van medium \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "Kopiëren van bestand [%s] voor medium \"%s\"..."
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...kopiëren mislukt"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "bezig met kopiëren omschrijving bestand van \"%s\"..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...kopiëren is klaar"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopiëren van [%s] mislukt (bestand is verdacht klein)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "berekenen md5sum van gekopieerde bron hdlist (of synthesis)"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "kopiëren van [%s] mislukt (md5sum onjuist)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "berekenen md5sum van ontvangen bron hdlist (of synthesis)"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...ontvangst mislukt: md5sum verschillend"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "geen rpm bestanden gevonden van [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "bezig met lezen van rpm-bestanden van [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "kon rpm-bestanden niet lezen van [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "geen rpm-bestanden gelezen"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1063,74 +1159,74 @@ msgstr ""
"dit kan gebeuren wanneer u de map handmatig heeft gekoppeld bij het aanmaken "
"van het medium."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ongeldig hdlist-bestand %s voor medium \"%s\""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "bezig met bron hdlist (of synthesis) van \"%s\" te ontvangen..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "afgezochte hdlist (of synthesis) gevonden als %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "geen hdlist-bestand gevonden voor medium \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "onderzoeken van publieke sleutelbestand van \"%s\"..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...sleutel %s uit publiek sleutelbestand van \"%s\" geïmporteerd"
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "kon publieke sleutelbestand van \"%s\" niet importeren"
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "bezig met schrijven van lijstbestand voor medium \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, c-format
msgid "updated medium \"%s\""
msgstr "bijgewerkt medium \"%s\""
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "kan het hdlist-bestand van \"%s\" niet analyseren"
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "probleem met lezen van synthesis bestand van medium \"%s\""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "bezig met lezen van headers van medium \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "YyJj"
@@ -1191,47 +1287,52 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "kon medium \"%s\" niet benaderen"
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Geen pakket genaamd %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "De volgende pakketten bevatten %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "vanwege missende %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Pakket %s is reeds geïnstalleerd"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "vanwege onvoldane %s"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "probeer %s op te waarderen"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "Om %s te behouden"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "in volgorde om %s te installeren"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "vanwege conflicten met %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "ongevraagd"
@@ -1251,6 +1352,16 @@ msgstr "Ongeldig sleutel-ID (%s)"
msgid "Missing signature (%s)"
msgstr "Geen ondertekening aanwezig (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Niet mogelijk config-bestand [%s] te maken"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Kopiëren mislukt"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1268,8 +1379,8 @@ msgstr ""
"\n"
"gebruik:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1286,7 +1397,7 @@ msgstr ""
" --test - verifiëren dat de verwijdering correct uitgevoerd kan "
"worden.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
@@ -1294,12 +1405,12 @@ msgstr ""
" --force - aanroep forceren zelfs als sommige pakketten niet "
"bestaan.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - gedistribueerde urpmi over computers van alias.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr ""
@@ -1311,8 +1422,8 @@ msgid " --root - use another root for rpm removal.\n"
msgstr ""
" --root - gebruik andere hoofdmap (root) voor rpm-verwijdering.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
@@ -1333,17 +1444,17 @@ msgstr ""
" --use-distrib - urpme dynamisch configureren vanuit distrib-boom, handig\n"
" om een chroot te (de)installeren met de --root optie.\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - gebruik synthesis-bestand.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - gebruik hdlist-bestand.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - 'uitgebreid verslag'-modus.\n"
@@ -1355,37 +1466,37 @@ msgstr ""
" -a - selecteer alle pakketten die overeenkomen met de "
"expressie.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Alleen de beheerder mag media verwijderen"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "onbekende pakketten"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "onbekend pakket"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "het verwijderen van %s zal uw systeem verstoren"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Niets te verwijderen"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Aanvinken om de volgende pakketten te verwijderen"
-#: ../urpme:134
+#: ../urpme:131
#, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1396,24 +1507,24 @@ msgstr[1] ""
"Om aan de afhankelijkheden te voldoen, worden de volgende %d pakketten "
"verwijderd"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr " (%d MB)"
-#: ../urpme:138
+#: ../urpme:135
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "Eén pakket verwijderen?"
msgstr[1] "%d Pakketten verwijderen?"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (j/N) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Verwijderen is mislukt"
@@ -1441,13 +1552,13 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - geeft het versienummer van dit programma weer.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - specifieke omgeving gebruiken (meestal een foutrapport).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr " --excludemedia - gebruik de gegeven media niet, kommagescheiden.\n"
@@ -1460,12 +1571,12 @@ msgstr ""
" --literal, -l - geen patronen vergelijken, argument als letterlijke "
"reeks.\n"
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - alleen de aangegeven media, kommagescheiden.\n"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1475,10 +1586,9 @@ msgstr ""
#: ../urpmf:43
#, c-format
msgid " --use-distrib - use the given path to access media\n"
-msgstr ""
-" --use-distrib - opgegeven pad gebruiken voor mediatoegang.\n"
+msgstr " --use-distrib - opgegeven pad gebruiken voor mediatoegang.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1489,7 +1599,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - geeft geen identieke regels weer.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - gebruik alleen bijwerkmedia.\n"
@@ -1626,76 +1736,86 @@ msgid " --group - group\n"
msgstr " --group - groep\n"
#: ../urpmf:72
+#, fuzzy, c-format
+msgid " --license - license\n"
+msgstr " --name - pakketnaam\n"
+
+#: ../urpmf:73
#, c-format
msgid " --name - package name\n"
msgstr " --name - pakketnaam\n"
-#: ../urpmf:73
+#: ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - obsoletes ('verouderd')-tags\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr " --packager - pakketsamensteller.\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - provides ('levert')-tags\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - requires ('vereisten')-tags\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, c-format
msgid " --size - installed size\n"
msgstr " --size - geïnstalleerde grootte.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - naam van de broncode-rpm.\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - obsoletes ('verouderd')-tags\n"
+
+#: ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr " --summary - samenvatting\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, c-format
msgid " --url - url\n"
msgstr " --url - URL\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, c-format
msgid " --vendor - vendor\n"
msgstr " --vendor - leverancier\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -m - de media waarin het pakket gevonden is\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - geeft de versie, uitgave en arch met naam.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Onjuist formaat: u mag maar één tag gebruiken met meerdere waarden"
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "maakt gebruik van aangegeven omgeving op %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1704,12 +1824,12 @@ msgstr ""
"Merk op: aangezien geen doorzocht medium hdlists gebruikt, was urpmf niet in "
"staat een resultaat te geven\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "U zou --name kunnen gebruiken om naar pakketnamen te zoeken.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1726,7 +1846,7 @@ msgstr ""
"\n"
"gebruik:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1734,7 +1854,7 @@ msgstr ""
" --searchmedia - alleen de aangegeven media gebruiken om gewenste "
"pakketten te zoeken.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
@@ -1743,7 +1863,7 @@ msgstr ""
" --auto - niet-interactieve modus, standaardantwoorden op vragen "
"aannemen.\n"
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
@@ -1751,23 +1871,23 @@ msgstr ""
" --auto-select - automatisch pakketten selecteren voor "
"systeemopwaardering.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
" --auto-update - media bijwerken en daarna het systeem opwaarderen.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - MD5SUM bestandscontrole uitschakelen.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - dwing bijwerken van de gpg-sleutel af.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1776,12 +1896,12 @@ msgstr ""
" --no-uninstall - vraag nooit om verwijdering van een pakket, breek de "
"installatie af.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - geen pakketten installeren (alleen downloaden)\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1791,7 +1911,7 @@ msgstr ""
"negeer gevraagde\n"
" pakketten die tot verwijderen nopen.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1802,39 +1922,45 @@ msgstr ""
" aangegeven aantal pakketten worden geïnstalleerd of\n"
" opgewaardeerd, standaard is %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - korte transactielengte, standaard is %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy, -y - onprecies zoeken gebruiken.\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src, s - volgende pakket is een bronpakket.\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
" --install-src - installeer alleen bronpakketten (geen uitvoerbare "
"bestanden)\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - rpm uit cache verwijderen vóór al het andere\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - rpm's niet uit buffer wissen.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1843,7 +1969,7 @@ msgstr ""
" --allow-nodeps - sta toe de gebruiker te vragen om pakketten te\n"
" installeren zonder afhankelijkhedencontrole.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1853,13 +1979,13 @@ msgstr ""
" installeren zonder afhankelijkhedencontrole en zonder\n"
" integriteitscontrole.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr ""
" --root - gebruik andere hoofdmap (root) voor rpm-installatie.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1868,50 +1994,50 @@ msgstr ""
" --use-distrib - urpmi dynamisch configureren vanuit een distrib-boom,\n"
" handig om een chroot te instaleren met de --root optie.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr ""
" --wget - wget gebruiken om bestanden op afstand te ontvangen.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr ""
" --curl - curl gebruiken om bestanden op afstand te ontvangen.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr ""
" --prozilla - prozilla gebruiken om bestanden op afstand te ontvangen.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr " --curl-options - extra opties om aan curl door te geven\n"
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr " --rsync-options- extra opties om aan rsync door te geven\n"
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr " --wget-options - extra opties om aan wget door te geven\n"
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr " --prozilla-options - extra opties om aan prozilla door te geven\n"
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - de download snelheid begrenzen.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1920,7 +2046,7 @@ msgstr ""
" --resume -laden hervatten van gedeeltelijk geladen bestand \n"
" (--no-resume schakelt dit uit, standaard uitgeschakeld).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1930,7 +2056,7 @@ msgstr ""
"nummer\n"
" is 1080 (formaat is <proxyhost[:poort]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1939,7 +2065,7 @@ msgstr ""
" --proxy-user - specificeer gebruikersnaam en wachtwoord voor proxy-\n"
" aanmelding (formaat is <gebruiker:wachtwoord>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1948,7 +2074,7 @@ msgstr ""
" --bug - schrijf een foutrapport naar de map aangegeven\n"
" door het volgende argument.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1958,7 +2084,7 @@ msgstr ""
" (--no-verify-rpm schakelt dit uit, standaard "
"ingeschakeld).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
@@ -1967,42 +2093,49 @@ msgstr ""
" --test - verifiëren dat de installatie correct uitgevoerd kan "
"worden.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - pad (gescheiden door komma) uitsluiten.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - doc bestanden niet meerekenen.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --ignoresize - de vrije schijfruimte niet controleren voor installatie\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr ""
" --ignorearch - rpm-installatie voor niet-overeenkomende architecturen "
"toestaan.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - de pakketscriptlet(s) niet uivoeren\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
" --skip - pakketten waarvan de installatie moet worden "
"overgeslagen\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr ""
+" --skip - pakketten waarvan de installatie moet worden "
+"overgeslagen\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2012,51 +2145,51 @@ msgstr ""
"keuzemogelijkheden\n"
" aanbieden dan gewoonlijk.\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - rpm-database niet op slot zetten.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, 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:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - selecteer alle resultaten van console.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, 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"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
" -P - niet in 'provides' zoeken om een pakket te vinden.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - stille modus.\n"
-#: ../urpmi:157
+#: ../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:186
+#: ../urpmi:184
#, 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:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2065,14 +2198,14 @@ msgstr ""
"Fout: Om een programmafoutrapport te genereren, geeft u de gebruikelijke \n"
"opdrachtregel-argumenten samen met --bug.\n"
-#: ../urpmi:220
+#: ../urpmi:218
#, 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:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2081,7 +2214,7 @@ msgstr ""
"De map [%s] bestaat reeds, gebruik een andere map voor het foutrapport of "
"verwijder hem"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Kon directory [%s] niet aanmaken voor programmafoutrapport"
@@ -2091,7 +2224,7 @@ msgstr "Kon directory [%s] niet aanmaken voor programmafoutrapport"
msgid "Environment directory %s does not exist"
msgstr "Omgevingsmap %s bestaat niet"
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2100,34 +2233,36 @@ msgstr ""
"Fout: %s lijkt als alleen-lezen gekoppeld te zijn.\n"
"Gebruik --allow-force om de opdracht te forceren."
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr "Bijwerken van media...\n"
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (op te waarderen)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (op te waarderen)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (te installeren)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, c-format
msgid "%s (to install)"
msgstr "%s (te installeren)"
-#: ../urpmi:447
+#: ../urpmi:454
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2136,12 +2271,12 @@ msgstr ""
"Om aan de afhankelijkheid '%s' te voldoen, is één van de volgende pakketten "
"nodig:"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Wat is uw keuze? (1-%d)"
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2152,7 +2287,7 @@ msgstr ""
"van pakketten die ouder zijn dan de reeds geïnstalleerde pakketten:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2163,7 +2298,7 @@ msgstr ""
"van pakketten die ouder zijn dan de reeds geïnstalleerde pakketten:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, c-format
msgid ""
"\n"
@@ -2172,12 +2307,12 @@ msgstr ""
"\n"
"Toch doorgaan met de installatie?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (J/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2186,7 +2321,7 @@ msgstr ""
"Een verlangd pakket kan niet worden geïnstalleerd:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2195,7 +2330,7 @@ msgstr ""
"Enkele gevraagde pakketten kunnen niet worden geïnstalleerd:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2206,7 +2341,7 @@ msgstr ""
"moeten worden verwijderd om andere te kunnen opwaarderen:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2217,7 +2352,7 @@ msgstr ""
"moeten worden verwijderd om andere te kunnen opwaarderen:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2226,7 +2361,7 @@ msgstr ""
"Het volgende pakket moet worden verwijderd om andere te kunnen opwaarderen:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2236,12 +2371,17 @@ msgstr ""
"opwaarderen:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(alleen test, verwijdering zal niet daadwerkelijk plaatsvinden)"
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2250,112 +2390,29 @@ msgstr ""
"U dient root te zijn om de volgende afhankelijkheden te installeren:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(alleen test, installatie zal niet daadwerkelijk plaatsvinden)"
-#: ../urpmi:597
+#: ../urpmi:617
#, 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:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Druk op Enter wanneer u klaar bent..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Annuleren"
-#: ../urpmi:671
-#, c-format
-msgid "The following package has bad signature"
-msgstr "Het volgende pakket is voorzien van een onjuiste handtekening"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "De volgende pakketten bevatten een onjuiste handtekening"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Wilt u doorgaan met de installatie?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Installatie mislukt"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "bezig met distribueren van %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "installeren van %s vanaf %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "bezig met installeren van %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr ""
-"Proberen te installeren zonder de afhankelijkheden te controleren? (j/N) "
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Installatie trachten te forceren (--force)? (j/N) "
-
-#: ../urpmi:815
-#, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d installatie-transactie mislukt"
-msgstr[1] "%d installatie-transacties mislukt"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Installatie is mogelijk"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr "Pakketten zijn bijgewerkt"
-
-#: ../urpmi:838
-#, c-format
-msgid "Package %s is already installed"
-msgstr "Pakket %s is reeds geïnstalleerd"
-
-#: ../urpmi:839
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "De pakketten %s zijn reeds geïnstalleerd"
-
-#: ../urpmi:842
-#, c-format
-msgid "Package %s can not be installed"
-msgstr "Pakket %s kan niet worden geïnstalleerd"
-
-#: ../urpmi:843
-#, c-format
-msgid "Packages %s can not be installed"
-msgstr "Pakketten %s kunnen niet worden geïnstalleerd"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "urpmi herstarten"
@@ -2488,32 +2545,32 @@ msgstr " -v - 'extra informatie'-modus.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "kon medium \"%s\" niet bijwerken\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr "ongeldige <url> (voor een lokale map dient het pad absoluut te zijn)"
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Alleen de beheerder mag media toevoegen"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, c-format
msgid "creating config file [%s]"
msgstr "aanmaken config-bestand [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "Niet mogelijk config-bestand [%s] te maken"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "niet nodig om <relatief pad van hdlist> te geven met --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
@@ -2522,17 +2579,17 @@ msgstr ""
"\n"
"Wilt u media '%s' toevoegen"
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<bijbehorend pad van hdlist> ontbreekt\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr "Kan %s niet met medium op afstand gebruiken"
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "kon medium \"%s\" niet maken\n"
@@ -2697,17 +2754,17 @@ msgstr " -a - alle media selecteren.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - onprecies zoeken wat betreft medianamen.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Alleen de beheerder mag media verwijderen"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "niets te verwijderen (gebruik urpmi.addmedia om media toe te voegen)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2764,18 +2821,18 @@ msgstr " -a - selecteer alle niet-verwisselbare media.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - dwing het bijwerken van synthesis/hdlist\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Alleen de beheerder mag media bijwerken"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
"niets om te verversen (gebruik urpmi.addmedia om media toe te voegen)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2784,22 +2841,22 @@ msgstr ""
"de invoer om op te waarderen ontbreekt\n"
"(één van %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "negeren van medium \"%s\":"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "activeren van medium \"%s\""
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2816,7 +2873,7 @@ msgstr ""
"\n"
"gebruik:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2825,37 +2882,37 @@ msgstr ""
" --searchmedia - alleen de aangegeven media gebruiken om gewenste "
"pakketten te zoeken.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - onprecies zoeken gebruiken (zelfde als -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - geeft alle beschikbare pakketten weer.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - beschikbare media opsommen.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - beschikbare media en hun url opsommen.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr " --list-nodes - beschikbare knooppunten opsommen bij --parallel.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - beschikbare parallelle aliasen opsommen.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
@@ -2863,13 +2920,13 @@ msgstr ""
" --dump-config - dump de configuratie in de vorm van een urpmi.addmedia "
"formaat.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr ""
" --src - volgende pakket is een bronpakket (zelfde als -s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
@@ -2877,14 +2934,14 @@ msgstr ""
" --sources - geef alle bronpakketten voor het downloaden (alleen root "
"mag dit).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr ""
" --ignorearch - rpm-zoekaanvraag voor niet-overeenkomende architecturen "
"toestaan.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2893,22 +2950,22 @@ msgstr ""
" --use-distrib - urpmi dynamisch configureren vanuit distrib-boom.\n"
" Hiermee kunt u de distro bevragen.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - geeft wijzigingslogboek weer.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - geeft de samenvatting.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - omgekeerde zoekactie voor wat het pakket vereist.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2917,7 +2974,7 @@ msgstr ""
" --whatrequires-recursive\n"
" - uitgebreide omgekeerde (inclusief virtuele pakketten).\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, c-format
msgid ""
" --whatprovides, -p\n"
@@ -2926,50 +2983,50 @@ msgstr ""
" --whatprovides, -p\n"
" - zoek in 'levert'(provides)-veld om pakket te vinden.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - complete uitvoer met te verwijderen pakket.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr ""
" -d - de zoekopdracht uitbreiden om aan afhankelijkheden van\n"
" pakketten te voldoen.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - toont de groepen ook met namen.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - nuttige informatie afdrukken in leesbare vorm.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - geeft alle bestanden in pakket weer\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, c-format
msgid " -m - equivalent to -du\n"
msgstr " -m - gelijkwaardig aan -du\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - geeft de versie en release samen met de naam.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - volgend pakket is een bronpakket (zelfde als --src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2978,48 +3035,48 @@ msgstr ""
" -u - verwijder pakket als een recentere versie al is "
"geïnstalleerd.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - onprecies zoeken gebruiken (zelfde als --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -Y - als -y maar let niet op hoofd-/kleine letters.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
" namen van rpm bestanden opgegeven via console zijn in de wachtrij "
"geplaatst\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes kan alleen worden gebruikt met --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
"geen hdlist voor medium \"%s\", slechts een deelresultaat voor pakket %s"
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"geen hdlist voor medium\"%s\", slechts een deelresultaat voor pakketten %s"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
"geen hdlist voor medium \"%s\", niet in staat resultaten te geven voor "
"pakket %s"
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -3027,11 +3084,22 @@ msgstr ""
"geen hdlist voor medium \"%s\", niet in staat een resultaat te geven voor "
"pakketten %s"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Geen wijzigingslogboek gevonden\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "De volgende pakketten hebben onjuiste handtekeningen\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Wilt u de installatie voortzetten?"
+
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "U dient 'root' te zijn om --use-distrib te gebruiken"
diff --git a/po/nn.po b/po/nn.po
index 86721cd2..06cb240b 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2007-07-20 20:23+0200\n"
"Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
"Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -18,7 +18,7 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "RPM-installering"
@@ -28,7 +28,7 @@ msgstr "RPM-installering"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Feil: Fann ikkje fila «%s». Operasjonen vert avbroten."
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_OK"
@@ -94,7 +94,7 @@ msgstr "_Installer"
msgid "_Save"
msgstr "_Lagra"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Avbryt"
@@ -114,17 +114,17 @@ msgstr "Ukjent val: «%s»."
msgid "No packages specified"
msgstr "Ingen pakkar valde"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Vent litt ..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "Må vera root"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -135,42 +135,42 @@ msgstr ""
"%s\n"
"Vil du likevel halda fram?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Åtvaring"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "OK"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (oppgradering)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (installering)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "Pakkeval"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Du treng éin av desse pakkane:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Avbryt"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -181,58 +181,61 @@ msgstr ""
"%s\n"
"Vil du likevel halda fram?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, 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:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, 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:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d pakke – %d MB)"
msgstr[1] "(%d pakkar – %d MB)"
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Installerer pakke ..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "Fann ikkje kjeldepakke. Avbryter."
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Førebur ... "
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Installerer pakken «%s» (%s/%s) ..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Set inn «%s» i eininga [%s]."
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Lastar ned pakken «%s» ..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Desse pakkane har ugyldige signaturar:\n"
-"\n"
-"%s\n"
-"\n"
-"Vil du likevel halda fram med å installera?"
+msgid "_Done"
+msgstr "_Ferdig"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -243,41 +246,27 @@ msgstr ""
"%s\n"
"Du bør oppdatera urpmi-databasen."
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "Fjernar «%s»."
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Førebur ... "
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Installerer pakken «%s» (%s/%s) ..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Ferdig"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, c-format
msgid "Installation failed:"
msgstr "Feil ved installering:"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Alt er allereie installert."
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Installeringa er fullført"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "Fjernar «%s»."
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -312,7 +301,7 @@ msgstr " -f – Vis fullt rpm-namn (NVRA).\n"
msgid " defaults to %s.\n"
msgstr " Standardverdi: %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Berre superbrukaren kan installera pakkar."
@@ -322,98 +311,98 @@ msgstr "Berre superbrukaren kan installera pakkar."
msgid "Running urpmi in restricted mode..."
msgstr "Køyrer urpmi i avgrensa modus ..."
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "Klarte ikkje opna «rpmdb»."
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr "Fann %d RPM-hovudlinjer i mellomlageret. Fjernar %d utdaterte."
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "Ugyldig rpm-filnamn [%s]."
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "Mottek rpm-fil [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "... ferdig motteken."
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "... Ikkje motteken: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "Klarte ikkje lesa rpm-fil [%s]."
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "Klarte ikkje tolka spec-fila «%s» [%s]."
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "Klarte ikkje registrera rpm-fil."
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Inkompatibel arkitektur for rpm [%s]."
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "Klarte ikkje registrera lokale pakkar."
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Du kan ikkje køyra denne operasjonen i avgrensa modus."
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "Ugyldig mellomtenardeklarasjon på kommandolinja.\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr "«chroot»-mappa finst ikkje."
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: Klarer ikkje lesa rpm-fila «%s».\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
+#, c-format
+msgid "chroot directory doesn't exist"
+msgstr "«chroot»-mappa finst ikkje."
+
+#: ../urpm/args.pm:424
#, c-format
msgid "Can't use %s without %s"
msgstr "Kan ikkje bruka «%s» utan «%s»."
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
#, c-format
msgid "Can't use %s with %s"
msgstr "Kan ikkje bruka «%s» med «%s»."
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr "For mange argument.\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "Fullført bygging av «hdlist»-syntesefil for mediet «%s»."
@@ -602,7 +591,12 @@ msgstr "Fann ikkje pakken «%s»."
msgid "malformed URL: [%s]"
msgstr "Ugyldig adresse: [%s]."
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "Mottek rpm-filer frå mediet «%s» ..."
@@ -612,44 +606,50 @@ msgstr "Mottek rpm-filer frå mediet «%s» ..."
msgid "[repackaging]"
msgstr "[pakkar om att]"
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, 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)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "Klarte ikkje laga transaksjon."
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "Klarte ikkje henta ut rpm frå delta-rpm-pakken «%s»."
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "Legg til pakken «%s» (id: %d – eid: %d – update: %d – file: %s)."
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "Klarte ikkje installera pakken «%s»"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "Fjernar pakken «%s»."
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "Fjernar pakken «%s»."
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "Fjerner installerte rpm-pakkar (%s) frå «%s»."
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Meir informasjon om pakken «%s»"
@@ -679,11 +679,103 @@ msgstr "Inga grunnadresse definert."
msgid "Cannot connect to ldap uri:"
msgstr "Kan ikkje kopla til LDAP-adresse:"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "%s-databasen er låst."
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Åtvaring"
+
+#: ../urpm/lock.pm:65
#, c-format
msgid "%s database locked"
msgstr "%s-databasen er låst."
+#: ../urpm/main_loop.pm:99
+#, c-format
+msgid "The following package has bad signature"
+msgstr "Denne pakken har ugyldig signatur"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Desse pakkane har ugyldige signaturar"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Vil du halda fram med å installera?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Feil ved installering"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "Fordeler %s."
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "Installerer %s frå %s."
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "Installerer %s."
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Vil du installera utan å kontrollera avhengnader? (J/N) "
+
+#: ../urpm/main_loop.pm:205
+#, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "Vil du prøva endå sterkare å installera («--force»)? (J/N) "
+
+#: ../urpm/main_loop.pm:247
+#, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d mislykka installasjonstransaksjon."
+msgstr[1] "%d mislykka installasjonstransaksjonar."
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Det går an å installera."
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr "Pakkane er i nyaste versjon"
+
+#: ../urpm/main_loop.pm:271
+#, c-format
+msgid "Package %s is already installed"
+msgstr "Pakken «%s» er alt installert."
+
+#: ../urpm/main_loop.pm:272
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Pakkane «%s» er alt installerte."
+
+#: ../urpm/main_loop.pm:275
+#, c-format
+msgid "Package %s can not be installed"
+msgstr "Pakken «%s» kan ikkje installerast."
+
+#: ../urpm/main_loop.pm:276
+#, c-format
+msgid "Packages %s can not be installed"
+msgstr "Pakkane «%s» kan ikkje installerast."
+
#: ../urpm/md5sum.pm:23
#, c-format
msgid "examining %s file"
@@ -711,7 +803,8 @@ msgstr ""
#: ../urpm/media.pm:176
#, 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:184
#, c-format
@@ -733,7 +826,7 @@ msgstr "«synthesis» må ikkje vera vald (mediet «%s»)."
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "«synthesis» må vera vald (mediet «%s»)."
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "Klarte ikkje opna «hdlist»-fila til «%s». Hoppar over mediet."
@@ -753,7 +846,8 @@ msgstr ""
#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "Mediet «%s» prøver å bruka ei allereie brukt «list»-fil. Hoppar over mediet."
+msgstr ""
+"Mediet «%s» prøver å bruka ei allereie brukt «list»-fil. Hoppar over mediet."
#: ../urpm/media.pm:256
#, c-format
@@ -826,7 +920,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Søkjestart: %s. Søkjeslutt: %s."
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "Går gjennom på nytt for å rekna ut avhengnader.\n"
@@ -891,67 +985,72 @@ msgstr "Klarte ikkje tolka «media.cfg»."
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "Klarte ikkje lesa frå distribusjonsmediet (fann inga «media.cfg»-fil)."
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "Prøver å velja ikkjeeksisterande medium «%s»."
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "Vel fleire medium: %s."
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "Fjernar mediet «%s»."
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "Endrar oppsett for mediet «%s»."
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "... klarte ikkje endra oppsett."
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "Fullført endring av oppsett."
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Feil ved generering av namnefil: Fann ikkje avhengnaden «%d»."
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr "Feil ved generering av namnefil: Kan ikkje skriva til fila (%s)."
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "Mediet «%s» er i nyaste versjon."
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "Les «hdlist»-fila [%s]."
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "Les syntesefila [%s]."
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "Byggjer «hdlist» [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -960,77 +1059,77 @@ msgstr ""
"Klarte ikkje byggja syntesefil for mediet «%s». hdlist-fila kan vera "
"øydelagt."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "Feil ved lesing av «hdlist» eller syntesefila til mediet «%s»."
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "Kopierer [%s] for mediet «%s»."
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "... mislukka kopiering."
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "Kopierer beskrivingsfila til «%s» ..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "... kopiering fullført."
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "Mislykka kopiering av [%s] (fila er mistenkeleg liten)."
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "Reknar ut md5sum av kopiert kjelde-«hdlist» (eller -syntese)."
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "Mislykka kopiering av [%s] (md5summen stemmer ikkje)."
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "Reknar ut md5sum til motteken kjelde-«hdlist» (eller -syntese)."
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "... ikkje motteken: md5summen stemmer ikkje."
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "Fann ingen rpm-filer frå [%s]."
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "Leser rpm-filer frå [%s]."
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "Klarte ikkje lesa rpm-filer frå [%s]: %s."
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "Det finst ingen rpm-ar å lesa."
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1040,74 +1139,74 @@ msgstr ""
"Fekk ikkje tilgang til mediet «%s».\n"
"Dette kan vera fordi du manuelt monterte mappa når du oppretta mediet."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "Ugyldig «hdlist»-fil [%s] for mediet «%s»."
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "Mottek kjelde-«hdlist» (eller -syntese) for «%s» ..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "Fann undersøkt «hdlist» (eller -syntese) som «%s»."
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "Fann inga «hdlist»-fil for mediet «%s»."
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "Les offentlegnøkkelfila til «%s» ..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "... Importerer nøkkelen «%s» frå offentlegnøkkelfila til «%s»."
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "Klarte ikkje importera offentlegnøkkelfila til «%s»."
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "Lagrar listefil for mediet «%s»."
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, c-format
msgid "updated medium \"%s\""
msgstr "Oppdatert medium «%s»."
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "Klarte ikkje tolka «hdlist»-fila til «%s»."
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "Feil ved lesing av syntesefil til mediet «%s»."
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "Les mediumhovud til mediet «%s»."
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "JjYy"
@@ -1167,47 +1266,52 @@ msgstr "Det inkonsistente mediet «%s» er merkja fjerna, men er ikkje fjerna."
msgid "unable to access medium \"%s\""
msgstr "Klarte ikkje lesa mediet «%s»."
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Det finst ingen «%s»-pakke."
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Desse pakkane inneheld «%s»: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "då «%s» manglar"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Pakken «%s» er alt installert."
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "då «%s» ikkje er tilfredsstilt"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "Prøver å prioritera «%s»"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "for å kunna behalda «%s»"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "for å kunna installera «%s»"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "på grunn av konfliktar med «%s»"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "ikkje etterspurd"
@@ -1227,6 +1331,16 @@ msgstr "Ugyldig nøkkel-ID (%s)."
msgid "Missing signature (%s)"
msgstr "Manglar signatur (%s)."
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Kan ikkje laga oppsettfil [%s]."
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr " mislukka kopiering."
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1244,8 +1358,8 @@ msgstr ""
"\n"
"Bruk:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1260,17 +1374,19 @@ msgstr " --auto – Vel automatisk pakkar ved fleire alternativ.\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test – kontroller at fjerninga kan fungera.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, 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"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel – Distribuert urpmi over maskiner med alias.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage – Pakk om filer før sletting.\n"
@@ -1280,11 +1396,12 @@ 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:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, 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"
+msgstr ""
+" --urpmi-root – Bruk anna rot for urpmi-database og rpm-installering.\n"
#: ../urpme:53
#, c-format
@@ -1300,17 +1417,17 @@ msgstr ""
" --use-distrib – Set opp urpme direkte frå eit «distrib»-tre.\n"
"Nyttig for å (av)installera ei «chroot» med «--root»-valet.\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis – Bruk syntesefil.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist – Bruk «hdlist»-fil.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v – Utvida meldingar.\n"
@@ -1320,61 +1437,62 @@ msgstr " --verbose, -v – Utvida meldingar.\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a – Vel alle pakkar som samsvarer med uttrykket.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Berre superbrukaren kan fjerna pakkar."
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "Ukjende pakkar"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "Ukjend pakke"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "Du vil øydeleggja systemet viss du fjernar pakken «%s»."
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Ingenting å fjerna."
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Kontrollerer fjerning av desse pakkane"
-#: ../urpme:134
+#: ../urpme:131
#, 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"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr " (%d MB)"
-#: ../urpme:138
+#: ../urpme:135
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "Vil du fjerna %d pakke?"
msgstr[1] "Vil du fjerna %d pakkar?"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (J/N) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Klarte ikkje fjerna."
@@ -1401,37 +1519,42 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version – Vis versjonsnummeret til dette verktøyet.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
-msgstr " --env – Bruk eigedefinert miljø (vanlegvis ein feilrapport).\n"
+msgstr ""
+" --env – Bruk eigedefinert miljø (vanlegvis ein feilrapport).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../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"
+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:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media – Bruk berre gitt medium (kommadelt liste).\n"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
-msgid " --sortmedia - sort media according to substrings separated by comma.\n"
-msgstr " --sortmedia – Sorter medium etter delstrengar (kommadelt liste).\n"
+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:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../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"
@@ -1441,7 +1564,7 @@ msgstr " --synthesis – Bruk syntese i staden for heile databasen.\n"
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq – Vis ikkje identiske linjer.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update – Bruk berre oppdateringsmedium.\n"
@@ -1574,88 +1697,99 @@ msgid " --group - group\n"
msgstr " --group – Gruppe.\n"
#: ../urpmf:72
+#, fuzzy, c-format
+msgid " --license - license\n"
+msgstr " --name – Pakkenamn.\n"
+
+#: ../urpmf:73
#, c-format
msgid " --name - package name\n"
msgstr " --name – Pakkenamn.\n"
-#: ../urpmf:73
+#: ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes – Utdatert-merkelappar.\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr " --packager – Pakkebyggjar.\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr " --provides – Tilbod-merkelappar.\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr " --requires – Krev-merkelappar.\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, c-format
msgid " --size - installed size\n"
msgstr " --size – Installert storleik.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm – Namn på kjelde-RPM.\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes – Utdatert-merkelappar.\n"
+
+#: ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr " --summary, -S – Samandrag.\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, c-format
msgid " --url - url\n"
msgstr " --url - Adresse.\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, c-format
msgid " --vendor - vendor\n"
msgstr " --vendor – Leverandør.\n"
-#: ../urpmf:82
+#: ../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:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f – Vis versjon-, utgåve og arkitekturinformasjon.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Ugyldig format: Du kan berre bruka éin fleirverdi-merkelapp."
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "Brukar eigedefinert miljø på «%s»\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
-msgstr "Merk: urpmf fann ingen treff sidan ingen av media brukar «hdlist»-er.\n"
+msgstr ""
+"Merk: urpmf fann ingen treff sidan ingen av media brukar «hdlist»-er.\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Du kan bruka «--name» for å søkja etter pakkenamn.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1672,12 +1806,13 @@ msgstr ""
"\n"
"Bruk:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, 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"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
@@ -1686,27 +1821,28 @@ msgstr ""
" --auto – Ikkje-interaktiv modus. Anta standardsvar på alle "
"spørsmål.\n"
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../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"
-#: ../urpmi:93
+#: ../urpmi:89
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr " --auto-update – Oppdater media, og oppdater så systemet.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum – Ikkje bruk md5sum-kontroll.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key – Tving oppdatering av GPG-nøkkel.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1715,12 +1851,12 @@ msgstr ""
" --no-uninstall – Be aldri om å avinstallera ein pakke, men avbryt "
"installeringa.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install – Ikkje installer pakkar (berre last dei ned)\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1729,7 +1865,7 @@ msgstr ""
" --keep – Behald eksisterande pakkar viss mogleg. Ikkje installer\n"
" pakkar som krev fjerning av andre pakkar.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1741,37 +1877,43 @@ msgstr ""
" pakkar skal installerast eller oppdaterast. "
"Standardverdi: %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length – Transaksjonslengd: Standardverdi: %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy – Bruk òg ikkje-ordrett søk.\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src – Neste pakke er ein kjeldepakke.\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr " --install-src – Berre installer kjeldepakkar.\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean – Fjern rpm-filer frå mellomlager først.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean – Behald rpm-filer i mellomlager.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1780,7 +1922,7 @@ msgstr ""
" --allow-nodeps – Tillèt å spørja brukarar å installera pakkar\n"
" utan sjekking av avhengnader.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1789,12 +1931,12 @@ msgstr ""
" --allow-force – Tillèt å spørja brukarar å installera pakkar\n"
" utan sjekking av avhengnader og integritet.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root – Bruk anna rot for rpm-installering.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1804,47 +1946,47 @@ msgstr ""
" Nyttig for installering av ei «chroot» med «--root»-"
"valet.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget – Bruk wget til å henta fjerntliggjande filer.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl – Bruk curl til å henta fjerntliggjande filer.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --prozilla – Bruk prozilla til å henta fjerntliggjande filer.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr " --curl-options – Tillegsval som skal sendast til «curl».\n"
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr " --rsync-options– Tilleggsval som skal sendast til «rsync».\n"
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr " --wget-options – Tilleggsval som skal sendast til «wget».\n"
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr " --prozilla-options – Tillegsval som skal sendast til «prozilla».\n"
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate – Avgrens nedlastingsfart.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1853,7 +1995,7 @@ msgstr ""
" --resume – Ta opp att delvis nedlasta filer. (Bruk\n"
" «--no-resume» for å slå av. Standard er avslått.)\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1862,7 +2004,7 @@ msgstr ""
" --proxy – Bruk valt HTTP-mellomtenar. Standard portnummer: 1080.\n"
" (Format: <tenarnamn[:port]>.)\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1871,14 +2013,14 @@ msgstr ""
" --proxy-user – Vel brukar og passord for mellomtenar-\n"
" autentisering. (Format: <brukar:passord>.)\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
" next arg.\n"
msgstr " --bug – Skriv feilrapport i mappa valt av neste argument.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1888,93 +2030,100 @@ msgstr ""
" (Bruk «--no-verify-rpm» til ikkje å kontrollera.\n"
" Standard er å kontrollera,)\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr " --test – Berre kontroller at installeringa kan fungera.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath – Hopp over stig (kommadelt liste).\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs – Ikkje ta med hjelpefiler.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --ignoresize – Ikkje kontroller at det er nok ledig diskplass før "
"installering.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
-msgstr " --ignorearch – Tillèt å installera pakkar for andre arkitekturar.\n"
+msgstr ""
+" --ignorearch – Tillèt å installera pakkar for andre arkitekturar.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts – Ikkje køyr pakkeskript.\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip – Pakkar som installasjonen skal hoppa over.\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip – Pakkar som installasjonen skal hoppa over.\n"
+
+#: ../urpmi:146
#, c-format
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:150
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock – Ikkje lås pakkedatabasen.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch – Berre oppgrader pakkar med same arkitektur.\n"
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a – Vel alle treff på kommandolinja.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p – Tillèt søk i tilbod for å finna pakkar.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P – Ikkje søk i tilbod for å finna pakkar.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q – Stillemodus.\n"
-#: ../urpmi:157
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " Namn og rpm-filer valt på kommandolinja vert installerte.\n"
-#: ../urpmi:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr "Feil: Kan ikkje bruka «auto-select» saman med pakkeliste.\n"
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -1983,12 +2132,12 @@ msgstr ""
"Feil: For å laga ein feilrapport kan du bruka dei vanlege "
"kommandolinjeargumenta, og så leggja til «--bug».\n"
-#: ../urpmi:220
+#: ../urpmi:218
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "Du kan ikkje installera binærpakkar med «--install-src»."
-#: ../urpmi:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -1997,7 +2146,7 @@ msgstr ""
"Mappa [%s] finst allerie. Bruk ei anna mappe for feilrapport, eller slett "
"denne."
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Klarte ikkje laga mappe [%s] for feilrapport."
@@ -2007,7 +2156,7 @@ msgstr "Klarte ikkje laga mappe [%s] for feilrapport."
msgid "Environment directory %s does not exist"
msgstr "Miljømappa «%s» finst ikkje."
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2016,46 +2165,48 @@ msgstr ""
"Feil: %s ser ut til å vera montert som skriveverna.\n"
"Bruk «--allow-force» for å tvinga gjennom operasjonen."
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr "Oppdaterer medium ...\n"
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (oppgradering)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (oppgradering)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (installering)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, c-format
msgid "%s (to install)"
msgstr "%s (installering)"
-#: ../urpmi:447
+#: ../urpmi:454
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "På grunn av avhengnader til «%s» treng du éin av desse pakkane:"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Kven av dei vil du ha? (1–%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2066,7 +2217,7 @@ msgstr ""
"som er eldre enn dei installerte pakkane:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2077,7 +2228,7 @@ msgstr ""
"som er eldre enn dei installerte pakkane:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, c-format
msgid ""
"\n"
@@ -2086,12 +2237,12 @@ msgstr ""
"\n"
"Vil du likevel halda fram?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (J/N) "
-#: ../urpmi:503
+#: ../urpmi:520
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2100,7 +2251,7 @@ msgstr ""
"Éin av pakkane kan ikkje installerast:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2109,7 +2260,7 @@ msgstr ""
"Nokre av pakkane kan ikkje installerast:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2120,7 +2271,7 @@ msgstr ""
"for at andre skal kunna oppgraderast:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2131,7 +2282,7 @@ msgstr ""
"for at andre skal kunna oppgraderast:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2140,7 +2291,7 @@ msgstr ""
"Denne pakken må fjernast for at andre skal kunna oppgraderast:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2149,12 +2300,17 @@ msgstr ""
"Desse pakkane må fjernast for at andre skal kunna oppgraderast:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(Berre ein test. Pakkane vert ikkje fjerna.)"
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2163,111 +2319,29 @@ msgstr ""
"Du må vera «root»-brukar for å kunna installera desse avhengnadene:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(Berre ein test. Pakkane vert ikkje installerte.)"
-#: ../urpmi:597
+#: ../urpmi:617
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Vil du halda fram med installeringa av pakken?"
msgstr[1] "Vil du halda fram med installeringa av dei %d pakkane?"
-#: ../urpmi:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Trykk så «Enter» ..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Avbryt"
-#: ../urpmi:671
-#, c-format
-msgid "The following package has bad signature"
-msgstr "Denne pakken har ugyldig signatur"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Desse pakkane har ugyldige signaturar"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Vil du halda fram med å installera?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Feil ved installering"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "Fordeler %s."
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "Installerer %s frå %s."
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "Installerer %s."
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Vil du installera utan å kontrollera avhengnader? (J/N) "
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Vil du prøva endå sterkare å installera («--force»)? (J/N) "
-
-#: ../urpmi:815
-#, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d mislykka installasjonstransaksjon."
-msgstr[1] "%d mislykka installasjonstransaksjonar."
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Det går an å installera."
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr "Pakkane er i nyaste versjon"
-
-#: ../urpmi:838
-#, c-format
-msgid "Package %s is already installed"
-msgstr "Pakken «%s» er alt installert."
-
-#: ../urpmi:839
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Pakkane «%s» er alt installerte."
-
-#: ../urpmi:842
-#, c-format
-msgid "Package %s can not be installed"
-msgstr "Pakken «%s» kan ikkje installerast."
-
-#: ../urpmi:843
-#, c-format
-msgid "Packages %s can not be installed"
-msgstr "Pakkane «%s» kan ikkje installerast."
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "Startar urpmi på nytt."
@@ -2334,7 +2408,8 @@ msgstr ""
#: ../urpmi.addmedia:61
#, 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:62
#, c-format
@@ -2372,7 +2447,8 @@ msgstr " --nopubkey – Ikkje importer offentlegnøkkel til nytt medium.\n"
#: ../urpmi.addmedia:69
#, 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:70 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
@@ -2394,32 +2470,32 @@ msgstr " -v – Utvida meldingar.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "Klarte ikkje oppdatera mediet «%s».\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr "Ugyldig <adresse> (for lokale mapper må adressa vera absolutt)."
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Berre superbrukaren kan leggja til medium."
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, c-format
msgid "creating config file [%s]"
msgstr "Lagar oppsettfil [%s]."
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "Kan ikkje laga oppsettfil [%s]."
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "Treng ikkje oppgi «relativ stig til «hdlist»> med «--distrib»-valet"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
@@ -2428,17 +2504,17 @@ msgstr ""
"\n"
"Ønskjer du å leggja til mediet «%s»?"
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "Manglar <relativ stig til «hdlist»>.\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr "Kan ikkje bruka «%s» med fjernmedium."
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "Klarte ikkje laga mediet «%s».\n"
@@ -2472,13 +2548,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
@@ -2602,19 +2680,19 @@ msgstr " -a – Vel alle medium.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y – Ikkje-ordrett søk på medienamn.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Berre superbrukaren kan fjerna medium."
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr ""
"Det finst ingenting som kan fjernast. (Bruk «urpmi.addmedia» til å leggja "
"til eit medium.)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2654,8 +2732,10 @@ msgstr " --no-ignore – Ikkje oppdater, og bruk mediet i framtida.\n"
#: ../urpmi.update:47
#, c-format
-msgid " --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
-msgstr " --probe-rpms – Ikkje bruk «synthesis»/«hdlist»; bruk rpm-filer direkte.\n"
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr ""
+" --probe-rpms – Ikkje bruk «synthesis»/«hdlist»; bruk rpm-filer direkte.\n"
#: ../urpmi.update:48
#, c-format
@@ -2667,19 +2747,19 @@ msgstr " -a – Vel alle ikkje-fjernbare medium.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f – Tving oppdatering av «synthesis»/«hdlist».\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Berre superbrukaren kan oppdatera medium."
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
"Det finst ingenting å oppdatera. (Bruk «urpmi.addmedia» til å leggja til "
"medium.)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2688,22 +2768,22 @@ msgstr ""
"Manglar oppføringa som skal oppdaterast\n"
"(éin av %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "«%s»."
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "Hoppar over mediet «%s»."
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "Brukar mediet «%s»."
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2720,68 +2800,72 @@ msgstr ""
"\n"
"Bruk:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
"packages.\n"
msgstr " --searchmedia – Berre sjå etter pakkar i dette mediet.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy – Bruk òg ikkje-ordrett søk (same som «-y»).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list – Vis oversikt over tilgjengelege pakkar.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media – Vis oversikt over tilgjengelege medium.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, 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:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr " --list-nodes – Vis tilgjengelege nodar ved bruk av «--parallel».\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases – Vis oversikt over tilgjengelege parallellalias.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, 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"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr " --src – Neste pakke er ein kjeldepakke (same som «-s»).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, 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"
-#: ../urpmq:68
+#: ../urpmq:65
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
-msgstr " --ignorearch – Tillèt førespurnad etter pakkar for andre arkitekturar.\n"
+msgstr ""
+" --ignorearch – Tillèt førespurnad etter pakkar for andre arkitekturar.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2790,22 +2874,22 @@ msgstr ""
" --use-distrib – Set opp urpmi direkte frå eit distribusjonstre.\n"
" Med dette kan du gjera spørjingar på ein distribusjon.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog – Vis endringslogg.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S – Vis samandrag.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires – Omvendt søk etter kva som krev pakken.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2814,7 +2898,7 @@ msgstr ""
" --whatrequires-recursive\n"
" – Utvida omvendt søk (òg virtuelle pakkar).\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, c-format
msgid ""
" --whatprovides, -p\n"
@@ -2823,47 +2907,49 @@ msgstr ""
" --whatprovides, -p\n"
" - Tillèt søk i tilbod for å finna pakke.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, 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:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d – Utvid spørjing til pakkeavhengnader.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g – Vis òg grupper med namnet.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i – Vis nyttig informasjon i lettlesbart format.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l – Vis oversikt over filer i pakken.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, c-format
msgid " -m - equivalent to -du\n"
msgstr " -m – Det same som «-du».\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r – Vis òg versjonsinformasjon med namnet.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
-msgstr " -s – Neste pakke er ein kjeldepakke (same som «--src»).\n"
+msgstr ""
+" -s – Neste pakke er ein kjeldepakke (same som «--src»).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2872,51 +2958,67 @@ msgstr ""
" -u – Fjern pakkar viss nyare versjonar allereie er "
"installerte.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y – Bruk òg ikkje-ordrett søk (same som «-fuzzy»).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, 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:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " namn og rpm-filer gitt på kommandolinja vert førespurd.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "Kan berre bruka «--list-nodes« saman med «--parallel»."
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr "Inga «hdlist» for mediet «%s». Berre delvis resultat for pakken «%s»."
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr "Inga «hdlist» for mediet «%s». Berre delvis resultat for pakkane «%s»."
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgstr "Inga «hdlist» for mediet «%s». Kan ikkje visa resultat for pakken «%s»."
+msgstr ""
+"Inga «hdlist» for mediet «%s». Kan ikkje visa resultat for pakken «%s»."
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
-msgid "no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr "Inga «hdlist» for mediet «%s». Kan ikkje visa resultat for pakkane «%s»."
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"Inga «hdlist» for mediet «%s». Kan ikkje visa resultat for pakkane «%s»."
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Fann ikkje endringslogg.\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Desse pakkane har ugyldige signaturar:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Vil du likevel halda fram med å installera?"
+
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Du må vera «root»-brukar for å kunna bruka «--use-distrib»."
@@ -3103,4 +3205,3 @@ msgstr "Fann ikkje endringslogg.\n"
#~ msgid "The following package names were assumed: %s"
#~ msgstr "Antok desse pakkenamna: %s"
-
diff --git a/po/pa_IN.po b/po/pa_IN.po
index b01cfea3..8e4ce367 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+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"
@@ -17,7 +17,7 @@ msgstr ""
"X-Generator: KBabel 1.9.1\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "RPM ਇੰਸਟਾਲੇਸ਼ਨ"
@@ -27,7 +27,7 @@ msgstr "RPM ਇੰਸਟਾਲੇਸ਼ਨ"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "ਠੀਕ ਹੈ(_O)"
@@ -93,7 +93,7 @@ msgstr "ਇੰਸਟਾਲ(_I)"
msgid "_Save"
msgstr "ਸੰਭਾਲੋ(_S)"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "ਰੱਦ(_C)"
@@ -115,17 +115,17 @@ msgstr ""
msgid "No packages specified"
msgstr "ਕੋਈ ਪੈਕੇਜ %s ਨਾਂ ਨਾਲ ਨਹੀਂ"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "ਕਿਰਪਾ ਕਰਕੇ ਇੰਤਜ਼ਾਰ ਕਰੋ..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "ਪ੍ਰਬੰਧਕ (root) ਬਣਨਾ ਪਵੇਗਾ"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -136,42 +136,42 @@ msgstr ""
"%s\n"
"ਜਾਰੀ ਰੱਖਣਾ ਹੈ?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "ਚੇਤਾਵਨੀ"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "ਠੀਕ ਹੈ"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (ਨਵੀਨੀਕਰਨ ਕਰਨ ਲਈ)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (ਇੰਸਟਾਲ ਕਰਨ ਲਈ)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜਾਂ ਦੀ ਲੋੜ ਹੈ:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "ਛੱਡੋ(_A)"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -182,13 +182,13 @@ msgstr ""
"%s\n"
"ਕੀ ਜਾਰੀ ਰੱਖਣਾ ਹੈ?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "ਨਿਰਭਰਤਾ ਹੱਲ ਕਰਨ ਲਈ, ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜ ਇੰਸਟਾਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ (%d ਮੈਬਾ)"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -196,46 +196,49 @@ msgstr ""
"ਨਿਰਭਰਤਾ ਸਮਾਪਤ ਕਰਨ ਲਈ, %d ਪੈਕੇਜ ਇੰਸਟਾਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ:\n"
"%s\n"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "ਪੈਕੇਜ ਇੰਸਟਾਲੇਸ਼ਨ..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "ਸਰੋਤ ਪੈਕੇਜ ਪ੍ਰਾਪਤ ਕਰਨ ਤੋਂ ਅਸਫਲ, ਅਧੂਰਾ ਛੱਡਿਆ ਜਾਦਾ ਹੈ"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "`%s' (%s/%s) ਪੈਕੇਜ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "ਕਿਪਾ ਕਰਕੇ \"%s\" ਨਾਂ ਮਾਧਿਅਮ [%s] ਜੰਤਰ ਵਿੱਚ ਪਾਓ"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "`%s' ਪੈਕੇਜ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜਾਂ ਤੇ ਗਲਤ ਦਸਤਖਤ ਹਨ:\n"
-"%s\n"
-"ਕੀ ਤੁਸੀਂ ਇੰਸਟਾਲੇਸ਼ਨ ਜਾਰੀ ਰੱਖਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
+msgid "_Done"
+msgstr "ਸਮਾਪਤ(_D)"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -246,41 +249,27 @@ msgstr ""
"%s\n"
"ਤੁਸੀਂ ਆਪਣੇ urpmi ਡਾਟਾਬੇਸ ਦਾ ਨਵੀਨੀਕਰਨ ਕਰ ਸਕਦੇ ਹੋ"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "%s ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "`%s' (%s/%s) ਪੈਕੇਜ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "ਸਮਾਪਤ(_D)"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਅਸਫਲ ਹੋਈ"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "ਇੰਸਟਾਲੇਸ਼ ਸਮਾਪਤ"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "%s ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -315,7 +304,7 @@ msgstr " -g - print groups with name also.\n"
msgid " defaults to %s.\n"
msgstr " %s ਮੂਲ ਹੈ।\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "ਸਿਰਫ਼ ਪ੍ਰਬੰਧਕ ਨੂੰ ਪੈਕੇਜ ਇੰਸਟਾਲ ਕਰਨ ਦੀ ਇਜ਼ਾਜਤ ਹੈ"
@@ -325,98 +314,98 @@ msgstr "ਸਿਰਫ਼ ਪ੍ਰਬੰਧਕ ਨੂੰ ਪੈਕੇਜ ਇੰਸ
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "rpmdb ਖੋਲਣ ਲਈ ਅਸਫਲ"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "ਗਲਤ rpm ਫਾਇਲ ਨਾਂ [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "rpm ਫਾਇਲ [%s] ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਅਸਫਲ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...ਪ੍ਰਾਪਤੀ ਹੋਈ"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...ਪ੍ਰਾਪਤੀ ਅਸਫਲ: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "rpm ਫਾਇਲ [%s] ਖੋਲਣ ਲਈ ਅਸਫਲ"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "ਫਾਇਲ [%s] ਵਿੱਚ \"%s\" ਨੂੰ ਪਾਰਸ ਕਰਨ ਲਈ ਅਸਫਲ"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "rpm ਫਾਇਲ ਰਜਿਸਟਰ ਕਰਨ ਲਈ ਅਸਫਲ"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "ਸਥਾਨਕ ਪੈਕੇਜ ਰਜਿਸਟਰ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "ਕਮਾਂਡ ਸਤਰ ਤੇ ਗਲਤ ਪਰਾਕਸੀ ਪ੍ਰਗਟਾ\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: rpm ਫਾਇਲ \"%s\" ਪੜੀ ਨਹੀਂ ਜਾ ਸਕਦੀ\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "ਮਾਧਿਅਮ \"%s\" ਲਈ hdlist ਸੰਸਲੇਸ਼ਕ ਫਾਇਲ ਬਣਾਈ"
@@ -605,7 +594,12 @@ msgstr "ਪੈਕੇਜ %s ਨਹੀਂ ਲੱਭਿਆ ਹੈ।"
msgid "malformed URL: [%s]"
msgstr "ਗਲਤ ਇੰਪੁੱਟ: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "ਮਾਧਿਅ \"%s\" ਤੋਂ rpm ਫਾਇਲਾਂ ਪ੍ਰਾਪਤ ਕੀਤੀਆਂ ਜਾਦੀਆਂ ਹਨ..."
@@ -615,43 +609,48 @@ msgstr "ਮਾਧਿਅ \"%s\" ਤੋਂ rpm ਫਾਇਲਾਂ ਪ੍ਰਾਪ
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr "%s ਤੇ ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਸੰਚਾਰ ਬਣਾਇਆ (ਹਟਾਏ=%d, ਇੰਸਟਾਲ=%d, ਨਵੀਨੀਕਰਨ=%d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "ਸੰਚਾਰ ਕਰਨ ਲਈ ਅਸਫਲ"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "ਪੈਕੇਜ %s ਹਟਾਉਣ ਲਈ ਅਸਫਲ"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "%s ਪੈਕੇਜ ਸ਼ਾਮਲ ਕਰਨ ਲਈ (id=%d, eid=%d, update=%d, file=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "ਪੈਕੇਜ %s ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਅਸਫਲ"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "ਪੈਕੇਜ %s ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "ਪੈਕੇਜ %s ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "%s ਨੂੰ %s ਤੋਂ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾਦਾ ਹੈ"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "ਪੈਕੇਜ %s ਬਾਰੇ ਵਧੇਰੇ ਜਾਣਕਾਰੀ"
@@ -681,11 +680,103 @@ msgstr "ਕੋਈ ਪੈਕੇਜ %s ਨਾਂ ਨਾਲ ਨਹੀਂ"
msgid "Cannot connect to ldap uri:"
msgstr ""
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "urpmi ਡਾਟਾਬੇਸ ਤਾਲਾਬੰਦ ਹੈ"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "ਚੇਤਾਵਨੀ"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "urpmi ਡਾਟਾਬੇਸ ਤਾਲਾਬੰਦ ਹੈ"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜਾਂ ਤੇ ਗਲਤ ਦਸਤਖਤ ਹਨ"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜਾਂ ਤੇ ਗਲਤ ਦਸਤਖਤ ਹਨ"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "ਕੀ ਤੁਸੀਂ ਇੰਸਟਾਲੇਸ਼ਨ ਨਾਲ ਜਾਰੀ ਰਹਿਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਅਸਫਲ ਹੋਈ"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "%s ਵੰਡਿਆ ਜਾਦਾ ਹ"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "%s ਨੂੰ %s ਤੋਂ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾਦਾ ਹੈ"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "%s ਇੰਸਟਾਲੇਸ਼ਨ ਜਾਰੀ"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "ਬਿਨਾਂ ਨਿਰਭਰਤਾਂ ਦੇ ਇੰਸਟਾਲੇਸ਼ਨ ਲਈ ਕੋਸ਼ਿਸ ਕਰਨੀ ਹੈ? (y/N) "
+
+#: ../urpm/main_loop.pm:205
+#, fuzzy, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਨੂੰ ਧੱਕੇ ਨਾਲ ਵਰਤਣਾ ਹੈ (--force)? (y/N) "
+
+#: ../urpm/main_loop.pm:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d ਇੰਸਟਾਲੇਸ਼ਨ ਸੰਚਾਰ ਅਸਫਲ"
+msgstr[1] "%d ਇੰਸਟਾਲੇਸ਼ਨ ਸੰਚਾਰ ਅਸਫਲ"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਸੰਭਵ ਹੈ"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -734,7 +825,7 @@ msgstr "ਨਾ-ਮੌਜੂਦ ਮਾਧਿਅਮ \"%s\" ਨੂੰ ਚੁਣਨ
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "ਮਾਧਿਅਮ \"%s\" ਲਈ hdlist ਸੰਸਲੇਸ਼ਕ ਫਾਇਲ ਬਣਾਈ"
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "\"%s\" ਦੀ hdlist ਫਾਇਲ ਲਈ ਪਹੁੰਚ ਤੋਂ ਅਸਫਲ ਹੈ, ਮਾਧਿਅਮ ਛੱਡਿਆ ਜਾਦਾ ਹੈ"
@@ -825,7 +916,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "ਖੋਜ ਸ਼ੁਰੂ: %s ਅੰਤ: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "ਨਿਰਭਰਤਾ ਦੇ ਦੂਜੇ ਪੜਾ ਲਈ ਜਾਂਚ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ\n"
@@ -890,67 +981,72 @@ msgstr "rpmdb ਖੋਲਣ ਲਈ ਅਸਫਲ"
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "ਪਹਿਲੇ ਇੰਸਟਾਲੇਸ਼ਨ ਮਾਧਿਅਮ ਨੂੰ ਕੋਲਣ ਲ਼ਈ ਅਸਫਲ (ਕੋਈ hdlists ਫਾਇਲ ਨਹੀਂ ਲੱਭੀ)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "ਨਾ-ਮੌਜੂਦ ਮਾਧਿਅਮ \"%s\" ਨੂੰ ਚੁਣਨ ਦੀ ਕੋਸ਼ਿਸ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "ਕਈ ਮਾਧਿਅਮ ਚੁਣੇ ਜਾ ਰਹੇ ਹਨ: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "ਮਾਧਿਅਮ \"%s\" ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "\"%s\" ਮਾਧਿਅਮ ਲਈ urpmi ਮੁੜ-ਸੰਰਚਨਾ"
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...ਮੁੜ-ਸੰਰਚਨਾ ਅਸਫਲ"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "ਮੁੜ ਸੰਰਚਨਾ ਹੋਈ"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "ਮਾਧਿਅਮ \"%s\" ਚੁਣਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "hdlist ਫਾਇਲ [%s] ਪੜਤਾਲ ਜਾਰੀ"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "ਸ਼ੰਸਲੇਸ਼ਨ ਫਾਇਲ [%s] ਪੜਤਾਲ ਜਾਰੀ"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "hdlist [%s] ਨਿਰਮਾਣ ਜਾਰੀ"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -959,77 +1055,77 @@ msgstr ""
"ਮਾਧਿਅਮ \"%s\" ਲਈ ਸੰਸਲੇਸ਼ਣ ਫਾਇਲ ਬਣਾਉਣ ਲਈ ਅਸਫਲ ਹੈ। ਤੁਹਾਡੀ hdlist ਫਾਇਲ ਨਿਕਾਰਾ ਹੋ ਸਕਦੀ "
"ਹੈ।"
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "ਮਾਧਿਅਮ \"%s\" ਲਈ hdlist ਜਾਂ ਸੰਸਲੇਸ਼ਣ ਫਾਇਲ ਪੜਨ ਦੌਰਾਨ ਸਮੱਸਿਆ"
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "\"%s\" ਮਾਧਿਅਮ ਲਈ list ਫਾਇਲ ਲਿਖੀ ਜਾ ਰਹੀ ਹੈ"
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...ਨਕਲ ਅਸਫਲ"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "\"%s\" ਦੀ ਵੇਰਵਾ ਫਾਇਲ ਦੀ ਨਕਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...ਨਕਲ ਹੋਈ"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "[%s] ਦੀ ਨਕਲ ਅਸਫਲ (ਫਾਇਲ ਸ਼ੱਕੀ ਰੂਪ ਵਿੱਚ ਛੋਟੀ ਹੈ)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "ਸਰੋਤ hdlist (ਜਾਂ ਸੰਸਲੇਸ਼ਣ) ਨਕਲਾਂ ਦੇ md5sum ਕੱਢਿਆ ਜਾਦਾ ਹੈ"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "[%s] ਦੀ ਨਕਲ ਅਸਫਲ (md5sum ਮੇਲ ਨਹੀਂ ਖਾਂਦਾ)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "ਪ੍ਰਾਪਤ ਸਰੋਤ hdlist (ਜਾਂ ਸੰਸਲੇਸ਼ਣ) ਦਾ md5sum ਕੱਢਿਆ ਜਾਦਾ ਹੈ"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...ਪ੍ਰਾਪਤੀ ਅਸਫਲ: md5sum ਮੇਲ ਨਹੀਂ ਖਾਂਦਾ"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "[%s] ਤੇ ਕੋਈ rpm ਫਾਇਲਾਂ ਨਹੀਂ ਲੱਭੀਆਂ ਹਨ"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "[%s] ਤੋਂ rpm ਫਾਇਲਾਂ ਪੜੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "[%s] ਲਈ rpm ਫਾਇਲਾਂ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਅਸਫਲ: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "ਕੋਈ rpm ਨਹੀਂ ਪੜਿਆ"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1039,74 +1135,74 @@ msgstr ""
"ਮਾਧਿਅਮ \"%s\" ਲਈ ਪਹੁੰਚ ਆਯੋਗ,\n"
"ਇਹ ਤਾਂ ਹੋ ਸਕਦਾ ਹੈ, ਜੇਕਰ ਤੁਸੀਂ ਮਾਧਿਅਮ ਬਣਾਉਣ ਦੌਰਾਨ ਡਾਇਰੈਕਟਰੀ ਖੁਦ ਮਾਊਟ ਕੀਤੀ ਹੈ।"
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ਮਾਧਿਅਮ \"%s\" ਲਈ hdlist ਫਾਇਲ ਨਹੀਂ ਮਿਲੀ"
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "\"%s\" ਲਈ hdlist (ਜਾਂ ਸੰਸਲੇਸ਼ਨ) ਪ੍ਰਾਪਤ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "%s ਵਾਂਗ hdlist (ਜਾਂ ਸੰਸਲੇਸ਼ਨ) ਖੋਜੀ ਗਈ"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "ਮਾਧਿਅਮ \"%s\" ਲਈ hdlist ਫਾਇਲ ਨਹੀਂ ਮਿਲੀ"
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "\"%s\" ਦੀ ਸਵਰਜਨਕ ਕੁੰਜੀ ਫਾਇਲ ਵੇਖੀ ਜਾਦੀ ਹੈ..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...\"%s\" ਦੀ ਸਰਵਜਨਕ ਕੁੰਜੀ ਤੋਂ %s ਕੁੰਜੀ ਆਯਾਤੀ ਕੀਤੀ"
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "\"%s\" ਦੀ ਸਵਰਜਨਕ ਕੁੰਜੀ ਆਯਾਤ ਕਰਨੀ ਅਸਫਲ"
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "\"%s\" ਮਾਧਿਅਮ ਲਈ list ਫਾਇਲ ਲਿਖੀ ਜਾ ਰਹੀ ਹੈ"
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "ਮਾਧਿਅਮ %s ਸ਼ਾਮਲ"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "\"%s\" ਦੀ hdlist ਫਾਇਲ ਪਾਰਸ ਕਰਨ ਲਈ ਅਸਫਲ਼"
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "\"%s\" ਮਾਧਿਅਮ ਦੀ ਸੰਸਲੇਸ਼ਨ ਫਾਇਲ ਪੜਨ ਦੌਰਾਨ ਸਮੱਸਿਆ"
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "ਮਾਧਿਅਮ \"%s\" ਤੋਂ ਸਿਰਲੇਖ ਵੇਖੇ ਜਾ ਰਹੇ ਹਨ"
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "Yy"
@@ -1166,47 +1262,52 @@ msgstr "ਨਾ-ਠੀਕ ਮਾਧਿਅਮ \"%s\" ਨੂੰ ਹਟਾਉਣਯ
msgid "unable to access medium \"%s\""
msgstr "ਮਾਧਿਅਮ \"%s\" ਨੂੰ ਵਰਤਣ ਲਈ ਅਸਫਲ"
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "ਕੋਈ ਪੈਕੇਜ %s ਨਾਂ ਨਾਲ ਨਹੀਂ"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜਾਂ ਵਿੱਚ %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "ਗੁੰਮ %s ਹੋਣ ਕਰਕੇ"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "ਨਾ-ਪੂਰਾ %s ਹੋਣ ਕਰਕੇ"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "%s ਨੂੰ ਵਧਾਉਣ ਦੀ ਕੋਸ਼ਿਸ ਦੌਰਾਨ"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "%s ਰੱਖਣ ਲਈ"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "%s ਨੂੰ ਇੰਸਟਾਲ ਕਰਨ ਲਈ"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "%s ਨਾਲ ਅਪਵਾਦ ਕਰਕੇ"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "ਨਾ-ਮੰਗੇ"
@@ -1226,6 +1327,16 @@ msgstr "ਗਲਤ ਕੁੰਜੀ ID (%s)"
msgid "Missing signature (%s)"
msgstr "ਦਸਤਖਤ (%s) ਗੁੰਮ ਹਨ"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "ਫਾਇਲ [%s] ਲਿਖਣ ਲਈ ਅਸਫਲ"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "ਨਕਲ ਕਰਨੀ ਅਸਫਲ"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1242,8 +1353,8 @@ msgstr ""
"\n"
"ਵਰਤੋਂ:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1258,19 +1369,19 @@ msgstr " --auto - automatically select a package in choices.\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - verify if the removal can be achieved correctly.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr ""
" --force - force invocation even if some packages do not exist.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - distributed urpmi across machines of alias.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - print tag packager: packager.\n"
@@ -1280,8 +1391,8 @@ msgstr " --packager - print tag packager: packager.\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - use another root for rpm removal.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - use another root for rpm installation.\n"
@@ -1300,17 +1411,17 @@ msgstr ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
" to (un)install a chroot with --root option.\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - try to find and use synthesis file.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - try to find and use hdlist file.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - verbose mode.\n"
@@ -1320,37 +1431,37 @@ msgstr " --verbose - verbose mode.\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - select all packages matching expression.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "ਸਿਰਫ਼ ਪ੍ਰਬੰਧਕ ਹੀ ਪੈਕੇਜ ਹਟਾ ਸਕਦੇ ਹਨ"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "ਅਣਜਾਣ ਪੈਕੇਜ"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "ਅਣਜਾਣ ਪੈਕੇਜ"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "ਪੈਕੇਜ %s ਹਟਾਉਣ ਨਾਲ ਤੁਹਾਡਾ ਸਿਸਟਮ ਖਰਾਬ ਹੋ ਜਾਵੇਗਾ"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "ਹਟਾਉਣ ਲਈ ਕੁਝ ਨਹੀਂ"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜ ਹਟਾਉਣ ਲਈ ਪੜਤਾਲ ਜਾਰੀ ਹੈ"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1358,24 +1469,24 @@ msgid_plural ""
msgstr[0] "ਨਿਰਭਰਤਾ ਹੱਲ਼ ਕਰਨ ਲਈ, %d ਪੈਕੇਜ ਹਟਾਏ ਜਾਣਗੇ (%d ਮੈਬਾ)"
msgstr[1] "ਨਿਰਭਰਤਾ ਹੱਲ਼ ਕਰਨ ਲਈ, %d ਪੈਕੇਜ ਹਟਾਏ ਜਾਣਗੇ (%d ਮੈਬਾ)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "ਪੈਕੇਜ %s ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
msgstr[1] "ਪੈਕੇਜ %s ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (y/N) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "ਹਟਾਉਣਾ ਅਸਫਲ"
@@ -1401,14 +1512,14 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --help - print this help message.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, fuzzy, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - use specific environment (typically a bug\n"
" report).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr " --excludemedia - do not use the given media, separated by comma.\n"
@@ -1419,12 +1530,12 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../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"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1436,7 +1547,7 @@ msgstr ""
msgid " --use-distrib - use the given path to access media\n"
msgstr " --synthesis - use the given synthesis instead of urpmi db.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - use the given synthesis instead of urpmi db.\n"
@@ -1446,7 +1557,7 @@ msgstr " --synthesis - use the given synthesis instead of urpmi db.\n"
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - do not print identical lines twice.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - use only update media.\n"
@@ -1582,75 +1693,85 @@ msgstr " --group - print tag group: group.\n"
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr " --name - print only package names.\n"
#: ../urpmf:73
#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr " --name - print only package names.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - print tag obsoletes: all obsoletes.\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr " --packager - print tag packager: packager.\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, fuzzy, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - print tag provides: all provides.\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, fuzzy, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - print tag requires: all requires.\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --size - print tag size: size.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, fuzzy, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - print tag sourcerpm: source rpm.\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - print tag obsoletes: all obsoletes.\n"
+
+#: ../urpmf:81
#, fuzzy, c-format
msgid " --summary - summary\n"
msgstr " --summary - print tag summary: summary.\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr " --url - print tag url: url.\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr " --verbose - verbose mode.\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -l - list files in package.\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - print version, release and arch with name.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "%s ਤੇ ਖਾਸ ਵਾਤਾਵਰਣ ਦੀ ਵਰਤੋਂ ਕਰਕੇ\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1659,12 +1780,12 @@ msgstr ""
"ਸੂਚਨਾ: ਕਿਉਕਿ hdlists ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਕੋਈ ਮਾਧਿਅਮ ਨਹੀਂ ਲੱਭਿਆ, ਇਸਕਰਕੇ urpmf ਵਲੋਂ ਕੋਈ ਨਤੀਜਾ "
"ਨਹੀਂ\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "ਤੁਸੀਂ ਪੈਕੇਜ ਨਾਂ ਖੋਜਣ ਲਈ --name ਵਰਤ ਸਕਦੇ ਹੋ।\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1680,7 +1801,7 @@ msgstr ""
"\n"
"ਵਰਤੋਂ:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1688,37 +1809,37 @@ msgstr ""
" --searchmedia - use only the given media to search requested (or updated) "
"packages.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr ""
" --auto-select - automatically select packages to upgrade the system.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
" --auto-select - automatically select packages to upgrade the system.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, fuzzy, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - disable MD5SUM file checking.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, fuzzy, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - force update of gpg key.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1727,12 +1848,12 @@ msgstr ""
" --no-uninstall - never ask to uninstall a package, abort the "
"installation.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, fuzzy, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --install-src - install only source package (no binaries).\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1741,7 +1862,7 @@ msgstr ""
" --keep - keep existing packages if possible, reject requested\n"
" packages that lead to removals.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1752,37 +1873,43 @@ msgstr ""
" are going to be installed or upgraded,\n"
" default is %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - small transaction length, default is %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, fuzzy, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy - impose fuzzy search (same as -y).\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, fuzzy, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src - next package is a source package (same as -s).\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr " --install-src - install only source package (no binaries).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - remove rpm from cache before anything else.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, fuzzy, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - keep rpm not used in cache.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1791,7 +1918,7 @@ msgstr ""
" --allow-nodeps - allow asking user to install packages without\n"
" dependencies checking.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1800,12 +1927,12 @@ msgstr ""
" --allow-force - allow asking user to install packages without\n"
" dependencies checking and integrity.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - use another root for rpm installation.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1814,47 +1941,47 @@ msgstr ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
" to install a chroot with --root option.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - use wget to retrieve distant files.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - use curl to retrieve distant files.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, fuzzy, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --curl - use curl to retrieve distant files.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - limit the download speed.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1863,7 +1990,7 @@ msgstr ""
" --resume - resume transfer of partially-downloaded files\n"
" (--no-resume disables it, default is disabled).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1872,7 +1999,7 @@ msgstr ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
" to be 1080 by default (format is <proxyhost[:port]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1881,7 +2008,7 @@ msgstr ""
" --proxy-user - specify user and password to use for proxy\n"
" authentication (format is <user:password>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1890,7 +2017,7 @@ msgstr ""
" --bug - output a bug report in directory indicated by\n"
" next arg.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, fuzzy, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1899,7 +2026,7 @@ msgstr ""
" --verify-rpm - verify rpm signature before installation\n"
" (--no-verify-rpm disable it, default is enabled).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, fuzzy, c-format
msgid ""
" --test - only verify if the installation can be achieved "
@@ -1907,39 +2034,44 @@ msgid ""
msgstr ""
" --test - verify if the installation can be achieved correctly.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - exclude path separated by comma.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - exclude doc files.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, fuzzy, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --no-uninstall - never ask to uninstall a package, abort the "
"installation.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --url - print tag url: url.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - print tag description: description.\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - packages which installation should be skipped\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - packages which installation should be skipped\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1948,59 +2080,59 @@ msgstr ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - keep rpm not used in cache.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, 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:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - select all matches on command line.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - allow search in provides to find package.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - do not search in provides to find package.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - quiet mode.\n"
-#: ../urpmi:157
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " ਕਮਾਂਡ ਸਤਰ ਤੇ ਦਿੱਤੇ ਨਾਂ ਜਾਂ rpm ਫਾਇਲਾਂ ਨੂੰ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾਵੇਗਾ।\n"
-#: ../urpmi:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "ਬਾਈਨਰੀ rpm ਫਾਇਲਾਂ ਨਾਲ ਕੀ ਕਰਨਾ ਹੈ, ਜਦੋਂ ਕਿ --install-src ਵਰਤੋਂ"
-#: ../urpmi:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2009,7 +2141,7 @@ msgstr ""
"ਡਾਇਰੈਕਟਰੀ [%s] ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ, ਕਿਰਪਾ ਕਰਕੇ ਬੱਗ ਰਿਪੋਰਟ ਲਈ ਹੋਰ ਡਾਇਰੈਕਟਰੀ ਬਣਾਉ ਜਾਂ ਇਸ ਨੂੰ "
"ਹਟਾਓ"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "ਬੱਗ ਜਾਣਕਾਰੀ ਲਈ ਡਾਇਰੈਕਟਰੀ [%s] ਬਣਾਉਣ ਲਈ ਅਸਫਲ"
@@ -2019,7 +2151,7 @@ msgstr "ਬੱਗ ਜਾਣਕਾਰੀ ਲਈ ਡਾਇਰੈਕਟਰੀ [%s]
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2028,46 +2160,48 @@ msgstr ""
"ਗਲਤੀ: %s ਸ਼ਾਇਦ ਪੜਨ ਲਈ ਹੀ ਮਾਊਟ ਕੀਤੀ ਗਈ ਹੈ।\n"
"ਧੱਕੇ ਕਰਨ ਲਈ --allow-force ਵਰਤੋਂ।"
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (ਨਵੀਨੀਕਰਨ ਕਰਨ ਲਈ)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (ਨਵੀਨੀਕਰਨ ਕਰਨ ਲਈ)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (ਇੰਸਟਾਲ ਕਰਨ ਲਈ)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (ਇੰਸਟਾਲ ਕਰਨ ਲਈ)"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "ਨਿਰਭਰਤਾ ਹੱਲ਼ ਕਰਨ ਲਈ, %d ਪੈਕੇਜ ਹਟਾਏ ਜਾਣਗੇ (%d ਮੈਬਾ)"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "ਤੁਹਾਡੀ ਚੋਣ ਕੀ ਹੈ? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2078,7 +2212,7 @@ msgstr ""
"ਇੰਸਟਾਲ ਕੀਤਿਆਂ ਤੋਂ ਪੁਰਾਣੇ ਹਨ:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2089,19 +2223,19 @@ msgstr ""
"ਇੰਸਟਾਲ ਕੀਤਿਆਂ ਤੋਂ ਪੁਰਾਣੇ ਹਨ:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "ਕਿਸੇ ਤਰਾਂ ਜਾਰੀ ਰਹੋ?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (Y/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2110,7 +2244,7 @@ msgstr ""
"ਮੰਗੇ ਕੁਝ ਪੈਕੇਜ ਇੰਸਟਾਲ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕਦੇ ਹਨ:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2119,7 +2253,7 @@ msgstr ""
"ਮੰਗੇ ਕੁਝ ਪੈਕੇਜ ਇੰਸਟਾਲ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕਦੇ ਹਨ:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2130,7 +2264,7 @@ msgstr ""
"ਹੋਰਾਂ ਦੇ ਨਵੀਨੀਕਰਨ ਲਈ ਹਟਾ ਦਿੱਤਾ ਗਿਆ ਹੈ:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2141,7 +2275,7 @@ msgstr ""
"ਹੋਰਾਂ ਦੇ ਨਵੀਨੀਕਰਨ ਲਈ ਹਟਾ ਦਿੱਤਾ ਗਿਆ ਹੈ:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2150,7 +2284,7 @@ msgstr ""
"ਹੋਰ ਪੈਕੇਜਾਂ ਦਾ ਨਵੀਨੀਕਰਨ ਕਰਨ ਦੌਰਾਨ ਇਹ ਪੈਕੇਜ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2159,12 +2293,17 @@ msgstr ""
"ਹੋਰ ਪੈਕੇਜਾਂ ਦਾ ਨਵੀਨੀਕਰਨ ਕਰਨ ਦੌਰਾਨ ਇਹ ਪੈਕੇਜ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2173,111 +2312,29 @@ msgstr ""
"ਤੁਹਾਨੂੰ ਇਹ ਨਿਰਭਰਤਾ ਹੱਲ਼ ਕਰਨ ਲਈ ਪ੍ਰਬੰਧਕ (root) ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, 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:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "ਕਿਰਪਾ ਕਰਕੇ ਤਿਆਰ ਹੋਣ ਤੇ Enter ਦਬਾਓ..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "ਰੱਦ ਕਰੋ"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜਾਂ ਤੇ ਗਲਤ ਦਸਤਖਤ ਹਨ"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜਾਂ ਤੇ ਗਲਤ ਦਸਤਖਤ ਹਨ"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "ਕੀ ਤੁਸੀਂ ਇੰਸਟਾਲੇਸ਼ਨ ਨਾਲ ਜਾਰੀ ਰਹਿਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਅਸਫਲ ਹੋਈ"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "%s ਵੰਡਿਆ ਜਾਦਾ ਹ"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "%s ਨੂੰ %s ਤੋਂ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾਦਾ ਹੈ"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "%s ਇੰਸਟਾਲੇਸ਼ਨ ਜਾਰੀ"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "ਬਿਨਾਂ ਨਿਰਭਰਤਾਂ ਦੇ ਇੰਸਟਾਲੇਸ਼ਨ ਲਈ ਕੋਸ਼ਿਸ ਕਰਨੀ ਹੈ? (y/N) "
-
-#: ../urpmi:776
-#, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਨੂੰ ਧੱਕੇ ਨਾਲ ਵਰਤਣਾ ਹੈ (--force)? (y/N) "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d ਇੰਸਟਾਲੇਸ਼ਨ ਸੰਚਾਰ ਅਸਫਲ"
-msgstr[1] "%d ਇੰਸਟਾਲੇਸ਼ਨ ਸੰਚਾਰ ਅਸਫਲ"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਸੰਭਵ ਹੈ"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "urpmi ਮੁੜ ਚਾਲੂ"
@@ -2408,49 +2465,49 @@ msgstr " -v - verbose mode.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "ਮਾਧਿਅਮ \"%s\" ਨਵੀਨੀਕਰਨ ਲਈ ਅਸਫਲ਼\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "ਸਿਰਫ਼ ਪ੍ਰਬੰਧਕਾਂ ਨੂੰ ਮਾਧਿਅਮ ਸ਼ਾਮਲ ਕਰਨ ਦੀ ਇਜ਼ਾਜਤ ਹੈ"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "ਸੰਰਚਨਾ ਫਾਇਲ [%s] ਲਿਖੀ ਜਾਵੇਗੀ"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "ਸੰਰਚਨਾ ਫਾਇਲ [%s] ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕੀ"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "--distrib ਨਾਲ <relative path of hdlist> ਦੀ ਲੋੜ ਨਹੀ"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<hdlist ਲਈ ਅਨੁਸਾਰੀ ਮਾਰਗ> ਗੁੰਮ\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "ਮਾਧਿਅਮ \"%s\" ਬਣਾਉਣ ਲਈ ਅਸਫਲ\n"
@@ -2610,17 +2667,17 @@ msgstr " -a - select all media.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - fuzzy match on media names.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "ਸਿਰਫ਼ ਪ੍ਰਬੰਧਕਾਂ ਨੂੰ ਹੀ ਮਾਧਿਅਮ ਹਟਾਉਣ ਦੀ ਇਜ਼ਾਜਤ ਹੈ"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "ਹਟਾਉਣ ਲਈ ਕੁਝ ਨਹੀਂ (ਮਾਧਿਅਮ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰਨ ਲਈ urpmi.addmedia ਵਰਤੋਂ)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2676,17 +2733,17 @@ msgstr " -a - select all non-removable media.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - force generation of hdlist files.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "ਸਿਰਫ਼ ਪ੍ਰਬੰਧਕਾਂ ਨੂੰ ਹੀ ਨਵੀਨੀਕਰਨ ਮਾਧਿਅਮ ਵਰਤਣ ਦੀ ਇਜ਼ਾਜਤ ਹੈ"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "ਕੁਝ ਵੀ ਨਵੀਨੀਕਰਨ ਨਹੀਂ (ਇੱਕ ਮਾਧਿਅਮ ਸ਼ਾਮਲ ਕਰਨ ਲਈ urpmi.addmedia ਵਰਤੋ)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2695,22 +2752,22 @@ msgstr ""
"ਨਵੀਨੀਕਰਨ ਲਈ ਇੰਦਰਾਜ਼ ਗੁੰਮ ਹੈ\n"
"(%s ਵਿੱਚੋਂ ਇੱਕ)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "ਮਾਧਿਅਮ %s ਅਣਡਿੱਠਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "ਮਾਧਿਅਮ %s ਯੋਗ ਕੀਤਾ ਜਾਦਾ ਹੈ"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2726,7 +2783,7 @@ msgstr ""
"\n"
"ਵਰਤੋਂ:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2735,61 +2792,61 @@ msgstr ""
" --searchmedia - use only the given media to search requested (or updated) "
"packages.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - impose fuzzy search (same as -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - list available packages.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - list available media.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - list available media and their url.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr " --list-nodes - list available nodes when using --parallel.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - list available parallel aliases.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr " --src - next package is a source package (same as -s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr ""
" --sources - give all source packages before downloading (root only).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --url - print tag url: url.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2798,76 +2855,76 @@ msgstr ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
" This permit to querying a distro.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - print changelog.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - print tag summary: summary.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - reverse search to what requires package.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, fuzzy, c-format
msgid ""
" --whatrequires-recursive\n"
" - extended reverse search (includes virtual packages).\n"
msgstr " -R - reverse search to what requires package.\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -p - search in provides to find package.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - complete output with package to be removed.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - extend query to package dependencies.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - print groups with name also.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - print useful information in human readable form.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - list files in package.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - quiet mode.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - print version and release with name also.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - next package is a source package (same as --src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2876,44 +2933,44 @@ msgstr ""
" -u - remove package if a more recent version is already "
"installed.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - impose fuzzy search (same as --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -Y - like -y, but forces to match case-insensitively.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " ਕਮਾਂਡ ਸਤਰ ਤੇ ਦਿੱਤੇ ਨਾਂ ਜਾਂ rpm ਫਾਇਲਾਂ ਬਾਰੇ ਖੋਜ ਕੀਤੀ ਜਾਦੀ ਹੈ।\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes ਨੂੰ --parallel ਨਾਲ ਹੀ ਵਰਤਿਆ ਜਾ ਸਕਦਾ"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"ਸੂਚਨਾ: ਕਿਉਕਿ hdlists ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਕੋਈ ਮਾਧਿਅਮ ਨਹੀਂ ਲੱਭਿਆ, ਇਸਕਰਕੇ urpmf ਵਲੋਂ ਕੋਈ ਨਤੀਜਾ "
"ਨਹੀਂ\n"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2921,11 +2978,21 @@ msgstr ""
"ਸੂਚਨਾ: ਕਿਉਕਿ hdlists ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਕੋਈ ਮਾਧਿਅਮ ਨਹੀਂ ਲੱਭਿਆ, ਇਸਕਰਕੇ urpmf ਵਲੋਂ ਕੋਈ ਨਤੀਜਾ "
"ਨਹੀਂ\n"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "ਕੋਈ changelog ਨਹੀਂ\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜਾਂ ਤੇ ਗਲਤ ਦਸਤਖਤ ਹਨ:\n"
+#~ "%s\n"
+#~ "ਕੀ ਤੁਸੀਂ ਇੰਸਟਾਲੇਸ਼ਨ ਜਾਰੀ ਰੱਖਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
+
#, fuzzy
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "ਤੁਹਾਨੂੰ ਇਸ ਕਮਾਂਡ ਚਲਾਉਣ ਲਈ ਰੂਟ(root) ਬਣਨਾ ਪਵੇਗਾ !\n"
@@ -3258,9 +3325,6 @@ msgstr "ਕੋਈ changelog ਨਹੀਂ\n"
#~ " --keep - keep existing packages if possible, reject requested\n"
#~ " packages that lead to removals.\n"
-#~ msgid "unable to write file [%s]"
-#~ msgstr "ਫਾਇਲ [%s] ਲਿਖਣ ਲਈ ਅਸਫਲ"
-
#~ msgid ""
#~ " --distrib-XXX - automatically create a medium for XXX part of a\n"
#~ " distribution, XXX may be main, contrib, updates or\n"
diff --git a/po/pl.po b/po/pl.po
index 006780ab..0a3b1b84 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2007-06-14 08:11+0200\n"
"Last-Translator: Tomasz Bednarski - Mandriva Poland <tomasz."
"bednarski@mandriva.pl>\n"
@@ -27,7 +27,7 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%"
"100<10 || n%100>=20) ? 1 : 2);\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "Instalacja pakietów RPM"
@@ -38,7 +38,7 @@ msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
"Błąd: odnalezienie pliku %s było niemożliwe, operacja zostanie anulowana"
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -104,7 +104,7 @@ msgstr "Zainstaluj"
msgid "_Save"
msgstr "_Zapisz"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Anuluj"
@@ -124,17 +124,17 @@ msgstr "Nieznane opcja %s"
msgid "No packages specified"
msgstr "Nie wybrano pakietów"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Proszę czekać..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "Tylko root ma prawo do tego działania"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -145,42 +145,42 @@ msgstr ""
"%s\n"
"Czy kontynuować mimo to?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Ostrzeżenie"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (do aktualizacji)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (do zainstalowania)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "Wybór pakietów"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Wymagany jest jeden z następujących pakietów:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Przerwij"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -191,21 +191,21 @@ msgstr ""
"%s\n"
"Czy kontynuować mimo to?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, 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:"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, 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:"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
@@ -213,40 +213,42 @@ msgstr[0] "(%d pakiet, %d MB)"
msgstr[1] "(%d pakietów, %d MB)"
msgstr[2] "(%d pakietów, %d MB)"
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Instalacja pakietu..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "nie można pobrać pakietów źródłowych, zaniechanie"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Przygotowywanie..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instalowanie pakietu \"%s\" (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Włóż nośnik o nazwie \"%s\" do napędu [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Pobieranie pakietu \"%s\"..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Poniższe pakiety posiadają niepoprawne podpisy:\n"
-"%s\n"
-"\n"
-"Czy chcesz kontynuować instalację?"
+msgid "_Done"
+msgstr "Gotowe"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -257,41 +259,27 @@ msgstr ""
"%s\n"
"Może zachodzić potrzeba aktualizacji bazy danych urpmi"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "usuwanie %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Przygotowywanie..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instalowanie pakietu \"%s\" (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "Gotowe"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, c-format
msgid "Installation failed:"
msgstr "Instalacja nie powiodła się:"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Wszystko zostało już zainstalowane"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Instalacja zakończona"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "usuwanie %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -326,7 +314,7 @@ msgstr " -f - wyświetla pełną nazwę pakietu rpm (NVRA).\n"
msgid " defaults to %s.\n"
msgstr " domyślną wartością jest %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Tylko administrator ma prawo instalować pakiety"
@@ -336,100 +324,100 @@ msgstr "Tylko administrator ma prawo instalować pakiety"
msgid "Running urpmi in restricted mode..."
msgstr "Uruchamianie urpmi w trybie restrykcyjnym..."
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "nie można otworzyć bazy danych rpm"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
"odnaleziono %d nagłówków pakietów rpm w pamięci cache, usuwanie %d "
"niepoprawnych nagłówków"
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "niepoprawna nazwa pliku rpm [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "pobieranie pliku rpm [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...pobieranie zakończone"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...pobieranie nie powiodło się: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "nie można uzyskać dostępu do pliku rpm [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "nie można przetworzyć pliku konfiguracyjnego %s [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "nie można zarejestrować pliku rpm"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Niezgodna architektura dla pakietu rpm [%s]"
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "błąd w trakcie rejestrowania pakietów lokalnych"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Operacja niedozwolona podczas pracy w trybie restrykcyjnym"
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "niepoprawna deklaracja serwera pośredniczącego w wierszu poleceń\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr "Katalog chroot nie istnieje"
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: nie można odczytać pliku rpm \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
+#, c-format
+msgid "chroot directory doesn't exist"
+msgstr "Katalog chroot nie istnieje"
+
+#: ../urpm/args.pm:424
#, c-format
msgid "Can't use %s without %s"
msgstr "Nie można użyć %s bez %s"
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
#, c-format
msgid "Can't use %s with %s"
msgstr "Nie można użyć %s z %s"
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr "Zbyt wiele argumentów\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "zbudowano plik syntezy dla nośnika \"%s\""
@@ -621,7 +609,12 @@ msgstr "pakiet %s nie został odnaleziony."
msgid "malformed URL: [%s]"
msgstr "niepoprawny adres URL: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "pobieranie plików rpm z nośnika \"%s\"..."
@@ -631,7 +624,7 @@ msgstr "pobieranie plików rpm z nośnika \"%s\"..."
msgid "[repackaging]"
msgstr "[ponowne tworzenie pakietu]"
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -639,37 +632,42 @@ msgstr ""
"utworzono transakcję dla instalacji na %s (usuwanie=%d, instalacja=%d, "
"aktualizacja=%d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "nie można utworzyć transakcji"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, 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:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "dodawanie pakietu %s (id=%d, eid=%d, aktualizacja=%d, plik=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "nie można zainstalować pakietu %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "usuwanie pakietu %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "usuwanie pakietu %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "usuwanie zainstalowanych pakietów rpm (%s) z %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Więcej informacji o pakiecie %s"
@@ -699,11 +697,104 @@ msgstr "Nie zdefiniowano podstawy"
msgid "Cannot connect to ldap uri:"
msgstr "Połączenie z uri ldap było niemożliwe:"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "%s baza danych zablokowana"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Ostrzeżenie"
+
+#: ../urpm/lock.pm:65
#, c-format
msgid "%s database locked"
msgstr "%s baza danych zablokowana"
+#: ../urpm/main_loop.pm:99
+#, c-format
+msgid "The following package has bad signature"
+msgstr "Poniższy pakiet ma niepoprawny podpis"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Następujące pakiety zawierają niepoprawne podpisy"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Czy chcesz kontynuować instalację ?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Instalacja nie powiodła się"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "rozpowszechnianie %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "instalowanie %s z %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "instalowanie %s"
+
+#: ../urpm/main_loop.pm:187
+#, 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:205
+#, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "Czy chcesz spróbować wymusić instalację (--force)? (t/N) "
+
+#: ../urpm/main_loop.pm:247
+#, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "transakcja instalacyjna zakończona niepowodzeniem"
+msgstr[1] "%d transakcji instalacyjnych zakończonych niepowodzeniem"
+msgstr[2] "%d transakcji instalacyjnych zakończonych niepowodzeniem"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Instalacja jest możliwa"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr "Oprogramowanie jest zaktualizowane"
+
+#: ../urpm/main_loop.pm:271
+#, c-format
+msgid "Package %s is already installed"
+msgstr "Pakiet %s jest już zaintalowany w systemie"
+
+#: ../urpm/main_loop.pm:272
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Pakiet %s jest już zaintalowany w systemie"
+
+#: ../urpm/main_loop.pm:275
+#, c-format
+msgid "Package %s can not be installed"
+msgstr "Pakiet %s nie może zostać zainstalowany"
+
+#: ../urpm/main_loop.pm:276
+#, c-format
+msgid "Packages %s can not be installed"
+msgstr "Pakiety %s nie mogą zostać zainstalowane"
+
#: ../urpm/md5sum.pm:23
#, c-format
msgid "examining %s file"
@@ -754,7 +845,7 @@ msgstr "opcja \"synthesis\" nie powinna być użyta (nośnik \"%s\")"
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "opcja \"synthesis\" powinna być użyta (nośnik \"%s\")"
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "nie można uzyskać dostępu do pliku hdlist \"%s\", zignorowano nośnik"
@@ -845,7 +936,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Początek wyszukiwania: %s koniec: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "podejmowanie kolejnej operacji obliczenia zależności\n"
@@ -912,67 +1003,72 @@ msgstr ""
"uzyskanie dostępu do nośnika dystrybucji było niemożliwe (nie odnaleziono "
"pliku media.cfg)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "próba wyboru nieistniejącego nośnika \"%s\""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "wybieranie wielu nośników: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "usuwanie nośnika \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "przekonfigurowywanie urpmi dla nośnika \"%s\""
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...przekonfigurowywanie zakończone niepowodzeniem"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "przekonfigurowywanie zakończone"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Błąd tworzenia pliku nazw: zależność %d nie została znaleziona"
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr "Błąd tworzenia pliku nazw: Nie można zapisać do pliku (%s)"
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "nośnik %s jest aktualny"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "badanie pliku hdlist [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "sprawdzanie pliku syntezy [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "budowanie pliku hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -981,77 +1077,77 @@ msgstr ""
"Utworzenie pliku syntezy dla nośnika \"%s\" było niemożliwe. Plik hdlist "
"może być uszkodzony."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "wystąpił problem podczas odczytu pliku syntezy dla nośnika \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "kopiowanie [%s] dla nośnika %s..."
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...kopiowanie zakończone niepowodzeniem"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopiowanie pliku opisowego związanego z \"%s\"..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...kopiowanie zakończone"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, 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:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "obliczanie sumy md5 skopiowanego źródłowego pliku hdlist (lub syntezy)"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "kopiowanie [%s] zakończone niepowodzeniem (niezgodna suma md5)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "obliczanie sumy md5 pobranego pliku źródłowego hdlist (lub syntezy)"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...pobieranie nie powiodło się: niezgodność sumy md5"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "nie znaleziono żadnych plików rpm z [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "odczytywanie plików rpm z [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "nie można czytać plików rpm z [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "nie odczytano żadnych pakietów RPM"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1062,75 +1158,75 @@ msgstr ""
"To może się zdarzyć jeśli podczas tworzenia nośnika katalog został "
"zamontowany ręcznie."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "nieprawidłowy plik hdlist %s dla nośnika %s"
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr ""
"pobieranie pliku źródłowego hdlist (lub syntezy) związanego z \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "znaleziono zbadany plik hdlist (lub synthesis) jako %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "nie znaleziono pliku hdlist dla nośnika \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "sprawdzanie pliku klucza publicznego związanego z \"%s\"..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, 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:1553
+#: ../urpm/media.pm:1560
#, 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:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "zapisywanie pliku listy dla nośnika \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, c-format
msgid "updated medium \"%s\""
msgstr "zaktualizowany nośnik %s"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "nie można przetworzyć pliku hdlist związanego z \"%s\""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, 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:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "odczytywanie nagłówków z nośnika \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "Tt"
@@ -1190,47 +1286,52 @@ msgstr "niespójny nośnik \"%s\" zaznaczony jako wymienny ale niekoniecznie"
msgid "unable to access medium \"%s\""
msgstr "nie można uzyskać dostępu do nośnika \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Brak pakietu o nazwie %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Następujące pakiety zawierają %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "z powodu brakującego %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Pakiet %s jest już zaintalowany w systemie"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "z powodu niesatysfakcjonującego pakietu %s"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "próba ulepszenia %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "w celu zachowania pakietu %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "w celu zainstalowania pakietu %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "z powodu kolizji z pakietem %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "niezgłoszony"
@@ -1250,6 +1351,16 @@ msgstr "Niepoprawny identyfikator klucza (%s)"
msgid "Missing signature (%s)"
msgstr "Brakujący podpis (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Utworzenie pliku konfiguracyjnego było niemożliwe [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Kopiowanie zakończone niepowodzeniem"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1267,8 +1378,8 @@ msgstr ""
"\n"
"użycie:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1285,7 +1396,7 @@ msgstr ""
" --test - sprawdza, czy instalacja zostanie przeprowadzona "
"prawidłowo.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
@@ -1293,12 +1404,12 @@ msgstr ""
" --force - wymusza wywoływanie nawet przy braku niektórych "
"pakietów.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - rozproszone urpmi z użyciem komputerów aliasu.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - przebuduj pakiet przed usunięciem\n"
@@ -1308,8 +1419,8 @@ 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:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
@@ -1330,17 +1441,17 @@ msgstr ""
" --use-distrib - konfiguruje urpmi w locie z drzewa dystrybucyjnego,\n"
" użyteczne przy (od)instalowywaniu chroot z opcją --root.\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - użycie pliku syntezy.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - użycie pliku hdlist.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - tryb komunikatywny.\n"
@@ -1350,37 +1461,37 @@ msgstr " --verbose, -v - tryb komunikatywny.\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - wybiera wszystkie pasujące pakiety.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Tylko administrator ma prawo usuwać pakiety"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "nieznane pakiety"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "nieznany pakiet"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "usuwanie pakietu %s spowoduje uszkodzenie systemu"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Brak elementów do usunięcia"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Zaznaczanie do usunięcia następujących pakietów"
-#: ../urpme:134
+#: ../urpme:131
#, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1391,12 +1502,12 @@ msgstr[1] ""
msgstr[2] ""
"W celu spełnienia zależności zostaną usunięte następujące pakiety %d (%d MB)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr " (%d MB)"
-#: ../urpme:138
+#: ../urpme:135
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
@@ -1404,12 +1515,12 @@ msgstr[0] "Usunąć pakiet %d?"
msgstr[1] "Usunąć pakiety %d?"
msgstr[2] "Usunąć pakiet %d?"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (t/N) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Usuwanie zakończone niepowodzeniem"
@@ -1436,13 +1547,13 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - wyświetla numer wersji tego programu.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../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"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1456,14 +1567,14 @@ msgid ""
msgstr ""
" --literal, -l - nie porównuj wzorców, użyj argumentu ciągu dosłownie.\n"
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../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"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1476,7 +1587,7 @@ msgstr ""
msgid " --use-distrib - use the given path to access media\n"
msgstr " --synthesis - używa podanego pliku syntezy zamiast bazy urpmi.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../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"
@@ -1486,7 +1597,7 @@ msgstr " --synthesis - używa podanego pliku syntezy zamiast bazy urpmi.\n"
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - bez wyświetlania identycznych wierszy.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - używa tylko nośników aktualizacyjnych.\n"
@@ -1622,76 +1733,86 @@ msgid " --group - group\n"
msgstr " --group - grupa\n"
#: ../urpmf:72
+#, fuzzy, c-format
+msgid " --license - license\n"
+msgstr " --name - nazwa pakietu\n"
+
+#: ../urpmf:73
#, c-format
msgid " --name - package name\n"
msgstr " --name - nazwa pakietu\n"
-#: ../urpmf:73
+#: ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - wszystkie przestarzałe znaczniki\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr " --packager - osoba tworząca pakiet\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - znacznik provides: wszyst. pakiety.\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - wszystkie zależności.\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, c-format
msgid " --size - installed size\n"
msgstr " --size - rozmiar\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - nazwa pakietu rpm ze źródłami\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - wszystkie przestarzałe znaczniki\n"
+
+#: ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr " --summary - podsumowanie\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, c-format
msgid " --url - url\n"
msgstr " --url - adres url\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, c-format
msgid " --vendor - vendor\n"
msgstr " --vendor - dostawca\n"
-#: ../urpmf:82
+#: ../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"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - wyświetla wersję, wydanie oraz archiwum z nazwą.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, 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"
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "używając określonego środowiska na %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1700,12 +1821,12 @@ msgstr ""
"Uwaga: jeśli żaden z przeszukiwanych nośników nie używa plików hdlist, urpmf "
"nie może zwrócić żadnego wyniku\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Być może warto użyć opcji --name aby szukać po nazwach pakietów.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1722,7 +1843,7 @@ msgstr ""
"\n"
"użycie:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1730,7 +1851,7 @@ msgstr ""
" --searchmedia - używa tylko podanych nośników podczas wyszukiwania "
"wymaganych pakietów.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
@@ -1739,30 +1860,30 @@ msgstr ""
" --auto - tryb nieinteraktywny, stosuje domyślne odpowiedzi na "
"pytania.\n"
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../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"
-#: ../urpmi:93
+#: ../urpmi:89
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr " --auto-update - aktualizuje nośniki i aktualizuje system.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr ""
" --no-md5sum - wyłącza sprawdzanie sumy kontrolnej MD5 dla pliku.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - wymusza aktualizację klucza gpg.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1771,13 +1892,13 @@ msgstr ""
" --no-uninstall - nigdy nie pyta o odinstalowanie pakietu, przerywa "
"instalację.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, 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"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1786,7 +1907,7 @@ msgstr ""
" --keep - zachowuje, jeśli to możliwe, istniejące pakiety\n"
" odrzuca żądane pakiety prowadzące do usunięcia innych.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1797,38 +1918,44 @@ msgstr ""
" zainstalowana lub uaktualniona większa liczba\n"
" pakietów niż zadana, domyślną wartością jest %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - mały rozmiar transakcji, domyślna wartość to %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy, -y - wymusza wyszukiwanie niespójności\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src, -s - następny pakiet jest pakietem źródłowym.\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr " --install-src - instaluje tylko pakiet źródłowy (bez binariów).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, 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"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - zachowuje pliki rpm w pamięci podręcznej.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1837,7 +1964,7 @@ msgstr ""
" --allow-nodeps - umożliwia użytkownikowi, który sobie zażyczy,\n"
" instalację pakietów bez sprawdzania zależności.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1847,12 +1974,12 @@ msgstr ""
" instalację pakietów bez sprawdzania zależności\n"
" i spójności.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - używa innego katalogu głównego do instalacji rpm.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1861,49 +1988,49 @@ msgstr ""
" --use-distrib - konfiguruje urpmi w locie z drzewa dystrybucyjnego,\n"
" opcja użyteczna przy instalacji chroot z opcją --root.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../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:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../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:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../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"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr " --curl-options - dodatkowe opcje dla curl\n"
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr " --rsync-options- dodatkowe opcje dla rsync\n"
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr " --wget-options - dodatkowe opcje dla wget\n"
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr " --prozilla-options - dodatkowe opcje prozilli\n"
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - ogranicza szybkość pobierania.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1912,7 +2039,7 @@ msgstr ""
" --resume - wznawia przesyłanie częściowo pobranych plików\n"
" (--no-resume wyłącza funkcję, domyślnie wyłączoną).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1921,7 +2048,7 @@ msgstr ""
" --proxy - używa wybranego pośrednika HTTP, domyślnym portem\n"
" jest port 1080 (format <serwerproxy[:port]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1930,7 +2057,7 @@ msgstr ""
" --proxy-user - określa użytkownika i hasło używane do uwierzytelnienia\n"
" na serwerze pośredniczącym (format <użytkownik:hasło>)\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1939,7 +2066,7 @@ msgstr ""
" --bug - raport błędów w katalogu wskazanym przez\n"
" następny argument\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1948,7 +2075,7 @@ msgstr ""
" --verify-rpm - bada podpis cyfrowy pakietu przed instalacją.\n"
" (--no-verify-rpm wyłącza, domyślnie włączone).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
@@ -1957,40 +2084,45 @@ msgstr ""
" --test - sprawdza, czy instalacja zostanie przeprowadzona "
"prawidłowo.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - wyłącza ścieżki oddzielone przecinkami.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - wyłącza pliki dokumentacji.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --ignoresize - anuluje sprawdzania miejsca na dysku przed instalacją.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, 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"
-#: ../urpmi:145
+#: ../urpmi:142
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - nie uruchamiaj skryptów pakietu\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - pakiety, których instalacja powinna być pominięta\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - pakiety, których instalacja powinna być pominięta\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1999,52 +2131,52 @@ msgstr ""
" --more-choices - gdy kilka pakietów zostanie znalezionych, proponuje\n"
" większy wybór niż tylko domyślny.\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - nie blokuj bazy pakietów rpm.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, 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"
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - wybiera wszystkie dopasowania w wierszu poleceń.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - umożliwia wyszukiwanie serwerów przy szukaniu pakietów.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
" -P - nie przeszukuje serwerów przy wyszukiwaniu pakietów.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - tryb cichy.\n"
-#: ../urpmi:157
+#: ../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"
-#: ../urpmi:186
+#: ../urpmi:184
#, 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:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2053,13 +2185,13 @@ msgstr ""
"Błąd: aby wygenerować raport o błędzie, określ argumenty linii poleceń\n"
"i dodaj opcję --bug.\n"
-#: ../urpmi:220
+#: ../urpmi:218
#, 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"
-#: ../urpmi:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2068,7 +2200,7 @@ msgstr ""
"Katalog [%s] już istnieje, użyj innego katalogu do zgłoszenia błędu lub go "
"usuń"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "nie można utworzyć katalogu [%s] dla raportu o błędach"
@@ -2078,7 +2210,7 @@ msgstr "nie można utworzyć katalogu [%s] dla raportu o błędach"
msgid "Environment directory %s does not exist"
msgstr "Katalog %s nie istnieje"
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2087,34 +2219,36 @@ 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:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr "Aktualizowanie nośnika...\n"
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (do aktualizacji)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (do aktualizacji)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (do zainstalowania)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, c-format
msgid "%s (to install)"
msgstr "%s (do zainstalowania)"
-#: ../urpmi:447
+#: ../urpmi:454
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2122,12 +2256,12 @@ msgid ""
msgstr ""
"W celu spełnienia zależności '%s' niezbędny jest jeden z poniższych pakietów:"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Jaki jest Twój wybór? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2139,7 +2273,7 @@ msgstr ""
" w systemie:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2150,7 +2284,7 @@ msgstr ""
"zależności\n"
"z pakietami, które są starsze niż aktualnie zainstalowane w systemie:%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, c-format
msgid ""
"\n"
@@ -2159,12 +2293,12 @@ msgstr ""
"\n"
"Czy kontynuować mimo to?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (T/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2173,7 +2307,7 @@ msgstr ""
"Wybrany pakiet nie może zostać zainstalowany:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2182,7 +2316,7 @@ msgstr ""
"Niektóre z wybranych pakietów nie mogą zostać zainstalowane:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2193,7 +2327,7 @@ msgstr ""
"musi zostać usunięty aby zaktualizować inne:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2204,7 +2338,7 @@ msgstr ""
"muszą zostać usunięte aby zaktualizować inne:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2213,7 +2347,7 @@ msgstr ""
"Poniższy pakiet musi zostać usunięte aby zaktualizować inne:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2222,12 +2356,17 @@ msgstr ""
"Poniższe pakiety muszą być usunięte aby zaktualizować inne:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(to tylko test, usunięcie nie zostanie przeprowadzone)"
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2236,12 +2375,12 @@ msgstr ""
"Aby zainstalować następujące zależności należy zrobić to z konta roota:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(to tylko test, instalacja nie będzie wykonana)"
-#: ../urpmi:597
+#: ../urpmi:617
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2249,100 +2388,17 @@ msgstr[0] "Rozpocząć instalację jednego pakietu? "
msgstr[1] "Rozpocząć instalację %d pakietów?"
msgstr[2] "Rozpocząć instalację 1 pakietu? (%d MB)"
-#: ../urpmi:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Naciśnij enter jeśli jesteś gotowy(-a)..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Anuluj"
-#: ../urpmi:671
-#, c-format
-msgid "The following package has bad signature"
-msgstr "Poniższy pakiet ma niepoprawny podpis"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Następujące pakiety zawierają niepoprawne podpisy"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Czy chcesz kontynuować instalację ?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Instalacja nie powiodła się"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "rozpowszechnianie %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "instalowanie %s z %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "instalowanie %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Próbować instalować bez sprawdzania zależności? (t/N) "
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Czy chcesz spróbować wymusić instalację (--force)? (t/N) "
-
-#: ../urpmi:815
-#, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "transakcja instalacyjna zakończona niepowodzeniem"
-msgstr[1] "%d transakcji instalacyjnych zakończonych niepowodzeniem"
-msgstr[2] "%d transakcji instalacyjnych zakończonych niepowodzeniem"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Instalacja jest możliwa"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr "Oprogramowanie jest zaktualizowane"
-
-#: ../urpmi:838
-#, c-format
-msgid "Package %s is already installed"
-msgstr "Pakiet %s jest już zaintalowany w systemie"
-
-#: ../urpmi:839
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Pakiet %s jest już zaintalowany w systemie"
-
-#: ../urpmi:842
-#, c-format
-msgid "Package %s can not be installed"
-msgstr "Pakiet %s nie może zostać zainstalowany"
-
-#: ../urpmi:843
-#, c-format
-msgid "Packages %s can not be installed"
-msgstr "Pakiety %s nie mogą zostać zainstalowane"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "ponownie uruchamianie urpmi"
@@ -2474,35 +2530,35 @@ msgstr " -v - tryb komunikatywny.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "nie można zaktualizować nośnika \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, fuzzy, 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)\n"
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Tylko administrator ma prawo dodawać nośniki"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, c-format
msgid "creating config file [%s]"
msgstr "tworzenie pliku konfiguracyjnego [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "Utworzenie pliku konfiguracyjnego było niemożliwe [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr ""
"nie ma potrzeby podawania <ścieżki_względnej lub hdlisty> z opcją --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
@@ -2511,17 +2567,17 @@ msgstr ""
"\n"
"Czy chcesz dodać nośnik '%s'"
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "brak <ścieżki względnej do pliku hdlist>\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr "Nie można użyć %s ze zdalnym nośnikiem %s"
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "nie można utworzyć nośnika \"%s\"\n"
@@ -2692,17 +2748,17 @@ msgstr " -a - wybiera wszystkie nośniki.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -a - rozmyte dopasowanie nazw nośników.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Tylko administrator ma prawo usuwać nośniki"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "brak elementów do usunięcia (użyj urpmi.addmedia aby dodać nośnik)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2758,18 +2814,18 @@ msgstr " -a - wybiera wszystkie niewymienne nośniki.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - wymusza aktualizację plików systnezy/hdlist.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Tylko administrator ma prawo aktualizować nośniki"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, 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"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2778,22 +2834,22 @@ msgstr ""
"brak wpisu do aktualizacji\n"
"(jeden z %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "ignorowanie nośnika %s"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "włączanie nośnika \"%s\""
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2810,7 +2866,7 @@ msgstr ""
"\n"
"użycie:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2819,52 +2875,52 @@ msgstr ""
" --searchmedia - używa tylko podanych nośników podczas wyszukiwania (lub "
"aktualizacji) pakietów.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - wymusza wyszukiwanie niespójności (tak jak -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - wypisuje dostępne pakiety.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - wypisuje dostępne nośniki.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - wypisuje dostępne nośniki i ich url-e.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, 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"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - wypisuje dostępne równoległe aliasy.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, 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"
-#: ../urpmq:65
+#: ../urpmq:62
#, 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"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
@@ -2872,14 +2928,14 @@ msgstr ""
" --sources - wypisuje wszystkie pakiety źródłowe przed pobraniem\n"
" (tylko root).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, 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"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2888,22 +2944,22 @@ msgstr ""
" --use-distrib - konfiguruje urpmi w locie z drzewa dystrybucyjnego.\n"
" Ta opcja pozwala na odpytywanie dystrybucji.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - wyświetla dziennik zmian.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - wyświetla podsumowanie.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - wyszukiwanie odwrotne tego co wymaga pakietu.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2913,7 +2969,7 @@ msgstr ""
" - rozszerzone wyszukiwanie odwrotne (objemuje pakiety "
"wirtualne).\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, c-format
msgid ""
" --whatprovides, -p\n"
@@ -2922,49 +2978,49 @@ msgstr ""
" --whatprovides, -p\n"
" - wyszukiwanie celu znalezienia pakietu.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - zapełnia wyjście pakietami do usunięcia.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - rozszerza zapytania o zależności międzypakietowe.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - wyświetla grupy wraz z ich nazwami.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - wyświetla użyteczne informacje w czytelnej formie.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - wypisuje pliki w pakiecie.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, c-format
msgid " -m - equivalent to -du\n"
msgstr " -m - odpowiednik -du\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - wyświetla wersję i wydanie wraz z nazwą.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, 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"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2972,49 +3028,49 @@ msgid ""
msgstr ""
" -u - usuwa pakiet jeśli jest już zainstalowana lepsza wersja.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
" -y - wymusza wyszukiwanie niespójności (tak jak --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - jak opcja -y, lecz wymusza rozróżnianie wielkości\n"
" liter.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " żądanie dotyczące nazw lub plików podanych w wierszu poleceń.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes może być użyta tylko z opcją --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
"brak pliku hdlist dla nośnika %s, uzyskano częściowe wyniki dla pakietu %s"
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"brak pliku hdlist dla nośnika %s, uzyskano częściowe wyniki dla pakietów %s"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
"brak pliku hdlist dla nośnika %s, uzyskanie wyników dla pakietu %s było "
"niemożliwe"
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -3022,10 +3078,21 @@ msgstr ""
"brak pliku hdlist dla nośnika %s, uzyskanie wyników dla pakietów %s było "
"niemożliwe"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Nie znaleziono dziennika zmian\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Poniższe pakiety posiadają niepoprawne podpisy:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Czy chcesz kontynuować instalację?"
+
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Musisz posiadać uprawnienia root'a aby użyć polecenia --use-distrib"
diff --git a/po/pt.po b/po/pt.po
index 50a412e9..2219ee27 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -24,7 +24,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2007-08-03 16:53+0200\n"
"Last-Translator: Zé <mmodem00@gmail.com>\n"
"Language-Team: Português <pt@li.org>\n"
@@ -34,7 +34,7 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "Instalação RPM"
@@ -44,7 +44,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, a cancelar a operação"
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -111,7 +111,7 @@ msgstr "_Instalar"
msgid "_Save"
msgstr "_Gravar"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Cancelar"
@@ -131,17 +131,17 @@ msgstr "Opção desconhecida %s"
msgid "No packages specified"
msgstr "Nenhum pacote indicado"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Por favor aguarde..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "Deve ser root"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -152,42 +152,42 @@ msgstr ""
"%s\n"
"Continuar a instalação?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Aviso"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (para actualizar)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (para instalar)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "Escolha de pacotes"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "É necessário um dos seguintes pacotes:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Abortar"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -199,57 +199,62 @@ msgstr ""
"%s\n"
"Continuar a instalação?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, 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:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, 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:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, 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:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Instalação de pacotes..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "não é possível obter os pacotes fonte, abortar"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "A preparar..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "A instalar o pacote `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Por favor insira a média com o nome \"%s\" no dispositivo [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "A transferir o pacote `%s'..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Os seguintes pacotes têm assinaturas inválidas:\n"
-"%s\n"
-"\n"
-"Deseja prosseguir a instalação?"
+msgid "_Done"
+msgstr "_Terminado"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -260,41 +265,27 @@ msgstr ""
"%s\n"
"Talvez precise actualizar a sua base de dados urpmi."
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "a remover %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "A preparar..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "A instalar o pacote `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Terminado"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, c-format
msgid "Installation failed:"
msgstr "Instalação falhada:"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Os pacote(s) já estão instalados"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Instalação finalizada"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "a remover %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -329,7 +320,7 @@ msgstr " -f - mostra o nome completo do rpm (NVRA)\n"
msgid " defaults to %s.\n"
msgstr " predefinição para %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Apenas o superutilizador pode instalar pacotes"
@@ -339,98 +330,99 @@ msgstr "Apenas o superutilizador pode instalar pacotes"
msgid "Running urpmi in restricted mode..."
msgstr "A correr o urpmi em modo restrito..."
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "não é possível abrir rpmdb"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
-msgstr "encontrados %d cabeçalhos rpm em cache, a remover %d cabeçalhos obsoletos"
+msgstr ""
+"encontrados %d cabeçalhos rpm em cache, a remover %d cabeçalhos obsoletos"
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nome do ficheiro rpm inválido [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "a transferir o ficheiro rpm [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...transferência terminada"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...transferência falhada: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "não é possível aceder ao ficheiro rpm [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "não é possível analisar o ficheiro spec %s [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "não é possível registar o ficheiro rpm"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Arquitectura incompatível para o rpm [%s]"
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "erro ao registar os pacotes locais"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, 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:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, 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:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr "o directório chroot não existe"
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: não consegue ler o ficheiro rpm \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
+#, c-format
+msgid "chroot directory doesn't exist"
+msgstr "o directório chroot não existe"
+
+#: ../urpm/args.pm:424
#, c-format
msgid "Can't use %s without %s"
msgstr "Não pode usar %s sem %s"
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
#, c-format
msgid "Can't use %s with %s"
msgstr "Não pode usar %s com %s"
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr "Demasiados argumentos\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "construir ficheiro de síntese hdlist para a média \"%s\""
@@ -619,7 +611,12 @@ msgstr "o pacote %s não foi encontrado."
msgid "malformed URL: [%s]"
msgstr "entrada malformada: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "a transferir os ficheiros rpm a partir da média \"%s\"..."
@@ -629,42 +626,49 @@ msgstr "a transferir os ficheiros rpm a partir da média \"%s\"..."
msgid "[repackaging]"
msgstr "[reempacotamento]"
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, 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:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "não é possível criar a transacção"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, 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:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "a adicionar o pacote %s (id=%d, eid=%d, actualiza=%d, ficheiro=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "não é possível instalar o pacote %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "a remover o pacote %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "a remover o pacote %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "a remover rpms instalados (%s) de %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Mais informações no pacote %s"
@@ -694,11 +698,103 @@ msgstr "Nenhuma base definida"
msgid "Cannot connect to ldap uri:"
msgstr "Não é possível conectar ao url ldap:"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "%s base de dados trancada"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Aviso"
+
+#: ../urpm/lock.pm:65
#, c-format
msgid "%s database locked"
msgstr "%s base de dados trancada"
+#: ../urpm/main_loop.pm:99
+#, c-format
+msgid "The following package has bad signature"
+msgstr "O seguinte pacote tem uma assinatura inválida"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Os seguintes pacotes têm assinaturas inválidas"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Deseja continuar a instalação?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Instalação falhada"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "a distribuir %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "a instalar %s de %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "a instalar %s"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Tentar instalação sem verificar dependências? (s/N) "
+
+#: ../urpm/main_loop.pm:205
+#, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "Tentar forçar a instalação (--force)? (s/N) "
+
+#: ../urpm/main_loop.pm:247
+#, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d transacção de instalação falhada"
+msgstr[1] "%d transacções de instalações falhadas"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "A instalação é possível"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr "Os pacotes estão actualizados"
+
+#: ../urpm/main_loop.pm:271
+#, c-format
+msgid "Package %s is already installed"
+msgstr "O pacote %s já se encontra instalado"
+
+#: ../urpm/main_loop.pm:272
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Os pacote %s já se encontram instalados"
+
+#: ../urpm/main_loop.pm:275
+#, c-format
+msgid "Package %s can not be installed"
+msgstr "O pacote %s não pode ser instalado"
+
+#: ../urpm/main_loop.pm:276
+#, c-format
+msgid "Packages %s can not be installed"
+msgstr "Os pacotes %s não podem ser instalados"
+
#: ../urpm/md5sum.pm:23
#, c-format
msgid "examining %s file"
@@ -748,7 +844,7 @@ msgstr "\"synthesis\" não deve ser definido (média \"%s\")"
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "\"synthesis\" deve ser definido (média \"%s\")"
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "não é possível aceder ao ficheiro hdlist de \"%s\", média ignorada"
@@ -839,7 +935,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Inicio de procura: %s fim: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "a executar o segundo passo para calcular as dependências\n"
@@ -906,67 +1002,73 @@ msgstr ""
"não é possível aceder à média de distribuição (nenhum ficheiro media.cfg "
"encontrado)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "a tentar seleccionar uma média \"%s\" não existente"
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "seleccionar várias médias: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "a remover a média \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "a reconfigurar urpmi para a média \"%s\""
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...reconfiguração falhada"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "reconfiguração terminada"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Erro ao gerar nomes do ficheiro: dependência %d não encontrada"
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
-msgstr "Erro ao gerar nomes do ficheiro: Não é possível escrever no ficheiro (%s)"
+msgstr ""
+"Erro ao gerar nomes do ficheiro: Não é possível escrever no ficheiro (%s)"
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "a média \"%s\" está actualizada"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "a examinar o ficheiro hdlist [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "a examinar o ficheiro synthesis [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "a construir hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -975,77 +1077,77 @@ msgstr ""
"Não é possível construir um ficheiro synthesis para a média \"%s\". O seu "
"ficheiro hdlist pode estar corrompido."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problema ao ler o ficheiro hdlist ou synthesis da média \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "a copiar [%s] para a média \"%s\"..."
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...copia falhada"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "a copiar o ficheiro de descrição de \"%s\"..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...copia terminada"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "cópia de [%s] falhada (o ficheiro é suspeitosamente pequeno)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "a calcular o md5sum da fonte hdlist copiada (ou synthesis)"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "copia de [%s] falhada (md5sum diferente)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "a calcular o md5sum da fonte hdlist transferida (ou synthesis)"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...transferência corrompida: diferença no md5sum"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "nenhum ficheiro rpm encontrado de [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "a ler os ficheiros rpm de [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "não é possível ler os ficheiros rpm de [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "nenhum rpm lido"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1056,74 +1158,74 @@ msgstr ""
"isto pode acontecer se montou manualmente o directório enquanto criava a "
"média."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ficheiro hdlist %s inválido para a média \"%s\""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "a transferir a fonte hdlist (ou synthesis) de \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "hdlist encontrada e testada (ou synthesis) como %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "ficheiro hdlist não encontrado para a média \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "a examinar o ficheiro de chaves públicas de \"%s\"..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, 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:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "não é possível importar o ficheiro pubkey de \"%s\""
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "a escrever o ficheiro lista para a média \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, c-format
msgid "updated medium \"%s\""
msgstr "média actualizada \"%s\""
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "não é possível analisar o ficheiro hdlist de \"%s\" "
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problema ao ler o ficheiro synthesis da média \"%s\""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "a ler os cabeçalhos da média \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "SsYy"
@@ -1183,47 +1285,52 @@ msgstr "média incoerente \"%s\" marcada como removível mas de facto não é"
msgid "unable to access medium \"%s\""
msgstr "não é possível aceder à média \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Nenhum pacote chamado %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Os seguintes pacotes contêm %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "devido a faltar %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "O pacote %s já se encontra instalado"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "devido a não satisfazer %s"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "a tentar promover %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "para guardar %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "para instalar %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "devido a conflitos com %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "não pedido"
@@ -1243,6 +1350,16 @@ msgstr "ID de chave inválida (%s)"
msgid "Missing signature (%s)"
msgstr "Assinatura em falta (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Não pode criar o ficheiro de configuração [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Cópia falhada"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1259,8 +1376,8 @@ msgstr ""
"\n"
"uso:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1268,24 +1385,29 @@ msgstr " --help - mostra esta mensagem de ajuda.\n"
#: ../urpme:46
#, 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:47
#, 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:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, 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"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, 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:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Reempacota os ficheiros antes de os apagar\n"
@@ -1295,8 +1417,8 @@ msgstr " --repackage - Reempacota os ficheiros antes de os apagar\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - usa outra raiz para remover os rpm.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
@@ -1318,17 +1440,17 @@ msgstr ""
"distribuição,\n"
" útil para (des)instalar um chroot com opção --root.\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - usa o ficheiro synthesis.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - usa o ficheiro hdlist.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - modo detalhado.\n"
@@ -1336,63 +1458,66 @@ msgstr " --verbose, -v - modo detalhado.\n"
#: ../urpme:59
#, 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:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Apenas o superutilizador tem permissão para remover os pacotes"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "pacotes desconhecidos"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "pacote desconhecido"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "a remoção do pacote %s irá danificar o seu sistema"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Nada a remover"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "A verificar para remover os seguintes pacotes"
-#: ../urpme:134
+#: ../urpme:131
#, 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:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr " (%d MB)"
-#: ../urpme:138
+#: ../urpme:135
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "Remover %d pacote?"
msgstr[1] "Remover %d pacotes?"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (s/N) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Remoção falhada"
@@ -1418,33 +1543,36 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - mostra o número da versão desta ferramenta.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - usa um ambiente especifico (geralmente um relatório de "
"erro).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr " --excludemedia - não usa a média indicada, separada por vírgula.\n"
#: ../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"
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
-msgstr " --media - usa apenas a média indicada, separada por vírgula.\n"
+msgstr ""
+" --media - usa apenas a média indicada, separada por vírgula.\n"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../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"
@@ -1454,7 +1582,7 @@ msgstr ""
msgid " --use-distrib - use the given path to access media\n"
msgstr " --use-distrib - usa a localização dada para aceder à média\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1466,7 +1594,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - não mostra linhas idênticas.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - usa apenas a média de actualização.\n"
@@ -1603,76 +1731,87 @@ msgid " --group - group\n"
msgstr " --group - grupo\n"
#: ../urpmf:72
+#, fuzzy, c-format
+msgid " --license - license\n"
+msgstr " --name - nome do pacote\n"
+
+#: ../urpmf:73
#, c-format
msgid " --name - package name\n"
msgstr " --name - nome do pacote\n"
-#: ../urpmf:73
+#: ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - marcas de obsoletos\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr " --packager - empacotador\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - marcas de fornecidos\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - marcas de requeridos.\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, c-format
msgid " --size - installed size\n"
msgstr " --size - tamanho instalado\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - nome do rpm de código fonte\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - marcas de obsoletos\n"
+
+#: ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr " --summary - sumário\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, c-format
msgid " --url - url\n"
msgstr " --url - url\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, c-format
msgid " --vendor - vendor\n"
msgstr " --vendor - vendedor\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -m - a média onde o pacote foi encontrado\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, 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"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Formato incorrecto: pode apenas usar uma marca multi-avaliada"
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "a usar um ambiente específico em %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1681,12 +1820,12 @@ msgstr ""
"Nota: como nenhuma das médias procuradas usa hdlists, o urpmf não é capaz de "
"devolver qualquer resultado\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Pode querer usar --name para procurar nomes de pacotes.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1702,14 +1841,15 @@ msgstr ""
"\n"
"uso:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, 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 dada para procurar os pacotes "
"pedidos.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
@@ -1718,29 +1858,30 @@ msgstr ""
" --auto - modo não-interactivo, assume respostas predefinidas às "
"questões.\n"
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../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"
-#: ../urpmi:93
+#: ../urpmi:89
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr " --auto-update - actualiza a média e depois actualiza o sistema.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - desactiva a verificação do ficheiro MD5SUM.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - força a actualização da chave gpg.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1749,12 +1890,12 @@ msgstr ""
" --no-uninstall - nunca pergunta para desinstalar um pacote, aborta a "
"instalação.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - não instala pacotes (apenas transfere).\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1763,7 +1904,7 @@ msgstr ""
" --keep - guarda os pacotes existentes se possível, recusa os\n"
" pacotes pedidos que levam à remoção.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1774,37 +1915,44 @@ msgstr ""
" dados forem instalados ou actualizados,\n"
" predefinido é %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, 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:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy, -y - impõe uma procura aproximada.\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src, -s - o próximo pacote é um pacote fonte.\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr " --install-src - instala apenas o pacote fonte (nenhum binário).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - remove os rpm da cache antes de qualquer coisa.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - não apaga os rpms da cache.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1813,7 +1961,7 @@ msgstr ""
" --allow-nodeps - permite perguntar ao utilizador se deseja instalar\n"
" os pacotes sem verificar as dependências.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1822,12 +1970,12 @@ msgstr ""
" --allow-force - permite perguntar ao utilizador se deseja instalar\n"
" os pacotes sem verificar as dependências e integridade.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - usa outra raiz para a instalação rpm.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1836,47 +1984,48 @@ msgstr ""
" --use-distrib - configura o urpmi para outra fonte, útil para\n"
" (des)instalar um chroot com a opção --root.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - usa wget para transferir ficheiros distantes.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - usa curl para transferir ficheiros distantes.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../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:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr " --curl-options - opções adicionais para passar para curl\n"
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr " --rsync-options - opções adicionais para passar para rsync\n"
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr " --wget-options - opções adicionais para passar para wget\n"
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr " --prozilla-options - opções adicionais para passar para o prozilla\n"
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - limita a velocidade de transferência.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1887,7 +2036,7 @@ msgstr ""
" (--no-resume desactiva o resumo, activo por "
"predefinição).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1897,7 +2046,7 @@ msgstr ""
" que é 1080 por predefinição (o formato é <endereço_do_proxy[:"
"porta]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1906,7 +2055,7 @@ msgstr ""
" --proxy-user - indica o utilizador e a senha para usar na\n"
" autenticação do proxy (o formato é <utilizador:senha>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1915,7 +2064,7 @@ msgstr ""
" --bug - escreve um relatório de erro na pasta indicada\n"
" no próximo argumento.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1924,7 +2073,7 @@ msgstr ""
" --verify-rpm - verifica a assinatura do rpm antes de instalar.\n"
" (--no-verify-rpm desactiva-o, activo por predefinição).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
@@ -1933,39 +2082,45 @@ msgstr ""
" --test - verifica apenas se a instalação pode ser conseguida "
"correctamente.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - exclui localizações separadas por vírgulas.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - exclui os ficheiros de documentação.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, 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:144
+#: ../urpmi:141
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr ""
" --ignorearch - permite instalar rpms de arquitecturas não "
"correspondentes.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - não executa o(s) script(s) do(s) pacote(s)\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - pacotes cuja instalação deve ser ignorada\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - pacotes cuja instalação deve ser ignorada\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1974,53 +2129,55 @@ msgstr ""
" --more-choices - quando vários pacotes são encontrados, propõe mais\n"
" escolhas do que o está predefinido.\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - não tranca a base de dados rpm.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, 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:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, 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:153
+#: ../urpmi:151
#, 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"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
" -P - não procura nos fornecidos (provides) para encontrar o "
"pacote.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - modo silencioso.\n"
-#: ../urpmi:157
+#: ../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:186
+#: ../urpmi:184
#, 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:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2029,12 +2186,12 @@ msgstr ""
"Erro: para gerar um relatório de erros, indique os argumentos de linha de "
"comando usuais com --bug.\n"
-#: ../urpmi:220
+#: ../urpmi:218
#, 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:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2043,7 +2200,7 @@ msgstr ""
"O directório [%s] já existe, por favor use outro para comunicar erros ou "
"apague-o"
-#: ../urpmi:244
+#: ../urpmi:242
#, 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"
@@ -2053,7 +2210,7 @@ msgstr "Não é possível criar o directório [%s] para comunicação de erros"
msgid "Environment directory %s does not exist"
msgstr "O directório de ambiente %s não existe"
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2062,46 +2219,49 @@ msgstr ""
"Erro: %s parece estar montado apenas como leitura.\n"
"Use --allow-force para forçar a operação."
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr "A actualizar média...\n"
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (para actualizar)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (para actualizar)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (para instalar)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, c-format
msgid "%s (to install)"
msgstr "%s (para instalar)"
-#: ../urpmi:447
+#: ../urpmi:454
#, 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:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Qual é a sua escolha? (1-%d)"
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2112,7 +2272,7 @@ msgstr ""
"que são mais antigos do que os que estão instalados:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2123,7 +2283,7 @@ msgstr ""
"pacotes que são mais antigos do que os instalados:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, c-format
msgid ""
"\n"
@@ -2132,12 +2292,12 @@ msgstr ""
"\n"
"Continuar a instalação na mesma?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (S/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2146,7 +2306,7 @@ msgstr ""
"Um pacote pedido não pode ser instalado:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2155,7 +2315,7 @@ msgstr ""
"Alguns pacotes pedidos não podem ser instalados:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2166,7 +2326,7 @@ msgstr ""
"que ser removido para que outros sejam actualizados:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2177,7 +2337,7 @@ msgstr ""
"que ser removidos para que outros sejam actualizados:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2186,7 +2346,7 @@ msgstr ""
"O seguinte pacote tem que ser removido para que outros sejam actualizados:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2196,12 +2356,17 @@ msgstr ""
"actualizados:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(testa apenas, a remoção não é executada)"
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2210,111 +2375,29 @@ msgstr ""
"Precisa ser root para instalar as seguintes dependências: \n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(testa apenas, a instalação não é executada)"
-#: ../urpmi:597
+#: ../urpmi:617
#, 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:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Prima Enter quando estiver pronto..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Cancelar"
-#: ../urpmi:671
-#, c-format
-msgid "The following package has bad signature"
-msgstr "O seguinte pacote tem uma assinatura inválida"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Os seguintes pacotes têm assinaturas inválidas"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Deseja continuar a instalação?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Instalação falhada"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "a distribuir %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "a instalar %s de %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "a instalar %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Tentar instalação sem verificar dependências? (s/N) "
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Tentar forçar a instalação (--force)? (s/N) "
-
-#: ../urpmi:815
-#, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d transacção de instalação falhada"
-msgstr[1] "%d transacções de instalações falhadas"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "A instalação é possível"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr "Os pacotes estão actualizados"
-
-#: ../urpmi:838
-#, c-format
-msgid "Package %s is already installed"
-msgstr "O pacote %s já se encontra instalado"
-
-#: ../urpmi:839
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Os pacote %s já se encontram instalados"
-
-#: ../urpmi:842
-#, c-format
-msgid "Package %s can not be installed"
-msgstr "O pacote %s não pode ser instalado"
-
-#: ../urpmi:843
-#, c-format
-msgid "Packages %s can not be installed"
-msgstr "Os pacotes %s não podem ser instalados"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "a reiniciar urpmi"
@@ -2421,7 +2504,8 @@ msgstr " --nopubkey - não importa a chave pública da média adicionada\n"
#: ../urpmi.addmedia:69
#, 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:70 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
@@ -2443,32 +2527,34 @@ msgstr " -v - modo detalhado.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "não é possível actualizar a média \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, 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:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Apenas o superutilizador pode adicionar médias"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, c-format
msgid "creating config file [%s]"
msgstr "a criar ficheiro de configuração [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "Não pode criar o ficheiro de configuração [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "não é necessário indicar o <localização relativa do hdlist> com --distrib"
+msgstr ""
+"não é necessário indicar o <localização relativa do hdlist> com --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
@@ -2477,17 +2563,17 @@ msgstr ""
"\n"
"Deseja adicionar a média '%s'"
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "falta a <localização relativa de hdlist>\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr "Não é possível usar %s com uma média remota"
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "não é possível criar a média \"%s\"\n"
@@ -2522,7 +2608,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"
@@ -2654,17 +2741,17 @@ msgstr " -a - selecciona todas as médias.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - correspondência aproximada nos nomes das médias.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Apenas o superutilizador pode remover as médias"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "nada a remover (use urpmi.addmedia para adicionar uma média)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2704,7 +2791,8 @@ msgstr " --no-ignore - não actualiza, marca a média como activada.\n"
#: ../urpmi.update:47
#, c-format
-msgid " --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
msgstr ""
" --probe-rpms - não usa o ficheiro synthesis/hdlist, usa os ficheiros rpm "
"directamente\n"
@@ -2717,19 +2805,20 @@ msgstr " -a - selecciona todas as médias não removíveis.\n"
#: ../urpmi.update:50
#, c-format
msgid " -f - force updating synthesis/hdlist\n"
-msgstr " -f - força a actualização do ficheiros synthesis/hdlist.\n"
+msgstr ""
+" -f - força a actualização do ficheiros synthesis/hdlist.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Apenas o superutilizador pode actualizar as médias"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "nada a actualizar (use urpmi.addmedia para adicionar uma média)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2738,22 +2827,22 @@ msgstr ""
"a entrada a actualizar está em falta\n"
"(um de %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "a ignorar a média %s"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "a activar a média %s"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2769,7 +2858,7 @@ msgstr ""
"\n"
"uso:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2778,63 +2867,67 @@ msgstr ""
" --searchmedia - use apenas a média dada para procurar os pacotes pedidos "
"(ou actualizados).\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - impõe uma procura aproximada (o mesmo que -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - lista os pacotes disponíveis.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - lista as médias disponíveis.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - lista as médias disponíveis e as suas url.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, 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:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - lista as aliases paralelas disponíveis.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, 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"
-#: ../urpmq:65
+#: ../urpmq:62
#, 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:66
+#: ../urpmq:63
#, 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"
-#: ../urpmq:68
+#: ../urpmq:65
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr ""
" --ignorearch - permite analisar os rpms para arquitecturas não "
"correspondentes.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2844,29 +2937,30 @@ msgstr ""
"distribuição.\n"
" Isto permite analisar uma distribuição.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - mostra o registo das mudanças (changelog).\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - mostra o sumário.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - reverte a procura para o que o pacote requer.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
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:90
+#: ../urpmq:87
#, c-format
msgid ""
" --whatprovides, -p\n"
@@ -2876,47 +2970,49 @@ msgstr ""
" - procura nos fornecimentos (provides) para encontrar o "
"pacote.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - listagem completa com os pacotes a ser removidos.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
-msgstr " -d - análise extendida para as dependências dos pacotes.\n"
+msgstr ""
+" -d - análise extendida para as dependências dos pacotes.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - mostra os grupos com o nome também.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - mostra as informações úteis de maneira legível.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - lista os ficheiros do pacote.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, c-format
msgid " -m - equivalent to -du\n"
msgstr " -m - equivalente a -du\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - mostra a versão e o lançamento com o nome também.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, 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:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2925,52 +3021,68 @@ msgstr ""
" -u - remove o pacote se uma versão mais recente já estiver "
"instalada.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, 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:104
+#: ../urpmq:101
#, 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:105
+#: ../urpmq:102
#, 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:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes pode apenas ser usado com --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgstr "nenhum hdlist para a média \"%s\", apenas um resultado parcial do pacote %s"
+msgstr ""
+"nenhum hdlist para a média \"%s\", apenas um resultado parcial do pacote %s"
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr "nenhum hdlist para a média \"%s\", apenas um resultado parcial dos pacotes %s"
+msgstr ""
+"nenhum hdlist para a média \"%s\", apenas um resultado parcial dos pacotes %s"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
"nenhum hdlist para a média \"%s\", não é possível devolver qualquer "
"resultado do pacote %s"
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
-msgid "no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
"nenhum hdlist para a média \"%s\", não é possível devolver qualquer "
"resultado dos pacotes %s"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Nenhum registo de mudanças (changelog) encontrado\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Os seguintes pacotes têm assinaturas inválidas:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Deseja prosseguir a instalação?"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b39c1e76..d596338c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -23,7 +23,7 @@ msgid ""
msgstr ""
"Project-Id-Version: laerte-urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2006-08-24 11:36-0300\n"
"Last-Translator: \n"
"Language-Team: <pt@li.org>\n"
@@ -33,7 +33,7 @@ msgstr ""
"X-Generator: KBabel 1.10.2\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "Instalação de RPM"
@@ -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:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -112,7 +112,7 @@ msgstr "_Instalar"
msgid "_Save"
msgstr "_Salvar"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Cancelar"
@@ -132,17 +132,17 @@ msgstr "Opção desconhecida %s"
msgid "No packages specified"
msgstr "Nenhum pacote especificado"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Por favor aguarde..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "É necesssário super usuário"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -153,42 +153,42 @@ msgstr ""
"%s\n"
"Prosseguir com a instalação mesmo assim?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Aviso"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (para atualizar)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (para instalar)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "Escolha de pacotes"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Um dos pacotes a seguir é necessário:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Abortar"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -199,60 +199,62 @@ msgstr ""
"%s\n"
"Prosseguir com a instalação mesmo assim?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Para satisfazer as dependências, o seguinte pacote será instalado:"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, 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:"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, 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:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Instalação de pacotes..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "incapaz de obter pacotes fonte, abortando"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Preparando..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instalando pacote `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Insira a mídia chamada \"%s\" no dispositivo [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Baixando o pacote `%s'..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Os seguintes pacotes possuem assinaturas inválidas:\n"
-"%s\n"
-"\n"
-"Deseja continuar com a instalação?"
+msgid "_Done"
+msgstr "_Pronto"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -263,41 +265,27 @@ msgstr ""
"%s\n"
"Você deve atualizar a sua base de dados urpmi"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "removendo %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Preparando..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instalando pacote `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Pronto"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, c-format
msgid "Installation failed:"
msgstr "A Instalação falhou:"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Tudo já está instalado"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Instalação concluída"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "removendo %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -332,7 +320,7 @@ msgstr " -f - imprime nome completo do rpm (NVRA).\n"
msgid " defaults to %s.\n"
msgstr " por padrão é %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Apenas o super-usuário tem permissão para instalar pacotes"
@@ -342,98 +330,98 @@ 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:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "incapaz de abrir rpmdb"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr "encontrados %d headers rpm no cache, removendo %d headers obsoletos"
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nome rpm inválido [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "buscando o arquivo rpm [%s]...."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...busca completa"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...a busca falhou: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "incapaz de acessar o arquivo rpm [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "incapaz de processar arquivo spec %s [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "incapaz de registrar arquivo rpm"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Arquitetura incompatível para o rpm [%s]"
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "erro ao registrar pacotes locais"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, 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:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "declaração de proxy errada na linha de comando\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr "diretório chroot não existe"
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: não pode ler o arquivo rpm \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
+#, c-format
+msgid "chroot directory doesn't exist"
+msgstr "diretório chroot não existe"
+
+#: ../urpm/args.pm:424
#, c-format
msgid "Can't use %s without %s"
msgstr "Não é possível usar %s sem %s"
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
#, c-format
msgid "Can't use %s with %s"
msgstr "Não é possível usar %s com %s"
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr "Muitos parâmetros\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "construído arquivo de síntese de 'hdlist' para mídia \"%s\""
@@ -623,7 +611,12 @@ msgstr "o pacote %s não foi encontrado."
msgid "malformed URL: [%s]"
msgstr "URL mal formada: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "buscando os arquivos rpm da mídia \"%s\"..."
@@ -633,44 +626,49 @@ msgstr "buscando os arquivos rpm da mídia \"%s\"..."
msgid "[repackaging]"
msgstr "[reempacotamento]"
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, 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)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "incapaz de criar a transação"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, 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:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "adicionando pacote %s (id=%d, eid=%d, atualização=%d, arquivo=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "incapaz de instalar o pacote %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "removendo pacote %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "removendo pacote %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "removendo rpms instalados (%s) de %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Mais informações no pacote %s"
@@ -700,11 +698,103 @@ msgstr "Base não definida"
msgid "Cannot connect to ldap uri:"
msgstr "Não foi possível conectar-se à uri ldap:"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "base de dados bloqueada %s"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Aviso"
+
+#: ../urpm/lock.pm:65
#, c-format
msgid "%s database locked"
msgstr "base de dados bloqueada %s"
+#: ../urpm/main_loop.pm:99
+#, c-format
+msgid "The following package has bad signature"
+msgstr "O seguinte pacote contém assinaturas erradas"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Os seguintes pacotes contêm assinaturas erradas"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Você deseja continuar a instalação?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "A Instalação falhou"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "distribuindo %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "instalando %s a partir de %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "instalando %s"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Tentar instalar sem checar as dependências? (s/N) "
+
+#: ../urpm/main_loop.pm:205
+#, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "Forçar instalação (--force)? (s/N) "
+
+#: ../urpm/main_loop.pm:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d instalação falhou"
+msgstr[1] "%d instalação falhou"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Instalação é possível"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr "Pacotes estão atualizados"
+
+#: ../urpm/main_loop.pm:271
+#, c-format
+msgid "Package %s is already installed"
+msgstr "Pacote %s já está instalado"
+
+#: ../urpm/main_loop.pm:272
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Pacotes %s já estão instalados"
+
+#: ../urpm/main_loop.pm:275
+#, c-format
+msgid "Package %s can not be installed"
+msgstr "Pacotes %s já estão instalados"
+
+#: ../urpm/main_loop.pm:276
+#, c-format
+msgid "Packages %s can not be installed"
+msgstr "Pacotes %s não podem ser instalados"
+
#: ../urpm/md5sum.pm:23
#, c-format
msgid "examining %s file"
@@ -754,7 +844,7 @@ msgstr "\"synthesis\" não deve estar configurado (mídia \"%s\")"
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "\"synthesis\" deve estar configurado (mídia \"%s\")"
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "incapaz de acessar a arquivo 'hdlist' de \"%s\", mídia ignorada"
@@ -844,7 +934,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Procura inicia em %s e termina em %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "fazendo segundo passo para calcular dependências\n"
@@ -910,68 +1000,73 @@ 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)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "tentando selecionar mídia inexistente \"%s\""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "selecionando múltiplas mídias: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "removendo a mídia \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "reconfigurando o urpmi para as mídias \"%s\""
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...falha na reconfiguração"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "reconfiguração terminada"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, 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:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
"Erro gerando arquivo de nomes: Não foi possível escrever no arquivo (%s)"
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "mídia \"%s\" está atualizada"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "examinando arquivo hdlist [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "examinando arquivo de síntese [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "Construindo 'hdlist' [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -980,77 +1075,77 @@ msgstr ""
"Não foi possível construir o arquivo synthesis para a mídia \"%s\". O "
"arquivo hdlist pode estar corrompido."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problema lendo arquivo hdlist ou síntese da mídia \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "copiando [%s] para a mídia \"%s\"..."
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...falha na cópia"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "Copiando o arquivo de descrição de \"%s\"..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "..cópia terminada"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "cópia de [%s] falhou (arquivo é suspeitamente pequeno)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "computando o md5sum de uma fonte 'hdlist' copiada (ou síntese)"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "cópia de [%s] falhou (md5sum não é igual)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "computando o md5sum de uma fonte 'hdlist' recuperada (ou síntese)"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr " A aquisição falhou: assinatura md5sum diferente"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "nenhum arquivo rpm encontrado em [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "lendo arquivos rpms de [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "incapaz de ler os arquivos rpm de: [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "nenhum rpm lido"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1061,74 +1156,74 @@ msgstr ""
"verifique se não é necessário montar manualmente o diretório no qual ela foi "
"criada."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "hdlist inválido %s para a mídia \"%s\""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "Adquirindo a fonte 'hdlist' (ou a síntese) de \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "encontrado 'hdlist' (ou síntese) em %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "Nenhum arquivo 'hdlist' encontrado para a mídia \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "examinando arquivo de chave pública em \"%s\"..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, 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:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "incapaz de importar arquivo de chave pública de \"%s\""
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "gravando a lista de arquivos para a mídia \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, c-format
msgid "updated medium \"%s\""
msgstr "mídia atualizada \"%s\""
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "incapaz de atualizar o arquivo hdlist de \"%s\""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problema ao ler arquivo síntese da mídia \"%s\""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "lendo cabeçalhos da mídia \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "SsYy"
@@ -1188,47 +1283,52 @@ msgstr "mídia inconsistente \"%s\" marcada como removível, porém não é"
msgid "unable to access medium \"%s\""
msgstr "incapaz de acessar a mídia \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Nenhum nome de pacote %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Os seguintes pacotes contém %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "devido estar faltando %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Pacote %s já está instalado"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "devido a não satisfazer %s"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "tentando promover %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "para manter %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "para instalar %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "devido a conflitos com %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "não requisitado"
@@ -1248,6 +1348,16 @@ msgstr "Chave Inválida ID (%s)"
msgid "Missing signature (%s)"
msgstr "Assinatura não encontrada (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Não foi possível criar o arquivo de configuração [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Falha na cópia"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1265,8 +1375,8 @@ msgstr ""
"\n"
"uso:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1282,18 +1392,18 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - verifica se a remoção pode ser feita corretamente.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr " --force - força mesmo se alguns pacotes não existem.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - urpmi distribuído.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - reempacota os arquivos antes da remoção\n"
@@ -1303,8 +1413,8 @@ msgstr " --repackage - reempacota os arquivos antes da remoção\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - use outro root para desisntalação de rpm.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --urpmi-root - use outro root para o urpmi e instalação rpm.\n"
@@ -1324,17 +1434,17 @@ msgstr ""
" de distribuição, útil para (des)instalar em um chroot\n"
" com a opção --root.\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - use o arquivo síntese.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - use arquivo hdlist.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - modo detalhado.\n"
@@ -1345,37 +1455,37 @@ msgid " -a - select all packages matching expression.\n"
msgstr ""
" -a - seleciona todos os pacotes que combinam com a expressão.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Apenas super usuário tem permissão para remover pacotes"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "pacotes desconhecidos"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "pacote desconhecido."
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "a remoção do pacote %s irá danificar seu sistema"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Nada para remover"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Verificando para remover os seguintes pacotes"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1385,24 +1495,24 @@ msgstr[0] ""
msgstr[1] ""
"Para satisfazer as dependências, os pacotes %d serão removidos (%d MB)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "Remover %d pacote?"
msgstr[1] "Remover %d pacotes?"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (s/N) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "A remoção falhou"
@@ -1429,14 +1539,14 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - imprime o número da versão desta ferramenta.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - usa um ambiente específico (tipicamente para relatório\n"
" de falhas).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1450,13 +1560,13 @@ msgstr ""
" --literal, -l - não combina com padrão, utilize argumento como uma\n"
" string de literais.\n"
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../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"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1468,7 +1578,7 @@ msgid " --use-distrib - use the given path to access media\n"
msgstr ""
" --synthesis - usa a síntese dada ao invés do banco de dados urpmi.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1479,7 +1589,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - não lista linhas idênticas.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - use somente mídias de atualização.\n"
@@ -1616,78 +1726,88 @@ msgid " --group - group\n"
msgstr " --group - grupo\n"
#: ../urpmf:72
+#, fuzzy, c-format
+msgid " --license - license\n"
+msgstr " --name - nome do pacote\n"
+
+#: ../urpmf:73
#, c-format
msgid " --name - package name\n"
msgstr " --name - nome do pacote\n"
-#: ../urpmf:73
+#: ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - lista todos arquivos obsoletos\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr " --packager - empacotador\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - lista dos que provem o pacote\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - lista dos que requerem o pacote\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, c-format
msgid " --size - installed size\n"
msgstr " --size - tamanho da instalação.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - nome da fonte do rpm\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - lista todos arquivos obsoletos\n"
+
+#: ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr " --summary - sumário\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, c-format
msgid " --url - url\n"
msgstr " --url - url\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, c-format
msgid " --vendor - vendor\n"
msgstr " --vendor - fabricante\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -m - a mídia onde o pacote foi encontrado\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - imprime versão, 'release' e arquitetura, com nome.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, 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"
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "usando o ambiente específico em %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1696,12 +1816,12 @@ msgstr ""
"Nota: se nenhuma mídia encontrada usando hdlists, o urpmf é incapaz de "
"retornar qualquer resultado\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Você poderá usar --name para procurar pelo nome pacote.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1718,13 +1838,13 @@ msgstr ""
"\n"
"uso:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
msgstr " --searchmedia - usa apenas a mídia fornecida para buscar pacotes.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
@@ -1733,7 +1853,7 @@ msgstr ""
" --auto - modo não-interativo, assume respostas padrão para as\n"
" perguntas.\n"
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
@@ -1741,22 +1861,22 @@ msgstr ""
" --auto-select - automaticamente seleciona os pacotes necessários para \n"
" atualizar o sistema.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr " --auto-update - atualiza mídias e então atualiza o sistema.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - desabilita checagem MD5SUM dos arquivos.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - força atualização da chave gpg.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1765,12 +1885,12 @@ msgstr ""
" --no-uninstall - nunca pergunte para desinstalar um pacote. Caso seja \n"
" necessário, a instalação será abortada.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - não instala pacotes (download somente)\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1779,7 +1899,7 @@ msgstr ""
" --keep - mantém os pacotes existentes se possível, recusando os\n"
" pacotes solicitados que pedem a remoção do pacote.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1790,38 +1910,44 @@ msgstr ""
" precisa ser instalado ou atualizado,\n"
" o padrão é %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - transações em pequenos pedaços, o padrão é %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy, -y - impõe uma busca aproximada.\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src, -s - o próximo pacote é um pacote fonte.\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, 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"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - remove os rpm do cache antes de iniciar.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - não remove os rpms do cache.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1830,7 +1956,7 @@ msgstr ""
" --allow-nodeps - permite ao usuário instalar pacotes sem \n"
" checagem de dependências.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1839,12 +1965,12 @@ msgstr ""
" --allow-force - permite ao usuário instalar pacotes sem conferir\n"
" dependências e integridade.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - use outro root para instalação rpm.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1854,47 +1980,47 @@ msgstr ""
" padrão, útil para instalar um chroot com a\n"
" opção --root.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - usa wget para buscar arquivos remotos.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - usa curl para buscar arquivos remotos.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --prozilla - use prozilla para buscar arquivos remotos.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr " --curl-options - opções adicionais para passar ao curl\n"
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr " --rsync-options- opções adicionais para passar ao rsync\n"
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr " --wget-options - opções adicionais para passar ao wget\n"
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr " --prozilla-options - opções adicionais para passar ao prozilla\n"
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - limita a velocidade do download.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1904,7 +2030,7 @@ msgstr ""
" baixados (--no-resume desabilita isso, o padrão é\n"
" desabilitado).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1913,7 +2039,7 @@ msgstr ""
" --proxy - usa o proxy HTTP especificado, o número da porta\n"
" é 1080 por padrão (o formato é <máquinaproxy[:porta]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1922,7 +2048,7 @@ msgstr ""
" --proxy-user - especifica usuário e senha para usar na autenticação\n"
" do proxy (o formato é <usuário:senha>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1931,7 +2057,7 @@ msgstr ""
" --bug - escreve um relatório de falhas no diretório indicado\n"
" pelo próximo argumento.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1940,7 +2066,7 @@ msgstr ""
" --verify-rpm - verifica a assinatura do rpm antes da instalação.\n"
" (--no-verify-rpm desabilita, por padrão é habilitado).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
@@ -1949,39 +2075,44 @@ msgstr ""
" --test - apenas verifica se a instalação pode ser efetuada\n"
" corretamente.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - exclui o(s) caminho(s), separados por vírgula.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - exclui arquivos de documentação.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, 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"
-#: ../urpmi:144
+#: ../urpmi:141
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr ""
" --ignorearch - permite instalar rpms de arquiteturas divergentes.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - não executa script(s) dos pacotes\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - pacotes que a instalação deve ignorá-los.\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - pacotes que a instalação deve ignorá-los.\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1990,49 +2121,49 @@ msgstr ""
" --more-choices - quando diversos pacotes forem encontrados, proponha mais\n"
" escolhas por padrão.\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - não bloqueia o banco de dados rpm.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, 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:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - seleciona todos os listados na linha de comando.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - permite a busca em 'provides' para achar o pacote.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, 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"
-#: ../urpmi:155
+#: ../urpmi:153
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - modo silencioso.\n"
-#: ../urpmi:157
+#: ../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:186
+#: ../urpmi:184
#, 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:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2042,12 +2173,12 @@ msgstr ""
"parâmetros utilizados\n"
"e acrescente --bug.\n"
-#: ../urpmi:220
+#: ../urpmi:218
#, 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:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2056,7 +2187,7 @@ msgstr ""
"Diretório [%s] já existe, favor usar outro diretório para reportar o "
"problema ou apague-o"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Incapaz de criar o diretório [%s] para relatório de falhas"
@@ -2066,7 +2197,7 @@ msgstr "Incapaz de criar o diretório [%s] para relatório de falhas"
msgid "Environment directory %s does not exist"
msgstr "Diretório de ambiente %s não existe"
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2075,46 +2206,48 @@ msgstr ""
"Erro: %s parece estar montado apenas como leitura.\n"
"Usar --allow-force para forçar a operação."
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr "Atualizando mídias...\n"
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (para atualizar)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (para atualizar)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (para instalar)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, c-format
msgid "%s (to install)"
msgstr "%s (para instalar)"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "Para satisfazer as dependências, os pacotes %d serão removidos (%d MB)"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Qual é a sua escolha? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2125,7 +2258,7 @@ msgstr ""
"que são mais antigos que os atualmente instalados:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2136,7 +2269,7 @@ msgstr ""
"que são mais antigos que os atualmente instalados:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, c-format
msgid ""
"\n"
@@ -2145,12 +2278,12 @@ msgstr ""
"\n"
"Prosseguir instalação mesmo assim?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (S/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2159,7 +2292,7 @@ msgstr ""
"Um pacote não pôde ser instalado:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2168,7 +2301,7 @@ msgstr ""
"Alguns pacotes não puderam ser instalados:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2179,7 +2312,7 @@ msgstr ""
"precisa ser removido para que os outros possam ser atualizados:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2190,7 +2323,7 @@ msgstr ""
"precisam ser removidos para que os outros possam ser atualizados:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2199,7 +2332,7 @@ msgstr ""
"Este pacote precisa ser removido para que os outros sejam atualizados:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2208,12 +2341,17 @@ msgstr ""
"Estes pacotes precisam ser removidos para que os outros sejam atualizados:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(somente teste, remoções não serão efetivadas)"
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2222,111 +2360,29 @@ msgstr ""
"Você precisa ser root para instalar as seguintes dependências :\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(somente teste, instalações não serão efetivadas)"
-#: ../urpmi:597
+#: ../urpmi:617
#, fuzzy, 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 1 pacote? (%d MB)"
msgstr[1] "Proceder a instalação de 1 pacote? (%d MB)"
-#: ../urpmi:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Tecle Enter quando estiver pronto..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Cancelar"
-#: ../urpmi:671
-#, c-format
-msgid "The following package has bad signature"
-msgstr "O seguinte pacote contém assinaturas erradas"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Os seguintes pacotes contêm assinaturas erradas"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Você deseja continuar a instalação?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "A Instalação falhou"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "distribuindo %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "instalando %s a partir de %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "instalando %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Tentar instalar sem checar as dependências? (s/N) "
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Forçar instalação (--force)? (s/N) "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d instalação falhou"
-msgstr[1] "%d instalação falhou"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Instalação é possível"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr "Pacotes estão atualizados"
-
-#: ../urpmi:838
-#, c-format
-msgid "Package %s is already installed"
-msgstr "Pacote %s já está instalado"
-
-#: ../urpmi:839
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Pacotes %s já estão instalados"
-
-#: ../urpmi:842
-#, c-format
-msgid "Package %s can not be installed"
-msgstr "Pacotes %s já estão instalados"
-
-#: ../urpmi:843
-#, c-format
-msgid "Packages %s can not be installed"
-msgstr "Pacotes %s não podem ser instalados"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "reiniciando urpmi"
@@ -2456,32 +2512,32 @@ msgstr " -v - modo detalhado.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "incapaz de atualizar mídia \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, fuzzy, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr "<url> inválida (para diretório local o caminho deve ser absoluto)\n"
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Apenas o super usuário tem permissão para adicionar mídias"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, c-format
msgid "creating config file [%s]"
msgstr "criando arquivo de configuração [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "Não foi possível criar o arquivo de configuração [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "não precisa dar <caminho relativo do hdlist> com --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
@@ -2490,17 +2546,17 @@ msgstr ""
"\n"
"Você deseja adicionar a mídia '%s'"
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<caminho relativo do hdlist> faltando\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr "Não se pode usar %s com mídia remota"
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "incapaz de criar mídia \"%s\"\n"
@@ -2663,17 +2719,17 @@ msgstr " -a - seleciona todas as mídias.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - seleciona mídias com nomes semelhantes.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Apenas super usuário tem permissão para remover mídias"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "nada a remover (use urpmi.addmedia para adicionar uma mídia)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2729,17 +2785,17 @@ msgstr " -a - seleciona todas as mídias não removíveis.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - força a atualização de synthesis/hdlist\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Apenas o super usuário tem permissão para atualizar mídia"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "nada a atualizar (use urpmi.addmedia para adicionar uma mídia)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2748,22 +2804,22 @@ msgstr ""
"a entrada a ser atualizada está faltando\n"
"(uma de %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "ignorando mídia \"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "habilitando mídia \"%s\""
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2780,7 +2836,7 @@ msgstr ""
"\n"
"uso:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2789,38 +2845,38 @@ msgstr ""
" --searchmedia - usa apenas a mídia fornecida para buscar pacotes (ou\n"
" atualizações).\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - impõe uma busca aproximada (igual a -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - lista os pacotes disponíveis.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - lista as mídias disponíveis.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - lista mídias disponíveis e suas url's.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, 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"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - lista os apelidos paralelos disponíveis\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
@@ -2828,13 +2884,13 @@ msgstr ""
" --dump-config - mostrar a configuração como argumentos para o\n"
" urpmi.addmedia.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, 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"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
@@ -2842,13 +2898,13 @@ msgstr ""
" --sources - fornece todos os pacotes fonte antes de baixar\n"
" (somente root).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr ""
" --ignorearch - permite consultar pacotes de arquiteturas divergentes.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2858,22 +2914,22 @@ msgstr ""
" distribuição. Isso permite consultar essa\n"
" distribuição.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - imprime 'changelog'.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - imprime sumário.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - busca reversa para o que requer o pacote.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2882,7 +2938,7 @@ msgstr ""
" --whatrequires-recursive\n"
" - busca reversa extendida (inclui pacotes virtuais).\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
@@ -2891,50 +2947,50 @@ msgstr ""
" -p - permite a busca em 'repositórios para encontrar o "
"pacote.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - lista completa dos pacotes a remover.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr ""
" -d - estende a consulta para as dependências dos pacotes.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - imprime grupos, com nome também.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, 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"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - lista os arquivos do pacote.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, c-format
msgid " -m - equivalent to -du\n"
msgstr " -m - equivalente a -du\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - imprime versão e 'release' com nome também.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, 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"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2943,45 +2999,45 @@ msgstr ""
" -u - remove um pacote se uma versão mais atual\n"
" já estiver instalada.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - impõe uma busca aproximada (igual a --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, 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"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " nomes ou arquivos rpm dados na linha de comando são consultados \n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes só pode ser usado com --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr "sem hdlist para a mídia \"%s\", resultado parcial para o pacote %s"
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr "sem hdlist para a mídia \"%s\", resultado parcial para os pacotes %s"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
"sem hdlist para a mídia \"%s\", incapaz de retornar resultados para os "
"pacote %s"
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2989,11 +3045,22 @@ msgstr ""
"sem hdlist para a mídia \"%s\", incapaz de retornar resultados para os "
"pacotes %s"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Arquivo com as alterações não foi encontrado \n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Os seguintes pacotes possuem assinaturas inválidas:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Deseja continuar com a instalação?"
+
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Você precisa ser root para usar --use-distrib"
diff --git a/po/ro.po b/po/ro.po
index 0dc728d7..1b60e913 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2004-10-17 14:38+0300\n"
"Last-Translator: Ovidiu Constantin <ovidiusoft@gmail.com>\n"
"Language-Team: Romanian <rtfs-project@lists.sourceforge.net>\n"
@@ -26,7 +26,7 @@ msgstr ""
"Plural-Forms: nplurals=3;plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
"2:1))\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, fuzzy, c-format
msgid "RPM installation"
msgstr "Instalare sistem"
@@ -36,7 +36,7 @@ msgstr "Instalare sistem"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_OK"
@@ -104,7 +104,7 @@ msgstr "_Importă"
msgid "_Save"
msgstr "_Salvează"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Renunţă"
@@ -126,17 +126,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Nu a fost specificată nici o comandă"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Vă rog să aşteptaţi..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, fuzzy, c-format
msgid "Must be root"
msgstr "Port Mouse"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -146,42 +146,42 @@ msgstr ""
"Unele pachete cerute nu pot fi instalate:\n"
"%s"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Avertisment"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "OK"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "Actualizare"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, fuzzy, c-format
msgid " (to install)"
msgstr "Ieşire din instalare"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Unul din următoarele pachete e necesar:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, fuzzy, c-format
msgid "_Abort"
msgstr "Abandonează"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -191,21 +191,21 @@ msgstr ""
"Unrmătoarele pachete trebuie şterse pentru ca altele să fie actualizate:\n"
"%s"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
"Pentru a satisface dependenţele, următorul pachet va fi instalat: (%d MB)"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
"Pentru a satisface dependenţele, următorul pachet va fi instalat: (%d MB)"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
@@ -213,41 +213,42 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Instalare pachete..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "Nu pot prelua pachetele sursă, întrerup"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Pregătire..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instalarea pachetului `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Vă rog să introduceţi mediul numit \"%s\" în dispozitivul [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Descarc pachetul `%s'..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Următoarele pachete au semnături eronate:\n"
-"\n"
-"%s\n"
-"\n"
-"Doriţi să continuaţi?"
+msgid "_Done"
+msgstr "Gata"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -258,41 +259,27 @@ msgstr ""
"%s\n"
"Probabil ar trebui să actualizaţi baza de date urpmi."
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "elimin %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Pregătire..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instalarea pachetului `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, fuzzy, c-format
-msgid "_Done"
-msgstr "Gata"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Instalarea a eşuat"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "totul este deja instalat"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Instalare terminată"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "elimin %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -327,7 +314,7 @@ msgstr " -g - arată grupurile şi cu nume.\n"
msgid " defaults to %s.\n"
msgstr " implicit este %s \n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Doar superutilizatorul poate instala pachete"
@@ -337,98 +324,98 @@ msgstr "Doar superutilizatorul poate instala pachete"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "nu pot deschide rpmdb"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nume de fişier rpm invalid [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "copiere fişier rpm [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...copierea este terminată"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...copierea eşuată: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "nu pot accesa fişierul rpm [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "nu pot parcurge \"%s\" în fişierul [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "nu pot înregistra fişierul rpm"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "eroare la înregistrarea pachetelor locale"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "declarare proxy greşită în linia de comandă\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: nu pot citi fişierul rpm \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "am construit fişierul synthesis pentru mediul \"%s\""
@@ -617,7 +604,12 @@ msgstr "pachetul %s nu a fost găsit."
msgid "malformed URL: [%s]"
msgstr "intrare incorectă: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "copiere fişiere rpm de pe mediul \"%s\"..."
@@ -627,7 +619,7 @@ msgstr "copiere fişiere rpm de pe mediul \"%s\"..."
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -635,37 +627,42 @@ msgstr ""
"Tranzacţie creeată pt. instalarea pe %s (ştergere=%d, instalare=%d, "
"actualizare=%d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "nNu pot crea tranzacţia"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "nu pot şterge pachetul %s"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "adăugare pachet %s (id=%d, eid=%d, acualiz=%d, fişier=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "nu pot instala pachetul %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "şterg pachetul %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "şterg pachetul %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "instalez %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Mai multe informaţii despre pachetul %s"
@@ -695,11 +692,104 @@ msgstr "Nu a fost specificată nici o comandă"
msgid "Cannot connect to ldap uri:"
msgstr ""
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "baza de date urpmi este blocată"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Avertisment"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "baza de date urpmi este blocată"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "Următoarele pachete au semnături greşite"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Următoarele pachete au semnături greşite"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Doriţi să continuaţi instalarea?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Instalarea a eşuat"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "distribui %s"
+
+#: ../urpm/main_loop.pm:148
+#, fuzzy, c-format
+msgid "installing %s from %s"
+msgstr "instalez %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "instalez %s"
+
+#: ../urpm/main_loop.pm:187
+#, 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:205
+#, fuzzy, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "Încearcă instalarea încă şi mai dur (--force)? (d/N) "
+
+#: ../urpm/main_loop.pm:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d tranzacţii de instalarea eşuate"
+msgstr[1] "%d tranzacţii de instalarea eşuate"
+msgstr[2] "%d tranzacţii de instalarea eşuate"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Instalarea este posibilă"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "totul este deja instalat"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "totul este deja instalat"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "totul este deja instalat"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "totul este deja instalat"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -750,7 +840,7 @@ msgstr "se încearcă selectarea unui mediu inexistent \"%s\""
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "am construit fişierul synthesis pentru mediul \"%s\""
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "nu pot accesa fişierul hdlist pentru \"%s\", ignor mediul"
@@ -845,7 +935,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Caută fonturi instalate"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "efectuez a doua parcurgere pentru a calcula dependenţele\n"
@@ -910,67 +1000,72 @@ msgstr "nu pot deschide rpmdb"
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "nu pot accesa primul mediu de instalare (nu am găsit fişierul hdlists)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "se încearcă selectarea unui mediu inexistent \"%s\""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "selectez medii multiple: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "elimin mediul \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "reconfigurez urpmi pentru mediul \"%s\""
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...reconfigurarea a eşuat"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "reconfigurarea s-a încheiat"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "mediul \"%s\" nu este selectat"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "examinez fişierul hdlist [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "examinez fişierul synthesis [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "creez hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -979,77 +1074,77 @@ msgstr ""
"Nu pot genera fişierul synthesis pentru mediul \"%s\". Fişierul "
"dumneavoastră hdlist ar putea fi corupt."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problemă la citirea fişierului hdlist/synthesis al mediului \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "scriu fişierul listă pentru mediul \"%s\""
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...copierea a eşuat"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "copiez fişierul cu descrieri pentru \"%s\"..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...copierea s-a terminat"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, 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:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "calculez ms5sum pt. fişierul sursă hdlist/synthesis copiat"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "copierea [%s] a eşuat (eroare md5sum)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "calculez md5sum a fişierului sursă hdlist/synthesis descărcat"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...copierea eşuată: nepotrivire md5sum"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "nu a fost găsit nici un fişier rpm de la [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "citesc fişierele rpm de la [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "nu pot citi fişierele rpm din [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1060,74 +1155,74 @@ msgstr ""
"asta se poate întampla dacă aţi montat manual directorul când aţi creat "
"mediul."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "nu a fost găsit nici un fişier hdlist pentru mediul \"%s\""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "copiez hdlist (sau synthesis) sursă pentru \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "am găsit hdlist (sau synthesis) verificat ca %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "nu a fost găsit nici un fişier hdlist pentru mediul \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "examinez fişierul cheie publică pentru \"%s\"..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, 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:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "nu pot importa fişierul cheie publică pentru \"%s\""
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "scriu fişierul listă pentru mediul \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "am adăugat mediul %s"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "nu pot percurge fişierul hdlist pentru \"%s\""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problemă la citirea fişierului synthesis al mediului \"%s\""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "citest antetele de pe mediul \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "DdYy"
@@ -1187,47 +1282,52 @@ msgstr "mediu incoerent \"%s\" marcat ca mobil dar nu este aşa"
msgid "unable to access medium \"%s\""
msgstr "nu pot accesa mediul \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Nici un pachet numit %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Următoarele pachete conţin %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "datorită %s lipsă"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "totul este deja instalat"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "datorită %s nesatisfăcute"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "încerc să promovez %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "pentru a păstra %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "pentru a instala %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "datorita conflictelor cu %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "necerute"
@@ -1247,6 +1347,16 @@ msgstr "ID cheie incorect (%s)"
msgid "Missing signature (%s)"
msgstr "Semnătură lipsă (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "nu pot scrie fişierul [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Copierea a eşuat"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1264,8 +1374,8 @@ msgstr ""
"\n"
"Utilizare:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1281,19 +1391,19 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - verifică dacă instalarea poate fi îndeplinită corect.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr ""
" --force - forţează invocarea chiar dacă unele pachete nu există.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - urpmi distribuit între maşinile cu alias.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - afişare etichetă Împachetat de: packager.\n"
@@ -1304,8 +1414,8 @@ msgid " --root - use another root for rpm removal.\n"
msgstr ""
" --root - foloseşte altă rădăcină pentru instalarea rpm-urilor.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
@@ -1326,18 +1436,18 @@ msgstr ""
"distribuţie, utilă\n"
" pt. (dez)instalarea unui chroot cu opţiunea --root .\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr ""
" --probe-synthesis - încearcă găsirea şi folosirea fişierelor synthesis.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - încearcă găsirea şi folosirea fişierelor hdlist.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - mod detaliat.\n"
@@ -1348,37 +1458,37 @@ msgid " -a - select all packages matching expression.\n"
msgstr ""
" -a - selectează toate pachetele ce se potrivesc cu expresia.\n"
-#: ../urpme:76
+#: ../urpme:73
#, fuzzy, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Doar superutilizatorul poate elimina medii"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "pachete necunoscute "
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "pachet necunoscut "
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "ştergerea pachetului %s va strica sistemul dvs"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Nimic de şters"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Verific pt. ştergerea următoarelor pachete"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1390,12 +1500,12 @@ msgstr[1] ""
msgstr[2] ""
"Pentru a satisface dependenţele, următoarele pachete vor fi şterse (%d MB)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
@@ -1403,12 +1513,12 @@ msgstr[0] "şterg pachetul %s"
msgstr[1] "şterg pachetul %s"
msgstr[2] "şterg pachetul %s"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (D/n) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Ştergere nereuşită"
@@ -1434,14 +1544,14 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --help - afişează acest mesaj de ajutor.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - foloseşte un mediu specificat (tipic un raport de "
"erori).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr " --excludemedia - nu folosi mediile date, separate prin virgulă.\n"
@@ -1452,13 +1562,13 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../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"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1472,7 +1582,7 @@ msgid " --use-distrib - use the given path to access media\n"
msgstr ""
" --synthesis - foloseşte fişierul synthesis dat în loc de urpmi db.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1483,7 +1593,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - nu afişează liniile identice.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - foloseşte numai mediile de actualizare.\n"
@@ -1622,76 +1732,86 @@ msgstr " --group - afişare etichetă grup: grup.\n"
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr " --name - afişează doar numele pachetelor.\n"
#: ../urpmf:73
#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr " --name - afişează doar numele pachetelor.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - afişează eticheta Perimat: toate perimatele.\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr " --packager - afişare etichetă Împachetat de: packager.\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, fuzzy, c-format
msgid " --provides - provides tags\n"
msgstr ""
" --provides - afişează eticheta Oferă: tot ce oferă (linii multiple).\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, fuzzy, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - afişează eticheta Necesită: toate necesităţile.\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --size - afişare etichetă Mărime: mărime.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, fuzzy, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - afişare etichetă sourcepm: sursa rpm.\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - afişează eticheta Perimat: toate perimatele.\n"
+
+#: ../urpmf:81
#, fuzzy, c-format
msgid " --summary - summary\n"
msgstr " --summary - afişare etichetă Sumar: sumar.\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr " --url - afişare etichetă url: url\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr " --verbose - mod detaliat.\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -l - listează fişierele din pachet.\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - afişează versiune, ediţie şi arhitectură cu nume.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "folosind mediul specific pe %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1700,12 +1820,12 @@ msgstr ""
"Notă: din moment ce nici un mediu căutat foloseşte hdlist, urpmf nu a putut "
"întoarce nici un rezultat\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Puteţi folosi --name pentru a căuta în numele pachetelor.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1722,45 +1842,45 @@ msgstr ""
"\n"
"Utilizare:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
" --media - foloseşte numai mediile date, separate prin virgulă.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr ""
" --auto-select - selectare automată pachete pentru actualizare sistem.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
" --auto-select - selectare automată pachete pentru actualizare sistem.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, fuzzy, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr ""
" --no-md5sum - dezactivează verificarea fişierelor folosind MD5SUM.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, fuzzy, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - forţează actualizarea cheii gpg.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1769,12 +1889,12 @@ msgstr ""
" --no-uninstall -nu se dezinstalează pachete niciodată, renunţă la "
"instalare.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, fuzzy, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --install-src - instalează numai pachetele sursă (fără binare).\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1783,7 +1903,7 @@ msgstr ""
" --keep - păstrează pachetele existente dacă este posibil, refuză\n"
" pachetele cerute dacă duc la eliminări lor.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1794,39 +1914,45 @@ msgstr ""
" sau actualiza mai multe pachete decât date,\n"
" implicit este %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - lungime tranzacţii mici, implicit este %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, fuzzy, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy - impune căutarea fuzzy (identic cu -y).\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, fuzzy, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr ""
" --src - pachetul următor este un pachet sursă ( identic cu -s).\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr " --install-src - instalează numai pachetele sursă (fără binare).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr ""
" --clean - şterge rpm-urile din cache înainte de orice altceva.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, fuzzy, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - păstreză rpm-urile nefolosite în cache.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1836,7 +1962,7 @@ msgstr ""
"pachetelor fără\n"
" verificarea dependenţelor\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1846,13 +1972,13 @@ msgstr ""
" pachetelor fără verificarea dependenţelor şi a "
"integrităţii.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr ""
" --root - foloseşte altă rădăcină pentru instalarea rpm-urilor.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1862,53 +1988,53 @@ msgstr ""
"distribuţie, utilă\n"
" pt. instalarea unui chroot cu opţiunea --root .\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr ""
" --wget - foloseşte wget pentru obţinerea fişierelor de la "
"distanţă.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr ""
" --curl - foloseşte curl pentru obţinerea fişierelor de la "
"distanţă.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, fuzzy, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr ""
" --curl - foloseşte curl pentru obţinerea fişierelor de la "
"distanţă.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - limitează viteza de descărcare.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1918,7 +2044,7 @@ msgstr ""
" (--no-resume dezactivează opţiunea, implicit este "
"dezactivată).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1928,7 +2054,7 @@ msgstr ""
"considerat a fi\n"
" implicit 1080 (formatul este <gazdăproxy[:port]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1938,7 +2064,7 @@ msgstr ""
"proxy\n"
" (formatul este <utilizator:parolă>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1947,7 +2073,7 @@ msgstr ""
" --bug - produce un raport de erori în directorul indicat de \n"
" argumentul următor.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, fuzzy, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1957,7 +2083,7 @@ msgstr ""
" (--no-verify-rpm o dezactivează, implicit este "
"activată).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, fuzzy, c-format
msgid ""
" --test - only verify if the installation can be achieved "
@@ -1965,39 +2091,44 @@ msgid ""
msgstr ""
" --test - verifică dacă instalarea poate fi îndeplinită corect.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - exclude calea separată prin virgulă.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - exclude fişierele documentaţie.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, fuzzy, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --no-uninstall -nu se dezinstalează pachete niciodată, renunţă la "
"instalare.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --url - afişare etichetă url: url\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - afişare etichetă Descriere: descriere.\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - packetele a căror instalare poate fi sărită\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - packetele a căror instalare poate fi sărită\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2007,62 +2138,62 @@ msgstr ""
"opţiuni\n"
" decât implicit.\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - păstreză rpm-urile nefolosite în cache.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - selectează toate potrivirile în linia de comandă.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - permite căutarea în Provides pentru găsirea pachetelor.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, 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"
-#: ../urpmi:155
+#: ../urpmi:153
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - mod silenţios.\n"
-#: ../urpmi:157
+#: ../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:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
"Ce se poate face cu fişierele rpm binare când se foloseşte --install-src"
-#: ../urpmi:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2071,7 +2202,7 @@ msgstr ""
"Directorul [%s] există deja, folosiţi un alt director pt. raportarea "
"erorilor sau ştergeţi-l"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Nu pot creea directorul [%s] pentru raportul de erori"
@@ -2081,41 +2212,43 @@ msgstr "Nu pot creea directorul [%s] pentru raportul de erori"
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "Actualizare"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "Actualizare"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "Ieşire din instalare"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "Ieşire din instalare"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2123,12 +2256,12 @@ msgid ""
msgstr ""
"Pentru a satisface dependenţele, următoarele pachete vor fi şterse (%d MB)"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Ce alegeţi? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2136,7 +2269,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2144,19 +2277,19 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Continuaţi totuşi?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (D/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2165,7 +2298,7 @@ msgstr ""
"Unele pachete cerute nu pot fi instalate:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2174,7 +2307,7 @@ msgstr ""
"Unele pachete cerute nu pot fi instalate:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2185,7 +2318,7 @@ msgstr ""
"trebuie şterse pentru ca altele să fie actualizate:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2196,7 +2329,7 @@ msgstr ""
"trebuie şterse pentru ca altele să fie actualizate:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2205,7 +2338,7 @@ msgstr ""
"Unrmătoarele pachete trebuie şterse pentru ca altele să fie actualizate:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2214,12 +2347,17 @@ msgstr ""
"Unrmătoarele pachete trebuie şterse pentru ca altele să fie actualizate:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2228,12 +2366,12 @@ msgstr ""
"Trebuie să fiţi root pentru a instala următoarele pachete dependente:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2241,100 +2379,17 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../urpmi:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Apăsaţi Enter când e gata..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Renunţă"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "Următoarele pachete au semnături greşite"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Următoarele pachete au semnături greşite"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Doriţi să continuaţi instalarea?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Instalarea a eşuat"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "distribui %s"
-
-#: ../urpmi:726
-#, fuzzy, c-format
-msgid "installing %s from %s"
-msgstr "instalez %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "instalez %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Să încerc instalarea fără verificarea dependenţelor? (d/N) "
-
-#: ../urpmi:776
-#, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Încearcă instalarea încă şi mai dur (--force)? (d/N) "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d tranzacţii de instalarea eşuate"
-msgstr[1] "%d tranzacţii de instalarea eşuate"
-msgstr[2] "%d tranzacţii de instalarea eşuate"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Instalarea este posibilă"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "totul este deja instalat"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "totul este deja instalat"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "totul este deja instalat"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "totul este deja instalat"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "repornesc urpmi"
@@ -2466,49 +2521,49 @@ msgstr " -v - mod detaliat.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "nu pot actualiza mediul \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Doar superutilizatorul poate adăuga un mediu"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "Voi scrie fişierul de configurare [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "Nu pot crea fişierul de configurare [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "nu e nevoie să daţi <calea relativă pt. hdlist> cu --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "lipseşte <calea relativă a hdlist>\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "Nu pot creea mediul \"%s\"\n"
@@ -2670,17 +2725,17 @@ msgstr " -a - selectează toate mediile.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - căutare aproximativă în numele mediilor.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Doar superutilizatorul poate elimina medii"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "nimic de şters (folosiţi urpmi.addmedia pentru a adăuga un mediu)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2736,18 +2791,18 @@ msgstr " -a - selectează toate mediile nedemontabile.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - forţează generarea fişierelor hdlist.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Doar superutilizatorul poate actualiza medii"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
"nimic de actualizat (folosiţi urpmi.addmedia pentru a adăuga un mediu)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2756,22 +2811,22 @@ msgstr ""
"intrarea de actualizat lipseşte\n"
"(una din %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "ignoring media %s"
msgstr "Editez mediul \"%s\":"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "enabling media %s"
msgstr "elimin mediul \"%s\""
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2787,7 +2842,7 @@ msgstr ""
"\n"
"Utilizare:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2795,39 +2850,39 @@ msgid ""
msgstr ""
" --media - foloseşte numai mediile date, separate prin virgulă.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - impune căutarea fuzzy (identic cu -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - listează pachetele disponibile.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - listează mediile disponibile.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - listează mediile disponibile şi URL-ul lor.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
" --list-nodes - listează nodurile disponibile când se foloseşte --"
"parallel.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - listează alias-urile paralele disponibile.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
@@ -2835,13 +2890,13 @@ msgstr ""
" --dump-config - afişează configurarea in formatul argumentului urpmi."
"addmedia.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr ""
" --src - pachetul următor este un pachet sursă ( identic cu -s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
@@ -2849,12 +2904,12 @@ msgstr ""
" --sources - dă toate pachetele sursă înainte de descărcare (numai "
"root).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --url - afişare etichetă url: url\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2864,23 +2919,23 @@ msgstr ""
"distribuţie.\n"
" Aceasta permite interogarea unei distribuţii.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - afişează jurnalul modificărilor\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - afişare etichetă Sumar: sumar.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr ""
" --whatrequires - căutare inversă în lista de dependenţe a pachetului.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, fuzzy, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2888,7 +2943,7 @@ msgid ""
msgstr ""
" -R - căutare inversă în lista de dependenţe a pachetului.\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
@@ -2896,49 +2951,49 @@ msgid ""
msgstr ""
" -p - permite căutarea în Provides pentru a găsi pachetul.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - ieşire completă cu pachetul ce va fi şters.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - extinde interogarea la dependenţele pachetelor.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - arată grupurile şi cu nume.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - afişează informaţii utile pentru utilizatorul uman.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - listează fişierele din pachet.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - mod silenţios.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - afişează versiunea şi ediţia cu nume.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - pachetul următor este un pachet sursă (identic cu -src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2947,46 +3002,46 @@ msgstr ""
" -u - şterge pachetul dacă o versiune mai recentă este deja "
"instalată.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - impune căutarea fuzzy (identic cu --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - ca şi -y, dar forţează căutarea ignorând litere mari sau "
"mici.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " numele sau fişierele rpm date în linia de comandă sunt interogate.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes poate fi folosit numai cu --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"Notă: din moment ce nici un mediu căutat foloseşte hdlist, urpmf nu a putut "
"întoarce nici un rezultat\n"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2994,12 +3049,25 @@ msgstr ""
"Notă: din moment ce nici un mediu căutat foloseşte hdlist, urpmf nu a putut "
"întoarce nici un rezultat\n"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Nu s-a gasit changelog\n"
#, fuzzy
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Următoarele pachete au semnături eronate:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Doriţi să continuaţi?"
+
+#, fuzzy
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "E nevoie de autorizare pentru a partaja directoare"
@@ -3374,9 +3442,6 @@ msgstr "Nu s-a gasit changelog\n"
#~ "refuză\n"
#~ " pachetele cerute dacă duc la eliminări lor.\n"
-#~ msgid "unable to write file [%s]"
-#~ msgstr "nu pot scrie fişierul [%s]"
-
#~ msgid ""
#~ " --distrib-XXX - automatically create a medium for XXX part of a\n"
#~ " distribution, XXX may be main, contrib, updates or\n"
@@ -3446,6 +3511,3 @@ msgstr "Nu s-a gasit changelog\n"
#~ msgid "do you agree ?"
#~ msgstr "Sunteţi de acord?"
-
-#~ msgid "Everything already installed"
-#~ msgstr "totul este deja instalat"
diff --git a/po/ru.po b/po/ru.po
index cb7a32d4..bfcf04a1 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2007-06-17 17:36+0300\n"
"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
"Language-Team: Russian <ru@li.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "Установка RPM"
@@ -30,7 +30,7 @@ msgstr "Установка RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Ошибка: невозможно найти файл %s, операция отменяется"
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_ОК"
@@ -96,7 +96,7 @@ msgstr "_Установить"
msgid "_Save"
msgstr "_Сохранить"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Отмена"
@@ -116,17 +116,17 @@ msgstr "Неизвестная опция %s"
msgid "No packages specified"
msgstr "Пакеты не указаны"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Подождите, пожалуйста..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "Необходимы права root'а"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -137,42 +137,42 @@ msgstr ""
"%s\n"
"Всё равно продолжить установку?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Внимание"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "ОК"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (обновить)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (установить)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "Выбор пакета"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Нужен один из следующих пакетов:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Прервать"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -183,59 +183,61 @@ msgstr ""
"%s\n"
"Всё равно продолжить установку?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Для удовлетворения зависимостей будет установлен следующий пакет:"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Для удовлетворения зависимостей будут установлены следующие пакеты:"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d пакет, %d МБ)"
msgstr[1] "(%d пакетов, %d МБ)"
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Устанавливается пакет..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "невозможно получить пакеты с исходными кодами, аварийное завершение"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Подготовка..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Устанавливается пакет `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Пожалуйста, вставьте носитель с названием \"%s\" в устройство [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Загружается пакет `%s'..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Следующие пакеты имеют плохие подписи:\n"
-"%s\n"
-"\n"
-"Хотите продолжить установку?"
+msgid "_Done"
+msgstr "_Готово"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -246,41 +248,27 @@ msgstr ""
"%s\n"
"Возможно вам необходимо обновить базу данных urpmi"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "удаляется %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Подготовка..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Устанавливается пакет `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Готово"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, c-format
msgid "Installation failed:"
msgstr "Установка не удалась:"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Все уже установлено"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Установка завершена"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "удаляется %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -315,7 +303,7 @@ msgstr " -f - выводить полное имя rpm (NVRA)\n"
msgid " defaults to %s.\n"
msgstr " по умолчанию %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Только суперпользователю разрешается устанавливать пакеты"
@@ -325,98 +313,98 @@ msgstr "Только суперпользователю разрешается
msgid "Running urpmi in restricted mode..."
msgstr "Запуск urpmi в ограниченном режиме..."
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "невозможно открыть базу данных RPM"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr "в кэше найдено %d заголовков rpm; удаляется %d устаревших заголовков"
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "неверное имя rpm-файла [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "извлекается rpm-файл [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...извлечение выполнено"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...извлечение не удалось: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "нет доступа к rpm-файлу [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "невозможно разобрать spec-файл %s [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "невозможно зарегистрировать rpm-файл"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Несовместимая архитектура для [%s]"
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "ошибка регистрации локальных пакетов"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Эта операция запрещена при работе в ограниченном режиме"
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "неверное объявление proxy в командной строке\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr "Каталог chroot не существует"
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: невозможно прочитать rpm-файл \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
+#, c-format
+msgid "chroot directory doesn't exist"
+msgstr "Каталог chroot не существует"
+
+#: ../urpm/args.pm:424
#, c-format
msgid "Can't use %s without %s"
msgstr "%s нельзя использовать без %s"
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
#, c-format
msgid "Can't use %s with %s"
msgstr "%s нельзя использовать без %s"
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr "Слишком много аргументов\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "создан файл hdlist synthesis для источника \"%s\""
@@ -606,7 +594,12 @@ msgstr "пакет %s не найден."
msgid "malformed URL: [%s]"
msgstr "неверно сформированный URL: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "извлекаются rpm-файлы из источника \"%s\"..."
@@ -616,44 +609,49 @@ msgstr "извлекаются rpm-файлы из источника \"%s\"..."
msgid "[repackaging]"
msgstr "[повторная упаковка]"
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, 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:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "невозможно создать транзакцию"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "невозможно извлечь из пакета delta-rpm %s"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "добавляется пакет %s (id=%d, eid=%d, update=%d, file=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "невозможно установить пакет %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "удаляется пакет %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "удаляется пакет %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "удаляются установленные rpm-файлы (%s) из %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Дополнительная информация о пакете %s"
@@ -683,11 +681,103 @@ msgstr "База не определена"
msgid "Cannot connect to ldap uri:"
msgstr "невозможно подключиться к ldap по URI:"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "база данных %s заблокирована"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Внимание"
+
+#: ../urpm/lock.pm:65
#, c-format
msgid "%s database locked"
msgstr "база данных %s заблокирована"
+#: ../urpm/main_loop.pm:99
+#, c-format
+msgid "The following package has bad signature"
+msgstr "Следующий пакет имеет неверную подпись"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Следующие пакеты имеют неверные подписи"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Продолжить установку?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Установка не удалась"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "распределяется %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "устанавливается %s из %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "устанавливается %s"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Попробовать установить без проверки зависимостей? (y/N) "
+
+#: ../urpm/main_loop.pm:205
+#, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "Попробовать принудительную установку (--force)? (y/N)"
+
+#: ../urpm/main_loop.pm:247
+#, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d установочная транзакция завершилась неудачей"
+msgstr[1] "%d установочных транзакций завершились неудачей"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Установка возможна."
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr "Пакеты находятся в актуальном состоянии"
+
+#: ../urpm/main_loop.pm:271
+#, c-format
+msgid "Package %s is already installed"
+msgstr "Пакет %s уже установлен"
+
+#: ../urpm/main_loop.pm:272
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Пакеты %s уже установлен"
+
+#: ../urpm/main_loop.pm:275
+#, c-format
+msgid "Package %s can not be installed"
+msgstr "Пакет %s невозможно установить"
+
+#: ../urpm/main_loop.pm:276
+#, c-format
+msgid "Packages %s can not be installed"
+msgstr "Пакеты %s невозможно установить"
+
#: ../urpm/md5sum.pm:23
#, c-format
msgid "examining %s file"
@@ -740,7 +830,7 @@ msgstr "не следует использовать \"synthesis\" (источн
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "следует использовать \"synthesis\" (источник \"%s\")"
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "нет доступа к файлу hdlist для \"%s\"; источник проигнорирован"
@@ -835,7 +925,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Поиск: начало - %s, конец - %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "выполняется второй проход для вычисления зависимостей\n"
@@ -900,67 +990,72 @@ msgstr "невозможно обработать файл media.cfg"
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "нет доступа к источнику с дистрибутивом (не найден файл media.cfg)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "был выбран несуществующий источник \"%s\""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "выбирается составной источник: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "удаляется источник \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "перенастраивается urpmi для источника \"%s\""
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...перенастройка не удалась"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "перенастройка выполнена"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Ошибка создания файла имён: не найдена зависимость %d"
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr "Ошибка создания файла имён: невозможно записать в файл (%s)"
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "источник \"%s\" уже обновлён"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "изучается файл hdlist [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "изучается файл synthesis [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "создаётся hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -969,77 +1064,77 @@ msgstr ""
"невозможно создать файл synthesis для источника \"%s\". Возможно файл hdlist "
"повреждён."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "проблема чтения файла hdlist или synthesis источника \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "копируется [%s] для источника \"%s\"..."
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...копирование не удалось"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "копируется файл описания для \"%s\"..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...копирование выполнено"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "копирование [%s] не удалось (файл подозрительно короткий)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "вычисляется md5-сумма скопированного hdlist источника (или synthesis)"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "копирование [%s] не удалось (не совпадает md5-сумма)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "вычисляется md5-сумма полученного hdlist источника (или synthesis)"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...извлечение не удалось: md5-суммы не совпадают"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "в [%s] rpm-файлы не найдены "
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "читаются rpm-файлы из [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "невозможно прочитать rpm-файлы из [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "rpm'ы не прочитаны"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1050,74 +1145,74 @@ msgstr ""
"это могло произойти потому, что при создании источника каталог был "
"примонтирован вручную."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "неверный файл hdlist %s для источника \"%s\""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "загружается hdlist (или synthesis) источника из \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "найден искомый hdlist (или synthesis): %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "не найден файл hdlist для источника \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "проверяется файл открытого ключа для \"%s\"..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...импортирован ключ %s из файла открытого ключа \"%s\""
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "невозможно импортировать файл открытого ключа \"%s\""
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "записывается файл списка для источника \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, c-format
msgid "updated medium \"%s\""
msgstr "обновлён источник \"%s\""
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "невозможно разобрать файл hdlist источника \"%s\""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "проблема чтения файла synthesis источника \"%s\""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "читаются заголовки из источника \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "NnНн"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "YyДд"
@@ -1177,47 +1272,52 @@ msgstr "непонятный источник \"%s\" отмечен как съ
msgid "unable to access medium \"%s\""
msgstr "нет доступа к источнику \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Нет пакета с именем %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Следующие пакеты содержат %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "из-за отсутствия %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Пакет %s уже установлен"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "из-за неудовлетворённости %s"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "попытка активизировать %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "чтобы сохранить %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "чтобы установить %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "из-за конфликтов с %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "не запрошенный"
@@ -1237,6 +1337,16 @@ msgstr "Неверный Key ID (%s)"
msgid "Missing signature (%s)"
msgstr "Отсутствует подпись (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Невозможно создать конфигурационный файл [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Копирование не удалось"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1254,8 +1364,8 @@ msgstr ""
"\n"
"использование:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - вывести это справочное сообщение\n"
@@ -1270,7 +1380,7 @@ msgstr " --auto - автоматически выбрать пакет
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - проверить возможность корректного удаления\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
@@ -1278,12 +1388,12 @@ msgstr ""
" --force - принудительное выполнение, даже если некоторые пакеты\n"
" не существуют\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - распределённый urpmi через машины алиаса\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - повторно упаковывать файлы перед удалением\n"
@@ -1293,8 +1403,8 @@ msgstr " --repackage - повторно упаковывать файлы п
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - использовать другой корень для удаления rpm.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
@@ -1315,17 +1425,17 @@ msgstr ""
" --use-distrib - настроить urpme на лету из дерева distrib; полезно\n"
" для установки/удаления в/из chroot с параметром --root\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - использовать файл synthesis\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - использовать файл hdlist\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - подробный режим.\n"
@@ -1335,37 +1445,37 @@ msgstr " --verbose, -v - подробный режим.\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - выбрать все пакеты, удовлетворяющие выражению\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Только суперпользователю разрешается удалять пакеты"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "неизвестные пакеты"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "неизвестный пакет"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "удаление пакета %s нарушит работу вашей системы"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Нечего удалять"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Проверяется возможность удаления следующих пакетов"
-#: ../urpme:134
+#: ../urpme:131
#, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1373,24 +1483,24 @@ msgid_plural ""
msgstr[0] "Для удовлетворения зависимостей будет удалён следующий пакет"
msgstr[1] "Для удовлетворения зависимостей будут удалены следующие %d пакетов"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr " (%d МБ)"
-#: ../urpme:138
+#: ../urpme:135
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "Удалить %d пакет?"
msgstr[1] "Удалить %d пакетов?"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (y/N) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Удаление не удалось"
@@ -1417,14 +1527,14 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - вывести номер версии этой утилиты.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - использовать особое окружение (обычно отчёт\n"
" об ошибке).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1439,14 +1549,14 @@ msgstr ""
" --literal, -l - не искать соответствия шаблону, использовать аргумент\n"
" как буквенную строку.\n"
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - использовать только указанные источники,\n"
" перечисленные через запятую.\n"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1459,7 +1569,7 @@ msgstr ""
msgid " --use-distrib - use the given path to access media\n"
msgstr " --synthesis - использовать указанный synthesis вместо БД urpmi.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - использовать указанный synthesis вместо БД urpmi.\n"
@@ -1469,7 +1579,7 @@ msgstr " --synthesis - использовать указанный synthesis
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - не выводить идентичные строки.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - использовать только источник обновления.\n"
@@ -1602,78 +1712,88 @@ msgid " --group - group\n"
msgstr " --group - группа\n"
#: ../urpmf:72
+#, fuzzy, c-format
+msgid " --license - license\n"
+msgstr " --name - имя пакета\n"
+
+#: ../urpmf:73
#, c-format
msgid " --name - package name\n"
msgstr " --name - имя пакета\n"
-#: ../urpmf:73
+#: ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - устаревшие теги\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr " --packager - создатель пакета\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - предоставляемые теги\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - требуемые теги\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, c-format
msgid " --size - installed size\n"
msgstr " --size - установленный размер\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - имя rpm с исходными кодами\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - устаревшие теги\n"
+
+#: ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr " --summary - сводка\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, c-format
msgid " --url - url\n"
msgstr " --url - url\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, c-format
msgid " --vendor - vendor\n"
msgstr " --vendor - поставщик\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -m - источник, в котором был найден пакет\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - вывод версии, релиза и архитектуры с названием.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
"Неверный формат: вы можете использовать только один тег с несколькими "
"значениями"
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "используется специфическое окружение для %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1682,12 +1802,12 @@ msgstr ""
"Примечание: т.к. исследуемый источник не использует hdlist'ы, urpmf был не в "
"состоянии возвратить какой-либо результат\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Вы можете использовать --name для поиска пакетов по их именам.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1704,7 +1824,7 @@ msgstr ""
"\n"
"использование:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1712,7 +1832,7 @@ msgstr ""
" --searchmedia - использование только указанных источников для поиска\n"
" запрошенных пакетов.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
@@ -1721,29 +1841,29 @@ msgstr ""
" --auto - неинтерактивный режим; на вопросы даются ответы по "
"умолчанию.\n"
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr ""
" --auto-select - автоматический выбор пакетов для обновления системы.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr " --auto-update - обновить источник, а затем систему.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - отключить проверку файла MD5SUM.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - принудительно обновить gpg-ключ.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1752,12 +1872,12 @@ msgstr ""
" --no-uninstall - никогда не предлагать удалять пакет, прерывать "
"установку.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - не устанавливать пакеты (только загрузить)\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1767,7 +1887,7 @@ msgstr ""
" отклонять запрошенные пакеты, которые приводят к "
"удалению.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1778,39 +1898,45 @@ msgstr ""
" устанавливаться или обновляться дополнительные\n"
" пакеты кроме указанных, по умолчанию %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - длина маленькой транзакции, по умолчанию %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy, -y - поиск на основе нечёткой логики.\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src, -s - следующий пакет содержит исходные коды.\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
" --install-src - установка только пакетов с исходными кодами\n"
" (без бинарников).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - перед началом операции удалить rpm из кэша.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - не удалять rpm из кэша.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1819,7 +1945,7 @@ msgstr ""
" --allow-nodeps - разрешить устанавливать пакеты без проверки зависимостей\n"
" после запроса у пользователя\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1828,12 +1954,12 @@ msgstr ""
" --allow-force - разрешить устанавливать пакеты без проверки зависимостей\n"
" и целостности после запроса у пользователя\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - использовать другой корень для установки rpm.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1842,49 +1968,49 @@ msgstr ""
" --use-distrib - настроить urpmi на лету из дерева distrib; полезно\n"
" для установки в chroot с параметром --root.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - использовать wget для загрузки удалённых файлов\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - использовать curl для загрузки удалённых файлов.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr ""
" --prozilla - использовать prozilla для загрузки удалённых файлов\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr " --curl-options - дополнительные параметры, передаваемые в curl\n"
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr " --rsync-options - дополнительные параметры, передаваемые в rsync\n"
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr " --wget-options - дополнительные параметры, передаваемые во wget\n"
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
" --prozilla-options - дополнительные параметры, передаваемые в prozilla\n"
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - ограничение скорости загрузки\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1893,7 +2019,7 @@ msgstr ""
" --resume - возобновить загрузку частично загруженных файлов\n"
" (--no-resume отключает её; по умолчанию отключена).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1902,7 +2028,7 @@ msgstr ""
" --proxy - использовать указанный HTTP-прокси; по умолчанию\n"
" используется порт 1080 (формат - <хост_прокси[:порт]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1911,7 +2037,7 @@ msgstr ""
" --proxy-user - пользователь и пароль для аутентификации на прокси\n"
" (формат - <пользователь:пароль>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1920,7 +2046,7 @@ msgstr ""
" --bug - вывести отчёт об ошибках в каталог, определённый\n"
" следующим аргументом\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1929,47 +2055,52 @@ msgstr ""
" --verify-rpm - проверять подписи rpm перед установкой\n"
" (--no-verify-rpm отключает её; по умолчанию включена)\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr " --test - проверить возможность корректной установки\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - исключить пути, перечисленные через запятую\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - исключить файлы документации (docs)\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --ignoresize - не проверять дисковое пространство перед установкой\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr ""
" --ignorearch - разрешать устанавливать rpm'ы для несоответствующих\n"
" архитектур\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - не выполнять scriptlet'ы пакета\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - пакеты, установка которых будет пропущена\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - пакеты, установка которых будет пропущена\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1978,49 +2109,49 @@ msgstr ""
" --more-choices - если найдены разные пакеты, предложить больше\n"
" вариантов, чем предлагается по умолчанию\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - не блокировать базу данных rpm\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - обновить пакеты только с такой же архитектурой\n"
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - выбрать все совпадения из командной строки\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - разрешить искать пакеты в provides\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - не искать пакеты в provides\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - тихий режим (quiet).\n"
-#: ../urpmi:157
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
" будут установлены имена или rpm-файлы, указанные в командной строке.\n"
-#: ../urpmi:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
"Ошибка: опцию --auto-select нельзя использовать вместе со списком пакетов.\n"
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2029,13 +2160,13 @@ msgstr ""
"Ошибка: чтобы создать отчёт об ошибке, нужно указать обычные аргументы\n"
"командной строки вместе с опцией --bug.\n"
-#: ../urpmi:220
+#: ../urpmi:218
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
"При использовании опции --install-src нельзя устанавливать бинарные rpm-файлы"
-#: ../urpmi:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2044,7 +2175,7 @@ msgstr ""
"Каталог [%s] уже существует, используйте другой каталог для отчёта об ошибке "
"или удалите его"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Невозможно создать каталог [%s] для отчёта об ошибке"
@@ -2054,7 +2185,7 @@ msgstr "Невозможно создать каталог [%s] для отчё
msgid "Environment directory %s does not exist"
msgstr "Каталог окружения %s не существует"
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2063,46 +2194,48 @@ msgstr ""
"Ошибка: похоже, что %s примонтирован только для чтения.\n"
"Используйте --allow-force для принудительного выполнения операции."
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr "Обновляется источник...\n"
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (для обновления)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (для обновления)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (для установки)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, c-format
msgid "%s (to install)"
msgstr "%s (для установки)"
-#: ../urpmi:447
+#: ../urpmi:454
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "Для удовлетворения зависимости '%s' нужен один из следующих пакетов:"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Ваш выбор? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2113,7 +2246,7 @@ msgstr ""
"более старых, чем установленные:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2124,7 +2257,7 @@ msgstr ""
"более старых, чем установленные:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, c-format
msgid ""
"\n"
@@ -2133,12 +2266,12 @@ msgstr ""
"\n"
"Продолжить установку?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (Y/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2147,7 +2280,7 @@ msgstr ""
"Запрошенный пакет невозможно установить:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2156,7 +2289,7 @@ msgstr ""
"Некоторые запрошенные пакеты невозможно установить:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2167,7 +2300,7 @@ msgstr ""
"пакет для обновления остальных:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2178,7 +2311,7 @@ msgstr ""
"пакеты для обновления остальных:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2187,7 +2320,7 @@ msgstr ""
"Следующий пакет будет удалён для обновления остальных:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2196,12 +2329,17 @@ msgstr ""
"Следующие пакеты будут удалены для обновления остальных:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(только проверка; ничего удалено не будет)"
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2210,111 +2348,29 @@ msgstr ""
"Для установки следующих зависимостей нужны права root'а:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(только проверка, без установки)"
-#: ../urpmi:597
+#: ../urpmi:617
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Установить 1 пакет?"
msgstr[1] "Установить %d пакетов?"
-#: ../urpmi:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Нажмите 'Enter', когда будете готовы..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Отмена"
-#: ../urpmi:671
-#, c-format
-msgid "The following package has bad signature"
-msgstr "Следующий пакет имеет неверную подпись"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Следующие пакеты имеют неверные подписи"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Продолжить установку?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Установка не удалась"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "распределяется %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "устанавливается %s из %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "устанавливается %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Попробовать установить без проверки зависимостей? (y/N) "
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Попробовать принудительную установку (--force)? (y/N)"
-
-#: ../urpmi:815
-#, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d установочная транзакция завершилась неудачей"
-msgstr[1] "%d установочных транзакций завершились неудачей"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Установка возможна."
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr "Пакеты находятся в актуальном состоянии"
-
-#: ../urpmi:838
-#, c-format
-msgid "Package %s is already installed"
-msgstr "Пакет %s уже установлен"
-
-#: ../urpmi:839
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Пакеты %s уже установлен"
-
-#: ../urpmi:842
-#, c-format
-msgid "Package %s can not be installed"
-msgstr "Пакет %s невозможно установить"
-
-#: ../urpmi:843
-#, c-format
-msgid "Packages %s can not be installed"
-msgstr "Пакеты %s невозможно установить"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "urpmi перезапускается"
@@ -2445,32 +2501,32 @@ msgstr " -v - подробный режим\n"
msgid "unable to update medium \"%s\"\n"
msgstr "невозможно обновить источник \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, fuzzy, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr "неверный <url> (для локального каталога путь должен быть абсолютным)\n"
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Добавлять источники разрешено только суперпользователю"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, c-format
msgid "creating config file [%s]"
msgstr "создаётся конфигурационный файл [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "Невозможно создать конфигурационный файл [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "с опцией --distrib не нужно указывать <относительный путь к hdlist>"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
@@ -2479,17 +2535,17 @@ msgstr ""
"\n"
"Добавить источник '%s'"
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "отсутствует <относительный путь к hdlist>\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr "%s нельзя использовать без удалённого источника"
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "невозможно создать источник \"%s\"\n"
@@ -2656,17 +2712,17 @@ msgstr " -a - выбрать все источники.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - нечёткое совпадение названий источников.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Удалять источники разрешено только суперпользователю"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "нечего удалять (добавьте источник с помощью urpmi.addmedia)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2722,17 +2778,17 @@ msgstr " -a - выбрать все несъёмные источн
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - принудительно обновить файл synthesis/hdlist.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Обновлять источники разрешено только суперпользователю"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "нечего обновлять (добавьте источник с помощью urpmi.addmedia)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2741,22 +2797,22 @@ msgstr ""
"отсутствует обновляемый пункт\n"
"(один из %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "игнорируется источник %s"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "включается источник %s"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2773,7 +2829,7 @@ msgstr ""
"\n"
"использование:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2782,51 +2838,51 @@ msgstr ""
" --searchmedia - использовать только указанные источники для поиска\n"
" запрошенных (или обновляемых) пакетов.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - поиск на основе нечёткой логики (эквивалент -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - список доступных пакетов.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - список доступных источников.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - список доступных источников и их url.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
" --list-nodes - список доступных узлов при использовании --parallel.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - список доступных алиасов parallel.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
" --dump-config - дамп config'а в виде аргумента для urpmi.addmedia.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr ""
" --src - следующий пакет содержит исходные коды (эквивалент -s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
@@ -2834,14 +2890,14 @@ msgstr ""
" --sources - вывод всех пакетов с исходными кодами перед загрузкой\n"
" (только для root'a).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr ""
" --ignorearch - разрешить запрашивать rpm'ы для несоответствующих "
"архитектур.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2850,22 +2906,22 @@ msgstr ""
" --use-distrib - настройка urpmi на лету из дерева distrib.\n"
" Опция разрешает опрос дистрибутива.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - вывод журнала изменений.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - вывод тега summary.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - реверсивный поиск того, что требуется пакету.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2875,7 +2931,7 @@ msgstr ""
" - расширенный реверсивный поиск (включая виртуальные "
"пакеты).\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, c-format
msgid ""
" --whatprovides, -p\n"
@@ -2884,50 +2940,50 @@ msgstr ""
" --whatprovides, -p\n"
" - поиск в provides для поиска пакетов.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - полный вывод данных для удаляемого пакета.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - расширенный запрос к зависимостям пакета.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - вывод групп с именами.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - вывод полезной информации в удобной для чтения форме.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - список файлов в пакете.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, c-format
msgid " -m - equivalent to -du\n"
msgstr " -m - эквивалент -du\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - показать версию и релиз с названием.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - следующий пакет содержит исходные коды (эквивалент --"
"src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2935,50 +2991,50 @@ msgid ""
msgstr ""
" -u - удалить пакет, если уже установлена более новая версия.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
" -y - поиск на основе нечёткой логики\n"
" (эквивалент --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -Y - эквивалент -y, но без учёта регистра.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " запрошены имена или rpm-файлы, указанные в командной строке.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes может использоваться только с --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
"для источника \"%s\" отсутствует hdlist; только частичный результат для "
"пакета %s"
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"для источника \"%s\" отсутствует hdlist; только частичный результат для "
"пакетов %s"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
"для источника \"%s\" отсутствует hdlist; невозможно возвратить результат для "
"пакета %s"
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2986,10 +3042,21 @@ msgstr ""
"для источника \"%s\" отсутствует hdlist; невозможно возвратить результат для "
"пакетов %s"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Не найден журнал изменений\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Следующие пакеты имеют плохие подписи:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Хотите продолжить установку?"
+
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Чтобы использовать параметр --use-distrib, нужно иметь права root'а"
diff --git a/po/sc.po b/po/sc.po
index 9a94a0d8..b5ddc2d0 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+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"
@@ -19,7 +19,7 @@ msgstr ""
"X-Generator: KBabel 1.3\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "Aposentadura RPM"
@@ -29,7 +29,7 @@ msgstr "Aposentadura RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -95,7 +95,7 @@ msgstr "_Aposenta"
msgid "_Save"
msgstr "_Sarva"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "A_nnudda"
@@ -117,17 +117,17 @@ msgstr ""
msgid "No packages specified"
msgstr "nisçunu pakitu nominau %s"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Abeta..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "Depis essi root"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -138,42 +138,42 @@ msgstr ""
"%s\n"
"Sigu?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Atentu"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Andat"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (de ajorronai)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (de aposentai)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "Sçoberu de is pakitus"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Dui bolit unu de is pakitus ki sighint:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "L_assa"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -184,14 +184,14 @@ msgstr ""
"%s\n"
"Sigu?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, 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:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -199,47 +199,49 @@ msgstr ""
"Po satisfai is dependèntzias, megu a aposentai is %d pakitus ki sighint:\n"
"%s\n"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, fuzzy, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "%d pakitus"
msgstr[1] "%d pakitus"
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Aposentadura pakitus..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "no potzu lompi a is pakitus mitza, bessu"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Apariçu..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Aposentu su pakitu `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Intra su mèdiu nominau \"%s\" in su trastu [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Scarrigamentu de su pakitu `%s'..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Is pakitus ki sighint tenint firmas malas:\n"
-"%s\n"
-"\n"
-"Bolis sighiri a dus aposentai?"
+msgid "_Done"
+msgstr "_Fatu"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -250,41 +252,27 @@ msgstr ""
"%s\n"
"Forsis bolis ajorronai su database de urpmi"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "srèxinu %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Apariçu..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Aposentu su pakitu `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Fatu"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Aposentadura faddia"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Pakitu(s) jai aposentau(s)"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Aposentadura acabada"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "srèxinu %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -319,7 +307,7 @@ msgstr " -g - amosta is grupus cun su nòmini puru.\n"
msgid " defaults to %s.\n"
msgstr " predefiniu est %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Feti superuser podit aposentai pakitus"
@@ -329,98 +317,98 @@ msgstr "Feti superuser podit aposentai pakitus"
msgid "Running urpmi in restricted mode..."
msgstr "Fatzu girai urpmi in modalidadi strinta..."
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "no potzu aberri su database rpm"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nòmini file rpm [%s] no bàlidu"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "agatu su file rpm [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...agataus"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...no agataus: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "no potzu lompi a su file rpm [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "no potzu analisai \"%s\" in su file [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "no potzu assentai su file rpm"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "faddina assentendi is pakitus localis"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, 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:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "decrarada de proxy mala in arraya de cumandu\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: no fait a ligi su file rpm \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "apu fraigau sa hdlist synthesis po su mèdiu \"%s\""
@@ -609,7 +597,12 @@ msgstr "no apu agatau su pakitu %s"
msgid "malformed URL: [%s]"
msgstr "input mali formau: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "agatu is file rpm de su mèdiu \"%s\"..."
@@ -619,7 +612,7 @@ msgstr "agatu is file rpm de su mèdiu \"%s\"..."
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -627,37 +620,42 @@ msgstr ""
"fata sa transatzioni po aposentai in %s (srèxina=%d, aposenta=%d, ajorrona=%"
"d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "no potzu creai sa transatzioni"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, 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:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "açunju su pakitu %s (id=%d, eid=%d, update=%d, file=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "no potzu aposentai su pakitu %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "srèxinu su pakitu %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "srèxinu su pakitu %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "aposentu %s de %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Atra sceda apitzus de su pakitu %s"
@@ -687,11 +685,103 @@ msgstr "nisçunu pakitu nominau %s"
msgid "Cannot connect to ldap uri:"
msgstr ""
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "su database de urpmi est serrau"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Atentu"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "su database de urpmi est serrau"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "Is pakitus ki sighint tenint firmas malas"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Is pakitus ki sighint tenint firmas malas"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Bolis sighiri a aposentai?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Aposentadura faddia"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "seu distribuendi %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "aposentu %s de %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "aposentu %s"
+
+#: ../urpm/main_loop.pm:187
+#, 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:205
+#, 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:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d transatzionis de aposentadura faddias"
+msgstr[1] "%d transatzionis de aposentadura faddias"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Fait a aposentai"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "Pakitu(s) jai aposentau(s)"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Pakitu(s) jai aposentau(s)"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "Pakitu(s) jai aposentau(s)"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Pakitu(s) jai aposentau(s)"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -740,7 +830,7 @@ msgstr "provu a sçoberai su mèdiu \"%s\" ki no esistit"
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "apu fraigau sa hdlist synthesis po su mèdiu \"%s\""
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "no potzu lompi a sa hdlist de \"%s\", mèdiu innyorau"
@@ -833,7 +923,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Sa circa cumentzat: %s e acabat: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "fatzu su segundu passu po carculai is dependèntzias\n"
@@ -898,67 +988,72 @@ msgstr "no potzu aberri su database rpm"
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:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "provu a sçoberai su mèdiu \"%s\" ki no esistit"
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "sçoberu prus mèdius: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "burru su mèdiu \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "torru a assetiai urpmi po is mèdius \"%s\""
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...assètiu faddiu"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "assètiu fatu"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "su mèdiu \"%s\" no d'as sçoberau"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "controllu su file hdlist [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "Controllu su file synthesis [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "fraigu sa hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -967,77 +1062,77 @@ msgstr ""
"No potzu fraigai sa synthesis po su mèdiu \"%s\". Forsis sa hdlist est "
"pudesça."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "barrancu ligendi sa hdlist o sa synthesis de su mèdiu \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "scriu sa llist po su mèdiu \"%s\""
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...còpia faddia"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "còpiu su file descriidori de \"%s\"..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...còpia fata"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, 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:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "càrculu su md5sum de sa hdlist (o synthesis) copiada"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "còpia de [%s] faddia (su md5sum no cunsonat)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "càrculu su md5sum de sa hdlist (o synthesis) agatada"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...no agataus: dissonàntzia md5sum"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "no apu agatau rpm de [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "liju is file rpm de [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "no potzu ligi is file rpm de [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "no apu liju rpm"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1047,74 +1142,74 @@ msgstr ""
"no potzu lompi a su mèdiu \"%s\",\n"
"podit essi ki apas carrigau a manu sa directory candu as creau su mèdiu."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "no apu agatau hdlist po su mèdiu \"%s\""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "agatu sa hdlist (o synthesis) de \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "apu agatau una hdlist (o synthesis) analisada ke %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "no apu agatau hdlist po su mèdiu \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "controllu sa crai pùbriga de \"%s\"..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, 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:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "no potzu importai sa crai pùbriga de \"%s\""
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "scriu sa llist po su mèdiu \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "apu açuntu su mèdiu %s"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "no potzu analisai sa hdlist de \"%s\""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "barrancu ligendi sa synthesis de su mèdiu \"%s\""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "liju is header de su mèdiu \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "Yy"
@@ -1174,47 +1269,52 @@ msgstr "mèdiu lòfiu \"%s\" marcau ke arremoviditzu ma no tali"
msgid "unable to access medium \"%s\""
msgstr "no potzu lompi a su mèdiu \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Nisçunu pakitu nominau %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Is pakitus ki sighint cuntenint %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "ca amancat %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Pakitu(s) jai aposentau(s)"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "ca no est satisfatu %s"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "provu a sçoberai %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "po podi apoderai %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "po podi aposentai %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "ca gherrat cun %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "no bòfiu"
@@ -1234,6 +1334,16 @@ msgstr "Crai ID (%s) no bàlida"
msgid "Missing signature (%s)"
msgstr "Amancat sa firma (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "No fait a creai su file de assètiu [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Còpia faddia"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1251,8 +1361,8 @@ msgstr ""
"\n"
"impreu:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1268,19 +1378,19 @@ msgstr ""
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - aberiga ki fait a srexinai in manera lìmpia.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr ""
" --force - fortza sa essighidura mancai cancu pakitu no dui siat.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - urpmi distribuiu intr''e màkinas diferentis.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr ""
@@ -1291,8 +1401,8 @@ msgstr ""
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - imprea un'atra root po srexinai is rpm.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - imprea un'atra root po aposentai is rpm.\n"
@@ -1311,17 +1421,17 @@ 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:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - prova a agatai e impreai sa synthesis.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - prova a agatai e imprea sa hdlist.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - po ndi sciri de prus.\n"
@@ -1332,37 +1442,37 @@ msgid " -a - select all packages matching expression.\n"
msgstr ""
" -a - sçobera tpotu is pakitus ki cunsonant cun s'espressada.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Feti superuser podit srexinai pakitus"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "pakitus disconnotus"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "pakitu disconnotu"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "srexinai su pakitu %s at a arrogai su sistema"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Nudda de srexinai"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Controllu po srexinai is pakitus ki sighint"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1374,24 +1484,24 @@ msgstr[1] ""
"Po satisfai is dependèntzias, is %d pakitus ki sighint dus apu a srexinai (%"
"d MB)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "srèxinu su pakitu %s"
msgstr[1] "srèxinu su pakitu %s"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (y/N) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Srexinadura faddia"
@@ -1418,14 +1528,14 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --help - amosta custa missada de ajudu.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - imprea unu ambienti indidau (unu arrelatadori normalli\n"
" de fartas).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1437,13 +1547,13 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../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"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1457,7 +1567,7 @@ msgid " --use-distrib - use the given path to access media\n"
msgstr ""
" --synthesis - imprea sa synthesis indidada in logu de su db de urpmi.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1468,7 +1578,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - no amostist arrayas ugualis.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - imprea feti mèdius de ajorronamentu.\n"
@@ -1605,78 +1715,88 @@ msgstr " --group - amosta su tag group: grupu.\n"
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr " --name - amosta feti is nòminis de is pakitus.\n"
#: ../urpmf:73
#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr " --name - amosta feti is nòminis de is pakitus.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - amosta su tag obsoletes: totu is ki imbeçat.\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr ""
" --packager - amosta su tag packager: cuncordadori de su pakitu.\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, fuzzy, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - amosta su tag provides: totu su ki donat.\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, fuzzy, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - amosta su tag requires: totu su ki bolit.\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --size - amosta su tag size: mesura.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, fuzzy, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - amosta su tag sourcerpm: rpm mitza.\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - amosta su tag obsoletes: totu is ki imbeçat.\n"
+
+#: ../urpmf:81
#, fuzzy, c-format
msgid " --summary - summary\n"
msgstr " --summary, -S - amosta s'arresùmini.\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr " --url - amosta su tag url: url.\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr " --verbose - po ndi sciri de prus.\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -l - allistra is file in su pakitu.\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - amosta sa versioni, arrelasçu e arkidetura cun su "
"nòmini.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "impreu unu ambienti indidau in %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1685,12 +1805,12 @@ msgstr ""
"Noda: sendi ki is mèdius castiaus no tenint hdlist, urpmf no at pòtziu "
"torrai arresurtau\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Forsis bolis impreai --name po circai is nòminis de is pakitus.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1707,7 +1827,7 @@ msgstr ""
"\n"
"impreu:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1715,14 +1835,14 @@ msgstr ""
" --searchmedia - imprea feti is mèdius indidaus po circai is pakitus "
"(ajorronus) ki bolis.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
@@ -1730,36 +1850,36 @@ msgstr ""
" --auto-select - sçobera in automàtigu is pakitus po ajorronai su "
"sistema.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
" --auto-select - sçobera in automàtigu is pakitus po ajorronai su "
"sistema.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, fuzzy, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - disabiva su controllu de su file MD5SUM.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, fuzzy, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - fortza s'ajorronu de sa crai gpg.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
"installation.\n"
msgstr " --no-uninstall - no preguntist mai po srexinai unu pakitu, bessi.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - no aposentist pakitus (scarrigaddus feti)\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1769,7 +1889,7 @@ msgstr ""
"pakitus\n"
" sçoberaus ki funt de srexinai.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1780,40 +1900,46 @@ msgstr ""
" o ajorronai prus pakitus de is ki boliast,\n"
" predefiniu est %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - balori de is transatzioneddas, predefiniu est %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, fuzzy, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy - imponi sa circa fuzzy (su pròpiu de -y).\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, fuzzy, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr ""
" --src - su pakitu ki benit est unu pakitu mitza (su pròpiu de -"
"s).\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr " --install-src - aposenta feti pakitus mitza (no binàrius).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr ""
" --clean - burra de sa cache is rpm innantis de dònnia atra cosa.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - no boghist is rpm de sa cache.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1822,7 +1948,7 @@ msgstr ""
" --allow-nodeps - permiti de domandai a su user ki bolit aposentai\n"
" pakitus sentza de controllai is dependèntzias.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1831,12 +1957,12 @@ msgstr ""
" --allow-force - permiti de preguntai a su user ki bolit aposentai\n"
" pakitus sentza de controllai dependèntzias e interesa.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - imprea un'atra root po aposentai is rpm.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1845,47 +1971,47 @@ msgstr ""
" --use-distrib - assètia urpmi a sa bolada de una mata de distribuidura,\n"
" useful po aposentai una chroot cun scera --root.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - imprea wget po agatai is file atesu.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - imprea curl po agatai is file atesu.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, fuzzy, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --curl - imprea curl po agatai is file atesu.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - lìmida su lestriori de scàrrigu.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1894,7 +2020,7 @@ msgstr ""
" --resume - torra a pigai a scarrigai is file scarrigaus in parti\n"
" (--no-resume da disabivat, de predefiniu disabivada).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1903,7 +2029,7 @@ msgstr ""
" --proxy - imprea custu HTTP proxy, a nùmeru de porta poneus\n"
" sa 1080 de predefiniu (formau: <proxyhost[:port]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1912,7 +2038,7 @@ msgstr ""
" --proxy-user - indida user e password po ti connosci\n"
" su proxy (formau: <user:password>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1921,7 +2047,7 @@ msgstr ""
" --bug - produsi una arrelata-fartas in sa directory\n"
" indidada de s'argumentu ki sighit.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, fuzzy, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1930,44 +2056,49 @@ msgstr ""
" --verify-rpm - aberiga sa firma rpm innantis de aposentai\n"
" (--no-verify-rpm da disabivat, abivada desinuncas).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, fuzzy, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr " --test - aberiga ki fait a aposentai in manera lìmpia.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - lassa a foras is path pratzius de vìrgula.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - lassa a foras is file doc.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, fuzzy, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr " --no-uninstall - no preguntist mai po srexinai unu pakitu, bessi.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --url - amosta su tag url: url.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - amosta su tag description: descriidura.\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - pakitus de ndi sartai s'aposentadura\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - pakitus de ndi sartai s'aposentadura\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1976,62 +2107,62 @@ msgstr ""
" --more-choices - candu agatas prus pakitus, proponi prus sçoberus\n"
" de su predefiniu.\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - no boghist is rpm de sa cache.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, 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:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, 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:153
+#: ../urpmi:151
#, 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"
-#: ../urpmi:154
+#: ../urpmi:152
#, 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"
-#: ../urpmi:155
+#: ../urpmi:153
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - modalidadi citia.\n"
-#: ../urpmi:157
+#: ../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:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, 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:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2040,7 +2171,7 @@ msgstr ""
"Sa directory [%s] esistit jai, imprea una atra directory po arrelatai fartas "
"o burradda"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "No potzu creai sa directory [%s] po arrelatai is fartas"
@@ -2050,7 +2181,7 @@ msgstr "No potzu creai sa directory [%s] po arrelatai is fartas"
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2059,34 +2190,36 @@ msgstr ""
"Faddina: %s parit carrigau a ligi-feti.\n"
"Impreu --allow-force po fortzai s'atzioni."
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (de ajorronai)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (de ajorronai)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (de aposentai)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (de aposentai)"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2095,12 +2228,12 @@ msgstr ""
"Po satisfai is dependèntzias, is %d pakitus ki sighint dus apu a srexinai (%"
"d MB)"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Ita sçoberas? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2111,7 +2244,7 @@ msgstr ""
"beçus de cuddus aposentaus:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2122,19 +2255,19 @@ msgstr ""
"beçus de cuddus aposentaus:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Sigu comuncas?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (Y/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2143,7 +2276,7 @@ msgstr ""
"Cancu pakitu bòfiu no fait a d'aposentai:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2152,7 +2285,7 @@ msgstr ""
"Cancu pakitu bòfiu no fait a d'aposentai:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2163,7 +2296,7 @@ msgstr ""
"bolint srexinaus po ndi podi ajorronai atrus:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2174,7 +2307,7 @@ msgstr ""
"bolint srexinaus po ndi podi ajorronai atrus:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2183,7 +2316,7 @@ msgstr ""
"Is pakitus ki sighint bolint srexinaus po ndi podi ajorronai atrus:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2192,12 +2325,17 @@ msgstr ""
"Is pakitus ki sighint bolint srexinaus po ndi podi ajorronai atrus:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2206,111 +2344,29 @@ msgstr ""
"Depis essi root po aposentai is dependèntzias ki sighint:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, 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:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Craca Enter candu ses prontu..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Annudda"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "Is pakitus ki sighint tenint firmas malas"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Is pakitus ki sighint tenint firmas malas"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Bolis sighiri a aposentai?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Aposentadura faddia"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "seu distribuendi %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "aposentu %s de %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "aposentu %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Provu a aposentai sentza de controllai is dependèntzias? (y/N) "
-
-#: ../urpmi:776
-#, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Provu a aposentai de manera finas prus forti (--force)? (y/N) "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d transatzionis de aposentadura faddias"
-msgstr[1] "%d transatzionis de aposentadura faddias"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Fait a aposentai"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Pakitu(s) jai aposentau(s)"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Pakitu(s) jai aposentau(s)"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "Pakitu(s) jai aposentau(s)"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "Pakitu(s) jai aposentau(s)"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "torru a aberri urpmi"
@@ -2441,49 +2497,49 @@ msgstr " -v - po ndi sciri de prus.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "no potzu ajorronai su mèdiu \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Feti superuser podit açungi mèdius"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "At a creai su file de assètiu [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "No fait a creai su file de assètiu [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "no serbit a donai <bia acapiada po hdlist> cun --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "amancat <bia acapiada po hdlist>\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "no potzu creai su mèdiu \"%s\"\n"
@@ -2644,17 +2700,17 @@ msgstr " -a - sçobera totu is mèdius.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - fai una circa fuzzy in is nòminis de is mèdius.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Feti superuser podit burrai mèdius"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "nudda de burrai (imprea urpmi.addmedia po açungi mèdius)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2710,17 +2766,17 @@ msgstr " -a - sçobera totu is mèdius no arremoviditzus.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - fortza sa fraigadura de is file hdlist.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Feti superuser podit ajorronai mèdius"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "nudda de ajorronai (imprea urpmi.addmedia po açungi mèdius)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2729,22 +2785,22 @@ msgstr ""
"amancat sa boxi de ajorronai\n"
"(una de %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "innyoru su mèdiu %s"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "abivu su mèdiu %s"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2761,7 +2817,7 @@ msgstr ""
"\n"
"impreu:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2770,51 +2826,51 @@ msgstr ""
" --searchmedia - imprea feti is mèdius indidaus po circai is pakitus "
"(ajorronus) ki bolis.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - imponi sa circa fuzzy (su pròpiu de -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - allistra totu is pakitus disponiditzus.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - allistra is mèdius disponiditzus.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - allistra is mèdius disponiditzus e is url insoru.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
" --list-nodes - allistra is nuus disponiditzus candu impreas --parallel.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - allistra ia alias parallelus disponiditzus.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr " --dump-config - amosta s'assètiu ke argumentu de urpmi.addmedia.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr ""
" --src - su pakitu ki benit est unu pakitu mitza (su pròpiu de -"
"s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
@@ -2822,12 +2878,12 @@ msgstr ""
" --sources - amosta totu is pakitus mitza innantis de dus scarrigai "
"(feti root).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --url - amosta su tag url: url.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2836,22 +2892,22 @@ msgstr ""
" --use-distrib - assètia urpmi a sa bolada de una mata de distribuidura.\n"
" Custu permitit de preguntai una distribuidura.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - amosta s'arrelata de is mudas.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - amosta s'arresùmini.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - circa arretrogada de su ki bolit su pakitu.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2861,57 +2917,57 @@ msgstr ""
" - circa arretrogada manna (circa is pakitus virtualis "
"puru).\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -p - circa in is tag provides po agatai unu pakitu.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - arresurtaus prenus, cun is pakitus de srexinai.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr ""
" -d - allàdia sa circa a is dependèntzias de is pakitus.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - amosta is grupus cun su nòmini puru.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - amosta scedas utilosas de manera ligiditza.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - allistra is file in su pakitu.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - modalidadi citia.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - amosta versioni e arrelasçu cun su nòmini puru.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - su pakitu ki benit est unu pakitu mitza (su pròpiu de --"
"src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2920,44 +2976,44 @@ msgstr ""
" -u - srèxina su pakitu ki una versioni prus noa est jai "
"aposentada.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - imponi una circa fuzzy (su pròpiu de --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -Y - comenti e -y, ma no connoscit mannas e piticas.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " preguntu is nòminis o is file rpm scritus in arraya de cumandu.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes fait a d'impreai feti cun --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"Noda: sendi ki is mèdius castiaus no tenint hdlist, urpmf no at pòtziu "
"torrai arresurtau\n"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2965,11 +3021,22 @@ msgstr ""
"Noda: sendi ki is mèdius castiaus no tenint hdlist, urpmf no at pòtziu "
"torrai arresurtau\n"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "No apu agatau s'arrelata de is mudas\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Is pakitus ki sighint tenint firmas malas:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Bolis sighiri a dus aposentai?"
+
#, fuzzy
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Depis essi root po donai custu cumandu ! \n"
diff --git a/po/sk.po b/po/sk.po
index 734886f2..b8bb282e 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+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"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "Inštalácia RPM"
@@ -27,7 +27,7 @@ msgstr "Inštalácia RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -93,7 +93,7 @@ msgstr "_Inštalácia"
msgid "_Save"
msgstr "_Uložiť"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Zrušiť"
@@ -115,17 +115,17 @@ msgstr ""
msgid "No packages specified"
msgstr "žiaden balík s menom %s"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Čakajte prosím..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "Sú vyžadované právomoci root-a"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -136,42 +136,42 @@ msgstr ""
"%s\n"
"Pokračovať?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Varovanie"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (na aktualizáciu)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (na inštaláciu)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "Výber balíka"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Jeden z nasledujúcich balíkov je potrebný:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Zrušiť"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -182,7 +182,7 @@ msgstr ""
"%s\n"
"Pokračovať?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
@@ -190,7 +190,7 @@ msgstr ""
"Kvôli zachovaniu závislostí, by mali byť nainštalované nasledujúce balíky (%"
"d MB)"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -198,7 +198,7 @@ msgstr ""
"Kvôli zachovaniu závislostí, by mali byť nainštalované nasledujúce balíky (%"
"d MB)"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
@@ -206,40 +206,42 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Inštalácia balíkov..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "nie je možné získať zdrojové balíky, prerušenie"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Príprava..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Inštalácia balíka `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Prosím vložte médium \"%s\" do zariadenia [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Získavanie balíka `%s'..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Nasledovné balíky obsahujú chybné podpisy:\n"
-"%s\n"
-"\n"
-"Chcete pokračovať v inštalácii?"
+msgid "_Done"
+msgstr "_Hotovo"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -250,41 +252,27 @@ msgstr ""
"%s\n"
"Možno budete chcieť aktualizovať Vašu urpmi databázu"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "odstraňovanie %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Príprava..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Inštalácia balíka `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Hotovo"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Inštalácia zlyhala"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Všetko je už nainštalované"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Inštalácia ukončená"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "odstraňovanie %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -320,7 +308,7 @@ msgstr " -g - zobraziť skupiny aj s menami.\n"
msgid " defaults to %s.\n"
msgstr " implicitná je %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Inštalovať balíky má dovolené len superužívateľ"
@@ -330,98 +318,98 @@ 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:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "nemôžem otvoriť rpmdb"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nesprávne meno rpm súboru [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "sťahovanie rpm súboru [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...získavanie ukončené"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...získavanie zlyhalo: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "nie je možné pristúpiť k rpm súboru [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, 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:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "nie je možné zaregistrovať rpm súbor"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "chyba pri registrácii lokálnych balíkov"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, 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:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "nesprávna deklarácia proxy v príkazovom riadku\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, 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:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "vytváranie hdlist synthesis súboru pre zdroj \"%s\""
@@ -612,7 +600,12 @@ msgstr "balík %s nebol nájdený."
msgid "malformed URL: [%s]"
msgstr "zle zadaný vstup: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "sťahovanie rpm súborov zo zdroja \"%s\"..."
@@ -622,7 +615,7 @@ msgstr "sťahovanie rpm súborov zo zdroja \"%s\"..."
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -630,37 +623,42 @@ msgstr ""
"vytvorenie transakcie pre inštaláciu %s (odstrániť=%d, inštalovať=%d, "
"aktualizácia=%d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "nie je možné vytvoriť transakciu"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, 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:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "pridávanie balíka %s (id=%d, eid=%d, aktualizácia=%d, súbor=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "nie je možné nainštalovať balík %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "odstraňovanie balíka %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "odstraňovanie balíka %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "inštalácia %s z %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Viac informácií o balíku %s"
@@ -690,11 +688,104 @@ msgstr "žiaden balík s menom %s"
msgid "Cannot connect to ldap uri:"
msgstr ""
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "urpmi databáza je uzamknutá"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Varovanie"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "urpmi databáza je uzamknutá"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "Nasledujúce balíky obsahujú zle signatúry"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Nasledujúce balíky obsahujú zle signatúry"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Chcete pokračovať v inštalácii ?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Inštalácia zlyhala"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "distribuovanie %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "inštalácia %s z %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "inštalácia %s"
+
+#: ../urpm/main_loop.pm:187
+#, 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:205
+#, 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:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d inštalačná transakcia zlyhala"
+msgstr[1] "%d inštalačná transakcia zlyhala"
+msgstr[2] "%d inštalačná transakcia zlyhala"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Inštalácia je možná"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "Všetko je už nainštalované"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Všetko je už nainštalované"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "Všetko je už nainštalované"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Všetko je už nainštalované"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -745,7 +836,7 @@ msgstr "pokus o výber neexistujúceho zdroja \"%s\""
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "vytváranie hdlist synthesis súboru pre zdroj \"%s\""
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr ""
@@ -838,7 +929,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Spustenie vyhľadávania: %s ukončenie: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "druhý prechod pre výpočet závislostí\n"
@@ -905,67 +996,72 @@ msgstr ""
"nie je možné pristúpiť k prvému inštalačnému zdroju (nebol nájdený súbor "
"hdlists)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "pokus o výber neexistujúceho zdroja \"%s\""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "výber viacerých zdrojov: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "odstránenie zdroja \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "rekonfigurovanie urpmi pre zdroj \"%s\""
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...rekonfigurovanie zlyhalo"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "rekonfigoranie hotové"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "zdroj \"%s\" nebol zvolený"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "preverovanie hdlist súboru [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "preverovanie synthesis súboru [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "vytváranie hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -974,77 +1070,77 @@ msgstr ""
"Nebolo možné vytvoriť súbor synthesis pre médium \"%s\". Súbor hdlist je "
"pravdepodobne poškodený."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problém s čítaním hdlist alebo synthesis súboru pre zdroj \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "zápis súboru so zoznamom pre zdroj \"%s\""
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...kopírovanie zlyhalo"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopírovanie súboru popisov pre \"%s\"..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...kopírovanie ukončené"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopírovanie [%s] zlyhalo (súbor je podozrivo malý)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "výpočet md5sum zo zdroja hdlist (alebo synthesis)"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "kopírovanie [%s] zlyhalo zlyhalo (nesprávny md5sum)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "výpočet md5sum zo získaných súborov hdlist (alebo synthesis)"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...získavanie zlyhalo: rozdielny md5sum"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "žiadné rpm súbory nájdené z [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "čítanie rpm súborov z [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "nie je možné čítať rpm súbory z [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "nenačítané žiadne rpm balíky"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1054,74 +1150,74 @@ msgstr ""
"nie je možné pristúpiť k zdroju \"%s\",\n"
"čo sa môže stať ak bol adresár pripojený počas vytvárania zdroja."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "nebol nájdený hdlist súbor pre zdroj \"%s\""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "získavanie zdrojového hdlist (alebo synthesis) pre \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "nájdený overený hdlist (alebo synthesis) ako %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "nebol nájdený hdlist súbor pre zdroj \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "prehliada sa súbor s verejnými kľúčmi \"%s\"..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, 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:1553
+#: ../urpm/media.pm:1560
#, 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:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "zápis súboru so zoznamom pre zdroj \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "pridaný zdroj %s"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "nie je možné správne prečítať hdlist súbor pre \"%s\""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, 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:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "načitávanie hlavičiek pre zdroj \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "YyAaÁá"
@@ -1182,47 +1278,52 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "nie je možné pristúpiť k zdroju \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Žiaden balík s menom %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Nasledujúce balíky obsahujú %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "kvôli chýbajucemu %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Všetko je už nainštalované"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "kvôli neuspokojenému %s"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "pokus o povýšenie %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "pre zachovanie poradia %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "pre inštaláciu balíka %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "kvôli konfliktom s %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "nepožadovaný"
@@ -1242,6 +1343,16 @@ msgstr "Chybný kľúč (%s)"
msgid "Missing signature (%s)"
msgstr "Chýbajúci podpis (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "nie je možné zapísať konfiguračný súbor [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Kopírovanie zlyhalo"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1259,8 +1370,8 @@ msgstr ""
"\n"
"použitie:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1276,19 +1387,19 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - overiť či bude odstránenie vykonané bez problémov.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr ""
" --force - vnútiť vykonanie aj ak niektoré balíky neexistujú.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - distribuované urpmi na rôzne stroje.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - zobraziť značku autor balíka: packager.\n"
@@ -1299,8 +1410,8 @@ msgid " --root - use another root for rpm removal.\n"
msgstr ""
" --root - použiť iný koreňový adresár pre odstránenie rpm balíkov.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
@@ -1321,17 +1432,17 @@ msgstr ""
"vhodné\n"
" pri inštalácii v chroot prostredí s prepínačom --root.\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - pokúsiť sa nájsť a použiť synthesis súbor.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - pokúsiť sa nájsť a použiť hdlist súbor.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - zobraziť podrobnosti.\n"
@@ -1341,37 +1452,37 @@ msgstr " --verbose - zobraziť podrobnosti.\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - vybrať všetky balíky zodpovedajúce výrazu.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Iba superpoužívateľ môže odstraňovať balíky"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "neznáme balíky"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "neznámy balík"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "odstránenie balíka %s zrejme poškodí váš systém"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Nič na odstránenie"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Kontrola odstraňovania týchto balíkov"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1383,12 +1494,12 @@ msgstr[1] ""
msgstr[2] ""
"Z dôvodu zachovania závislostí, balíky %d by mali byť odinštalované (%d MB)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
@@ -1396,12 +1507,12 @@ msgstr[0] "odstraňovanie balíka %s"
msgstr[1] "odstraňovanie balíka %s"
msgstr[2] "odstraňovanie balíka %s"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (á/N) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Odstránenie neskončilo úspechom"
@@ -1426,14 +1537,14 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --help - zobraziť túto pomoc.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - použiť špecifické prostredie (typické pre oznámenie\n"
" o chybe).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1446,14 +1557,14 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../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"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1467,7 +1578,7 @@ msgid " --use-distrib - use the given path to access media\n"
msgstr ""
" --synthesis - použiť zadaný synthesis súbor namiesto urpmi databázy.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1478,7 +1589,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - nezobrazovať zhodné riadky.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - použiť iba aktualizačné zroje.\n"
@@ -1612,76 +1723,86 @@ msgstr " --group - zobraziť značku skupina: group.\n"
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr " --name - zobraziť iba názvy balíkov.\n"
#: ../urpmf:73
#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr " --name - zobraziť iba názvy balíkov.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - zobraziť značku zastaralé: obsoletes.\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr " --packager - zobraziť značku autor balíka: packager.\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, fuzzy, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - zobraziť značku poskytované: provides.\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, fuzzy, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - zobraziť značku vyžadované: requires.\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --size - zobraziť značku veľkosť: size.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, fuzzy, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - zobraziť značku zdrojové rpm: sourcerpm.\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - zobraziť značku zastaralé: obsoletes.\n"
+
+#: ../urpmf:81
#, fuzzy, c-format
msgid " --summary - summary\n"
msgstr " --summary, -S - zobraziť značku sumár: summary.\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr " --url - zobraziť značku url: url.\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr " --verbose - zobraziť podrobnosti.\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -l - zoznam súborov v balíku.\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - zobraziť verziu, vydanie a architektúru spolu s menom.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "použitie špecifického prostredia na %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1690,12 +1811,12 @@ msgstr ""
"Poznámka: Pretože nebol nájdený žiaden zdroj používajúci hdlists, urpmf "
"nemohol vrátiť žiaden výsledok\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Môžete použiť --name na vyhľadanie názvu balíkov.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1712,7 +1833,7 @@ msgstr ""
"\n"
"použitie:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1720,37 +1841,37 @@ msgstr ""
" --searchmedia - použiť iba zadaný zdroj pre nájdenie požadovaných (alebo "
"aktualizovaných) balíkov.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr ""
" --auto-select - automatický výber balíkov pre aktualizáciu systému.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
" --auto-select - automatický výber balíkov pre aktualizáciu systému.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, fuzzy, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - zakázať MD5SUM kontrolu.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, fuzzy, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - vnútiť aktualizáciu gpg kľúča.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1759,12 +1880,12 @@ msgstr ""
" --no-uninstall - nikdy sa nepýtať na odinštalovanie balíka, ukončiť\n"
" inštaláciu.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - neinštalovať balíky, iba ich stiahnuť.\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1774,7 +1895,7 @@ msgstr ""
"požadované\n"
" balíky ktoré môžu viesť k odstraňovaniu.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1785,38 +1906,44 @@ msgstr ""
" alebo aktualizovaných viacero balíkov,\n"
" štandardná hodnota je %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - malá veľkosť transakcií, štandardne je %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, fuzzy, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy - fuzzy vyhľadávanie (to isté ako -y).\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, fuzzy, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr ""
" --src - nasledujúci balík je zdrojový balík (to isté ako -s).\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr " --install-src - nainštalovať len zdrojový balík (bez bináriek).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - odstrániť nepoužité rpm súbory z dočasnej pamäti.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - nevymazať nepoužité rpm súbory z dočasnej pamäti.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1826,7 +1953,7 @@ msgstr ""
"bez\n"
" overovania závislosti.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1836,13 +1963,13 @@ msgstr ""
"bez\n"
" overovania závislosti a integrity.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr ""
" --root - použiť iný koreňový adresár pre inštaláciu rpm balíkov.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1852,47 +1979,47 @@ msgstr ""
"vhodné\n"
" pri inštalácii v chroot prostredí s prepínačom --root.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - použiť wget pre získanie vzdialených súborov.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - použiť curl pre získanie vzdialených súborov.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, fuzzy, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --curl - použiť curl pre získanie vzdialených súborov.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - obmedziť rýchlosť získavania súborov.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1902,7 +2029,7 @@ msgstr ""
" (--no-resume zakáže takéto chovanie, štandardne je "
"zakázané).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1911,7 +2038,7 @@ msgstr ""
" --proxy - použiť špecifikovanú HTTP proxy, číslo portu je\n"
" štandardne 1080 (formát zápisu <proxy[:port]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1920,7 +2047,7 @@ msgstr ""
" --proxy-user - špecifikovanie používateľa a hesla pri použití proxy\n"
" autentifikácie (formát je <používateľ:heslo>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1929,7 +2056,7 @@ msgstr ""
" --bug - vytvoriť oznámenie o chybe do adresára uvedeného\n"
" za argumentom.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, fuzzy, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1939,48 +2066,53 @@ msgstr ""
"rpm\n"
" zakáže overovanie, štandardne sa podpis overuje).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, fuzzy, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr " --test - overiť či bude inštalácia vykonaná bez problémov.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr ""
" --excludepath - cesty ktoré nemajú byť použité; viaceré je možné oddeliť\n"
" čiarkou.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - vynechať súbory s dokumentáciou.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, fuzzy, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --no-uninstall - nikdy sa nepýtať na odinštalovanie balíka, ukončiť\n"
" inštaláciu.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --url - zobraziť značku url: url.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - zobraziť značku popis: description.\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - balíky ktorých inštalácia nebude vykonaná\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - balíky ktorých inštalácia nebude vykonaná\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1990,60 +2122,60 @@ msgstr ""
"možností\n"
" namiesto implicitnej.\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, 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:151
+#: ../urpmi:149
#, 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:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - vybrať všetky zhody na príkazovom riadku.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, 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"
-#: ../urpmi:154
+#: ../urpmi:152
#, 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"
-#: ../urpmi:155
+#: ../urpmi:153
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - zobrazovať minimum informácií.\n"
-#: ../urpmi:157
+#: ../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:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, 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:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2052,7 +2184,7 @@ msgstr ""
"Adresár [%s] už existuje, použite prosím iný adresár pre hlásenie o chybe, "
"alebo ho vymažte"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Nemôžem vytvoriť adresár [%s] pre ohlásenie chyby"
@@ -2062,7 +2194,7 @@ msgstr "Nemôžem vytvoriť adresár [%s] pre ohlásenie chyby"
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2071,34 +2203,36 @@ msgstr ""
"Chyba: %s sa zdá byť pripojený iba pre čítanie.\n"
"Použite --allow-force pre vnútenie tejto operácie."
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (na aktualizáciu)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (na aktualizáciu)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (na inštaláciu)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (na inštaláciu)"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2106,12 +2240,12 @@ msgid ""
msgstr ""
"Z dôvodu zachovania závislostí, balíky %d by mali byť odinštalované (%d MB)"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Váš výber? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2123,7 +2257,7 @@ msgstr ""
"ktoré sú staršie ako tie ktoré sú nainštalované:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2135,19 +2269,19 @@ msgstr ""
"ktoré sú staršie ako tie ktoré sú nainštalované:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Pokračovať?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (Á/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2156,7 +2290,7 @@ msgstr ""
"Niektoré požadované balíky nie je možné nainštalovať:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2165,7 +2299,7 @@ msgstr ""
"Niektoré požadované balíky nie je možné nainštalovať:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2176,7 +2310,7 @@ msgstr ""
"odstránené aby mohli byť iné aktualizované:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2187,7 +2321,7 @@ msgstr ""
"odstránené aby mohli byť iné aktualizované:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2196,7 +2330,7 @@ msgstr ""
"Nasledovné balíky by mali byť odstránené aby bolo možné aktualizovať iné:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2205,12 +2339,17 @@ msgstr ""
"Nasledovné balíky by mali byť odstránené aby bolo možné aktualizovať iné:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2219,12 +2358,12 @@ msgstr ""
"Musíte byť root ak chcete nainštalovať tieto aktualizácie:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2232,100 +2371,17 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../urpmi:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Stlačte Enter ak je možné pokračovať..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Zrušiť"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "Nasledujúce balíky obsahujú zle signatúry"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Nasledujúce balíky obsahujú zle signatúry"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Chcete pokračovať v inštalácii ?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Inštalácia zlyhala"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "distribuovanie %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "inštalácia %s z %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "inštalácia %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Skúsiť inštaláciu bez kontroly závislostí? (á/N) "
-
-#: ../urpmi:776
-#, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Skúsiť \"tvrdšiu\" inštaláciu (--force)? (á/N) "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d inštalačná transakcia zlyhala"
-msgstr[1] "%d inštalačná transakcia zlyhala"
-msgstr[2] "%d inštalačná transakcia zlyhala"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Inštalácia je možná"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Všetko je už nainštalované"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Všetko je už nainštalované"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "Všetko je už nainštalované"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "Všetko je už nainštalované"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "znovuspustenie urpmi"
@@ -2454,49 +2510,49 @@ msgstr " -v - zobraziť podrobnosti.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "nemôžem aktualizovať zdroj \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Iba superpoužívateľ môže pridávať zdroje"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "Vytvoriť konfiguračný súbor [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "Nebolo možné vytvoriť konfiguračný súbor [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "nie je potrebné zadať <relatívnu cesta k hdlist> s --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "chýba <relatívna cesta k hdlist>\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "nie je možné vytvoriť zdroj \"%s\"\n"
@@ -2658,17 +2714,17 @@ msgstr " -a - vybrať všetky zdroje.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - skrátený výpis názvov médií.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Iba superpoužívateľ môže odstraňovať médiá"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "nie je čo odstrániť (použi urpmi.addmedia na pridanie zdroja)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2722,17 +2778,17 @@ msgstr " -a - vybrať všetky nevymeniteľné zdroje.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - vnúť generovanie hdlist súborov.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Iba superpoužívateľ môže aktualizovať médiá"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "nie je čo aktualizovať (použiť urpmi.addmedia na pridanie zdroja)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2741,22 +2797,22 @@ msgstr ""
"chýba názov média pre aktualizáciu\n"
"(jeden z %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "ignorovanie zdroja %s"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "povolenie zdroja %s"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2773,7 +2829,7 @@ msgstr ""
"\n"
"použitie:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2782,37 +2838,37 @@ msgstr ""
" --searchmedia - použiť iba zadaný zdroj pre nájdenie požadovaných (alebo "
"aktualizovaných) balíkov.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - fuzzy vyhľadávanie (to isté ako -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - zobraziť všetky dostupné balíky.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - zobraziť dostupné zdroje.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - zobraziť dostupné zdroje a ich url.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr " --list-nodes - zobraziť dostupné nódy použiteľné pre --parallel.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - zobraziť dostupné aliasy pre --parallel.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
@@ -2820,13 +2876,13 @@ msgstr ""
" --dump-config - exportovať konfiguráciu v tvare argumentu pre urpmi."
"addmedia.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr ""
" --src - nasledujúci balík je zdrojový balík (to isté ako -s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
@@ -2834,12 +2890,12 @@ msgstr ""
" --sources - získať všetky zdrojové balíky pred sťahovaním (iba "
"root).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --url - zobraziť značku url: url.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2848,22 +2904,22 @@ msgstr ""
" --use-distrib - nastaviť urpmi pre používanie distribučného zdroja.\n"
" To umožňuje zadávať dotazy na distribúciu.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - zobraziť históriu zmien.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - zobraziť značku sumár: summary.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - reverzné vyhľadávanie závislostí balíka.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2873,56 +2929,56 @@ msgstr ""
" - rozšírené reverzné vyhľadávanie (vrátane virtuálnych "
"balíkov.\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -p - vyhľadať balík hľadaním v poskytovaných.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - kompletný výstup s balíkmi na odstránenie.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - rozšíriť dotaz o závislosti pre balík.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - zobraziť skupiny aj s menami.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - zobraziť užitočné informácie v čitateľnom formáte.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - zoznam súborov v balíku.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - zobrazovať minimum informácií.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - zobraziť verziu a vydanie spoločne s menom.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - nasledujúci balík je zdrojový balík (to isté ako --src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2930,46 +2986,46 @@ msgid ""
msgstr ""
" -u - odstrániť balík ak už je nainštalovaná novšia verzia.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - fuzzy vyhľadávanie (to isté ako --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - ako -y, ale vnútiť vyhľadávanie bez rozlišovania veľkosti "
"písmen.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " mená alebo rpm súbory zadané na príkazovom riadku budú dotazované.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes nemôže byť použité len s --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"Poznámka: Pretože nebol nájdený žiaden zdroj používajúci hdlists, urpmf "
"nemohol vrátiť žiaden výsledok\n"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2977,11 +3033,22 @@ msgstr ""
"Poznámka: Pretože nebol nájdený žiaden zdroj používajúci hdlists, urpmf "
"nemohol vrátiť žiaden výsledok\n"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Nebol nájdený zoznam zmien\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Nasledovné balíky obsahujú chybné podpisy:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Chcete pokračovať v inštalácii?"
+
#, fuzzy
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Musíte sa autorizovať ak chcete zdieľať adresáre"
@@ -3318,9 +3385,6 @@ msgstr "Nebol nájdený zoznam zmien\n"
#~ "požadované\n"
#~ " balíky ktoré môžu viesť k odstraňovaniu.\n"
-#~ msgid "unable to write file [%s]"
-#~ msgstr "nie je možné zapísať konfiguračný súbor [%s]"
-
#~ msgid ""
#~ " --distrib-XXX - automatically create a medium for XXX part of a\n"
#~ " distribution, XXX may be main, contrib, updates or\n"
diff --git a/po/sl.po b/po/sl.po
index 4211cb83..eb1a99f4 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-sl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2007-01-09 15:01+0100\n"
"Last-Translator: Matjaž Kaše <matjaz.kase@telemach.net>\n"
"Language-Team: slovenščččina <sl@li.org>\n"
@@ -27,7 +27,7 @@ msgstr ""
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
"n%100==4 ? 2 : 3);\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "Namestitev RPM"
@@ -37,7 +37,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:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "V _redu"
@@ -103,7 +103,7 @@ msgstr "_Namesti"
msgid "_Save"
msgstr "_Shrani"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Prekliči"
@@ -123,17 +123,17 @@ msgstr "Neznana možnost %s"
msgid "No packages specified"
msgstr "Določen ni bil noben paket"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Prosim počakajte ..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "Morate biti uporabnik root"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -144,42 +144,42 @@ msgstr ""
"%s\n"
"Naj se namestitev vseeno nadaljuje?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Opozorilo"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "V redu"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (za nadgradnjo)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (za namestitev)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "Izbira paketov"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Potreben je eden od sledečih paketov:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Prekini"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -190,19 +190,19 @@ msgstr ""
"%s\n"
"Naj se namestitev vseeno nadaljuje?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Za zadovoljitev odvisnosti bo nameščen naslednji paket"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Za zadovoljitev odvisnosti bo nameščen naslednji paket"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, fuzzy, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
@@ -211,40 +211,42 @@ msgstr[1] "(%d paketov, %d MB)"
msgstr[2] "(%d paketov, %d MB)"
msgstr[3] "(%d paketov, %d MB)"
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Namestitev paketov ..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "ni mogoče dobiti paketov z izvorno kodo, predčasna prekinitev"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Priprava ..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Nameščanje paketa `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Prosim vstavite \"%s\" v napravo [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Pobiranje paketa `%s'..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Naslednji paketi imajo nepravilne podpise:\n"
-"%s\n"
-"\n"
-"Želite nadaljevati namestitev?"
+msgid "_Done"
+msgstr "_Končano"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -255,41 +257,27 @@ msgstr ""
"%s\n"
"Mogoče bi morali obnoviti podatkovno bazo urpmi"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "odstranjevanje %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Priprava ..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Nameščanje paketa `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Končano"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, c-format
msgid "Installation failed:"
msgstr "Namestitev ni uspela:"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Paketi so že nameščeni"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Namestitev je končana"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "odstranjevanje %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -325,7 +313,7 @@ msgstr " -g - izpiši skupine skupaj z imenom.\n"
msgid " defaults to %s.\n"
msgstr " privzeto je %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Samo uporabniku root je dovoljeno nameščati pakete"
@@ -335,98 +323,98 @@ msgstr "Samo uporabniku root je dovoljeno nameščati pakete"
msgid "Running urpmi in restricted mode..."
msgstr "Poganjanje urpmi v omejenem načinu ..."
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "ni mogoče odpreti rpmdb"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "napačno ime datoteke rpm [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "pridobivanje datoteke rpm [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...pridobivanje je končano"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...pridobivanje je spodletelo: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "ni mogoče dostopati do datoteke rpm [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "ni mogoče razčleniti %s [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "ni mogoče registrirati datoteke rpm"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Zgradba paketa ni združljiva z rpm [%s]"
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "napaka pri registraciji krajevnih paketov"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Ta postopek ni dovoljen v omejenem načinu"
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "napačna deklaracija posrednika v ukazni vrstici\n"
-#: ../urpm/args.pm:135
-#, fuzzy, c-format
-msgid "chroot directory doesn't exist"
-msgstr "Mapa %s ne obstaja"
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: ni mogoče brati datoteke rpm \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
+#, fuzzy, c-format
+msgid "chroot directory doesn't exist"
+msgstr "Mapa %s ne obstaja"
+
+#: ../urpm/args.pm:424
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr "Prveč argumentov\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "zgrajena je bila hdlist synthesis datoteka za vir \"%s\""
@@ -616,7 +604,12 @@ msgstr "paketa %s ni mogoče najti."
msgid "malformed URL: [%s]"
msgstr "popačen URL: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "pridobivanje datotek rpm iz vira \"%s\" ..."
@@ -626,7 +619,7 @@ msgstr "pridobivanje datotek rpm iz vira \"%s\" ..."
msgid "[repackaging]"
msgstr "[ponovna gradnja paketa]"
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -634,37 +627,42 @@ msgstr ""
"določeno je bilo opravilo za nameščanje na %s (odstrani=%d, namesti=%d, "
"nadgradi=%d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "opravila ni mogoče izvesti"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, 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:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "dodajanje paketa %s (id=%d, eid=%d, posodobi=%d, datoteka=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "ni mogoče namestiti paketa %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "odstranjevanje paketa %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "odstranjevanje paketa %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "nameščanje %s iz %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Več podatkov o paketu %s"
@@ -694,11 +692,105 @@ msgstr "Določen ni bil noben paket"
msgid "Cannot connect to ldap uri:"
msgstr ""
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "podatkovna baza urpmi je zaklenjena"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Opozorilo"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "podatkovna baza urpmi je zaklenjena"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "Sledeči paketi imajo slabe podpise"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Sledeči paketi imajo slabe podpise"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Ali želite nadaljevati namestitev?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Namestitev ni uspela"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "porazdeljevanje %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "nameščanje %s iz %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "nameščanje %s"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Poskusi z namestitvijo brez preverjanj odvisnosti? (d/N) "
+
+#: ../urpm/main_loop.pm:205
+#, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "Poskusi s prisilno namestitvijo(--force)? (d/N) "
+
+#: ../urpm/main_loop.pm:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d namestitvenih transakcij je spodletelo"
+msgstr[1] "%d namestitvenih transakcij je spodletelo"
+msgstr[2] "%d namestitvenih transakcij je spodletelo"
+msgstr[3] "%d namestitvenih transakcij je spodletelo"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Namestitev je mogoča"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "Paketi so že nameščeni"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Paketi so že nameščeni"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "Paketi so že nameščeni"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Paketi so že nameščeni"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -746,7 +838,7 @@ msgstr "poskušanje izbire neobstoječega vira \"%s\""
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "zgrajena je bila hdlist synthesis datoteka za vir \"%s\""
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr ""
@@ -843,7 +935,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Iskanje; začetek: %s konec: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "izvajanje drugega prehoda (za izračun odvisnosti)\n"
@@ -909,67 +1001,72 @@ msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"ni mogoče dostopati do prvega namestitvenega vira (ni datoteke hdlists)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "poskušanje izbire neobstoječega vira \"%s\""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "izbiranje več virov: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "odstranjevanje vira \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "ponovno nastavljanje urpmi za vir \"%s\""
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...ponovno nastavljanje je spodletelo"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "ponovno nastavljanje je končano"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Napaka pri ustvarjanju datoteke names: Odvisnost %d ni bila najdena"
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr "Napaka pri ustvarjanju datoteke names: Datoteka (%s) ni zapisljiva"
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "vir \"%s\" ni označen"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "preverjanje hdlist datoteke [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "preverjanje synthesis datoteke [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "gradnja hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -978,77 +1075,77 @@ msgstr ""
"Ni mogoče zgraditi datoteke synthesis za vir \"%s\". Mogoče je pokvarjena "
"datoteka hdlist."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "težava pri branju synthesis ali hdlist datoteke vira \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "pisanje datoteke s seznamom za vir \"%s\""
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...kopiranje je spodletelo"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopiranje datoteke z opisi \"%s\"..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...kopiranje končano"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopiranje [%s] je spodletelo (datoteka je sumljivo majhna)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "računanje md5sum kopiranega izvornega hdlist (ali synthesis)"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "kopiranje [%s] je spodletelo (md5sum se ne ujema)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "računanje md5sum izvorne datoteke hdlist (ali synthesis)"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...pridobivanje je spodletelo: md5sum se ne ujema"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "na [%s] ni nobene datoteke rpm"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "branje datotek rpm iz [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "ni mogoče brati datotek rpm iz [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "noben paket rpm ni bil prebran"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1058,74 +1155,74 @@ msgstr ""
"Dostop do vira \"%s\" ni mogoč.\n"
"Do tega lahko pride, če ste med ustvarjanjem vira ročno priklopili imenik"
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ni bilo mogoče najti hdlist datoteke za vir \"%s\""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "pridobivanje izvorne datoteke hdlist (ali synthesis) od \"%s\" ..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "najdena je bila preverjena datoteka hdlist (ali synthesis) kot %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "ni bilo mogoče najti hdlist datoteke za vir \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "preverjanje datoteke z javnimi ključi od \"%s\" ..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, 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:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "ni mogoče uvoziti javnega ključa od \"%s\""
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "pisanje datoteke s seznamom za vir \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "dodan je bil vir %s"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "ni mogoče razčleniti datoteke hdlist vira \"%s\""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "težava pri branju synthesis datoteke vira \"%s\""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "branje zaglavja iz vira \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "Dd"
@@ -1186,48 +1283,53 @@ msgstr "neurejen medij \"%s\" je označen kot izmenljiv, a to ne drži"
msgid "unable to access medium \"%s\""
msgstr "ni mogoče dostopati do vira \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Ni paketa poimenovanega %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Sledeči paketi vsebujejo %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "zaradi manjkajočega %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Paketi so že nameščeni"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "zaradi nezadovoljstva %s"
# promote vzet kot renice
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "poskus podpiranja %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "za ohranitev %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "za namestitev %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "zaradi konfliktov z/s %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "nezahtevan"
@@ -1247,6 +1349,16 @@ msgstr "Neveljaven ID ključa (%s)"
msgid "Missing signature (%s)"
msgstr "Manjkajoč podpis (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Ni mogoče ustvariti nastavitvene datoteke [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Kopiranje je spodletelo"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1264,8 +1376,8 @@ msgstr ""
"\n"
"uporaba:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1280,19 +1392,19 @@ msgstr " --auto - samodejno izberi paket v možnostih.\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - preveri, če je možna pravilna odstranitev.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, 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"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - porazdeljen urpmi po napravah z vzdevki.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Pred izbrisom ponovno zgradi pakete\n"
@@ -1303,8 +1415,8 @@ msgid " --root - use another root for rpm removal.\n"
msgstr ""
" --root - uporabi drug korenski imenik za odstranitev paketov rpm.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
@@ -1325,17 +1437,17 @@ msgstr ""
" za namestitev ali odstranitev chroot z možnostjo --"
"root . \n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - poskusi najti in uporabiti datoteko synthesis.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - poskusi najti in uporabiti datoteko hdlist.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - zgovorni način.\n"
@@ -1345,37 +1457,37 @@ msgstr " --verbose - zgovorni način.\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - izberi vse pakete ki ustrezajo izrazu.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Samo uporabniku root je dovoljeno odstranjevanje paketov"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "neznani paketi"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "neznan paket"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "odstranitev paketa %s bo zrušilo vaš sistem"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Ničesar za odstraniti"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Preverjanje za odstranitev sledečih paketov"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1389,12 +1501,12 @@ msgstr[2] ""
msgstr[3] ""
"Za zadovoljitev odvisnosti bo odstranjenih sledečih %d paketov (%d MB)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
@@ -1403,12 +1515,12 @@ msgstr[1] "Želite odstraniti paket %d ?"
msgstr[2] "Želite odstraniti paket %d ?"
msgstr[3] "Želite odstraniti paket %d ?"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (d/N) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Odstranjevanje je spodletelo"
@@ -1435,13 +1547,13 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - prikaži različico urpmf.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../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"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr " --excludemedia - ne uporabi podanih virov, ločenih z vejico.\n"
@@ -1453,12 +1565,12 @@ msgid ""
msgstr ""
" --literal, -l - vzemi argument kot dobeseden niz, ne regularni izraz.\n"
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../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"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1469,7 +1581,7 @@ msgstr " --sortmedia - vire razvrsti glede na podnize, ločene z vejico.\n"
msgid " --use-distrib - use the given path to access media\n"
msgstr " --synthesis - uporabi podan synthesis namesto baze urpmi.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - uporabi podan synthesis namesto baze urpmi.\n"
@@ -1479,7 +1591,7 @@ msgstr " --synthesis - uporabi podan synthesis namesto baze urpmi.\n"
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - ne izpiši identičnih vrstic.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - uporabi samo vir za posodobitev.\n"
@@ -1614,78 +1726,89 @@ msgid " --group - group\n"
msgstr " --group - skupina\n"
#: ../urpmf:72
+#, fuzzy, c-format
+msgid " --license - license\n"
+msgstr " --name - ime paketa\n"
+
+#: ../urpmf:73
#, c-format
msgid " --name - package name\n"
msgstr " --name - ime paketa\n"
# obsolete? man pravi da ne
-#: ../urpmf:73
+#: ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - zastarani nizi\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr " --packager - avtor paketa\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - niz vsebuje\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - niz zahteva\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, c-format
msgid " --size - installed size\n"
msgstr " --size - velikost na disku\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - ime izvornega rpm paketa\n"
-#: ../urpmf:79
+# obsolete? man pravi da ne
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - zastarani nizi\n"
+
+#: ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr " --summary - povzetek\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, c-format
msgid " --url - url\n"
msgstr " --url - url\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, c-format
msgid " --vendor - vendor\n"
msgstr " --vendor - prodajalec\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -m - vir, kjer je bil paket najden\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, 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"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Nepravilen format: Uporabite lahko samo eno oznako z več vrednostmi"
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "uporabljam specifično okolje pri %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1694,12 +1817,12 @@ msgstr ""
"Opomba: ker noben preiskan medij ne uporablja hdlist-a, urpmf ni mogel "
"vrniti nobenega rezultata\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Morda želite uporabiti --name za iskanje po imenih paketov.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1716,14 +1839,14 @@ msgstr ""
"\n"
"uporaba:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, 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"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
@@ -1732,28 +1855,28 @@ msgstr ""
" --auto - neinteraktiven način, uporabi privzete odgovore na "
"vprašanja.\n"
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr " --auto-select - samodejna izbira paketov za nadgraditev sistema.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr " --auto-select - samodejna izbira paketov za nadgraditev sistema.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, fuzzy, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - onemogoči preverjanje datoteke z MD5SUM.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, fuzzy, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key -prisili posodobitev ključa gpg.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1762,12 +1885,12 @@ msgstr ""
" --no-uninstall - nikoli ne vprašaj za odstranitev paketa, takrat prekini "
"namestitev.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - ne namesti paketov (samo prenesi).\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1776,7 +1899,7 @@ msgstr ""
" --keep - če je mogoče ohrani obstoječe pakete, zavrni zahtevane\n"
" pakete, ki vodijo v odstranjevanje.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1787,39 +1910,45 @@ msgstr ""
" namestiti ali nadgaraditi več paketov, kot je podano;\n"
" privzeto je %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - majhna velikost transakcij, privzeto je %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy, -y - vsili ohlapno iskanje.\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src, -s - naslednji paket je paket z izvorno kodo.\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr " --install-src - namesti samo paket z izvorno kodo (ne binarnega).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr ""
" --clean - odstrani pakete rpm iz predpomnilnika pred kakršnikolim "
"drugim dejanjem .\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - ne odstrani paketov rpm iz predpomnilika.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1828,7 +1957,7 @@ msgstr ""
" --allow-nodeps - dovoli si vprašati uporabnika za namestitev paketov brez\n"
" preverjanja odvisnosti.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1838,13 +1967,13 @@ msgstr ""
"brez \n"
" preverjanja odvisnosti in integritete.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr ""
" --root - uporabi drug korenski imenik za namestitev paketov rpm.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1853,47 +1982,47 @@ msgstr ""
" --use-distrib - sproti nastavi urpmi iz distrib drevesa, uporabno je\n"
" za namestitev chroot z možnostjo --root .\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - uporabi wget za pridobivanje datotek.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - uporabi curl za pridobivanje datotek.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, fuzzy, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --curl - uporabi curl za pridobivanje datotek.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr " --curl-options - dodatne možnosti za curl\n"
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr " --rsync-options- dodatne možnosti za rsync\n"
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr " --wget-options - dodatne možnosti za wget\n"
-#: ../urpmi:127
+#: ../urpmi:124
#, fuzzy, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr " --curl-options - dodatne možnosti za curl\n"
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - omeji hitrost prenašanja.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1902,7 +2031,7 @@ msgstr ""
" --resume - nadaljuj prenos delno pobranih datotek\n"
" (--no-resume to onemogoči, privzeto je onemogočeno).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1911,7 +2040,7 @@ msgstr ""
" --proxy - uporabi določen HTTP posrednik, vrata so\n"
" privzeto 1080 (oblika je <posrednik[:vrata]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1920,7 +2049,7 @@ msgstr ""
" --proxy-user - določi uporabnika in geslo za uporabo avtentifikacije\n"
" pri posredniku (format je <uporabnik:geslo>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1929,7 +2058,7 @@ msgstr ""
" --bug - pripravi poročilo o napaki v imeniku nakazanem z\n"
" naslednjim argumentom.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1938,7 +2067,7 @@ msgstr ""
" --verify-rpm - preveri podpis paketa rpm pred namestitvijo\n"
" (--no-verify-rpm to onemogoči, privzeto je omogočeno).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
@@ -1946,38 +2075,43 @@ msgid ""
msgstr ""
" --test - samo preveri, če je namestitev lahko pravilno izvedena.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - izključi poti ločene z vejico.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - izključi datoteke z dokumentacijo.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr " --ignoresize - ne preverjaj količine praznega prostora.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr ""
" --ignorearch - dovoli namestitev rpm paketov različnih arhitektur.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - ne izvedi paketnih mini-skript.\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - paketi, ki naj bodo pri namestitvi preskočeni\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - paketi, ki naj bodo pri namestitvi preskočeni\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1986,47 +2120,47 @@ msgstr ""
" --more-choices - ko je najdenih več paketov, ponudi več izbir\n"
" kot je privzeto.\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - ne zakleni podatkovne baze rpm.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - nadgradi samo pakete iste arhitekture.\n"
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - izberi vsa ujemanja v ukazni vrstici.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - dovoli iskanje v polju provides za najdbo paketa.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, 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"
-#: ../urpmi:155
+#: ../urpmi:153
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - tihi način.\n"
-#: ../urpmi:157
+#: ../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:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2035,12 +2169,12 @@ msgstr ""
"Napaka: Da bi ustvarili poročilo o hrošču uporabite običajne argumente "
"ukazne vrstice.\n"
-#: ../urpmi:220
+#: ../urpmi:218
#, 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:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2049,7 +2183,7 @@ msgstr ""
"Imenik [%s] že obstaja, prosim da uporabite drugega za poročilo o napaki ali "
"pa ga izbrišite"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Ni mogoče ustvariti imenika [%s] za poročilo o napaki"
@@ -2059,7 +2193,7 @@ msgstr "Ni mogoče ustvariti imenika [%s] za poročilo o napaki"
msgid "Environment directory %s does not exist"
msgstr "Mapa %s ne obstaja"
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2068,46 +2202,48 @@ msgstr ""
"Napaka: izgleda, da je %s priklopljen v (samo) bralnem načinu.\n"
"Uporabite --allow-force, da prisilite izvedbo operacije."
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr "Posodabljanje vira ....\n"
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (za nadgradnjo)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (za nadgradnjo)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (za namestitev)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (za namestitev)"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "Za zadovoljitev odvisnosti bo odstranjenih sledečih %d paketov (%d MB)"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Kakšna je vaša izbira? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2118,7 +2254,7 @@ msgstr ""
"ki so starejši od nameščenih.\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2129,7 +2265,7 @@ msgstr ""
"ki so starejši od nameščenih.\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, c-format
msgid ""
"\n"
@@ -2138,12 +2274,12 @@ msgstr ""
"\n"
"Vseeno nadaljujem z namestitvijo?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (D/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2152,7 +2288,7 @@ msgstr ""
"Nekateri zahtevani paketi ne morejo biti nameščeni:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2161,7 +2297,7 @@ msgstr ""
"Nekateri zahtevani paketi ne morejo biti nameščeni:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2172,7 +2308,7 @@ msgstr ""
"sledeče pakete, da bodo drugi lahko nadgrajeni:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2183,7 +2319,7 @@ msgstr ""
"sledeče pakete, da bodo drugi lahko nadgrajeni:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2192,7 +2328,7 @@ msgstr ""
"Sledeči paketi morajo biti odstranjeni, da bodo drugi lahko nadgrajeni:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2201,12 +2337,17 @@ msgstr ""
"Sledeči paketi morajo biti odstranjeni, da bodo drugi lahko nadgrajeni:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(samo test, brisanje se ne bo izvedlo)"
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2216,12 +2357,12 @@ msgstr ""
"root:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(samo test, namestitev se ne bo izvedla)"
-#: ../urpmi:597
+#: ../urpmi:617
#, fuzzy, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2230,101 +2371,17 @@ msgstr[1] "Nadaljevanje z namestitvijo %d paketov? (%d MB)"
msgstr[2] "Nadaljevanje z namestitvijo %d paketov? (%d MB)"
msgstr[3] "Nadaljevanje z namestitvijo %d paketov? (%d MB)"
-#: ../urpmi:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Pritisnite Enter ko boste pripravljeni ..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Prekliči"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "Sledeči paketi imajo slabe podpise"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Sledeči paketi imajo slabe podpise"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Ali želite nadaljevati namestitev?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Namestitev ni uspela"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "porazdeljevanje %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "nameščanje %s iz %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "nameščanje %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Poskusi z namestitvijo brez preverjanj odvisnosti? (d/N) "
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Poskusi s prisilno namestitvijo(--force)? (d/N) "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d namestitvenih transakcij je spodletelo"
-msgstr[1] "%d namestitvenih transakcij je spodletelo"
-msgstr[2] "%d namestitvenih transakcij je spodletelo"
-msgstr[3] "%d namestitvenih transakcij je spodletelo"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Namestitev je mogoča"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Paketi so že nameščeni"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Paketi so že nameščeni"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "Paketi so že nameščeni"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "Paketi so že nameščeni"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "ponovno zaganjanje urpmi"
@@ -2454,32 +2511,32 @@ msgstr " -v - zgovoren način.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "ni mogoče posodobiti vira \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Samo root uporabnik lahko dodaja vire"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "Pisanje nastavitvene datoteke [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "Ni mogoče ustvariti nastavitvene datoteke [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "ni potrebno dajati <relativna pot do hdlist> z --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
@@ -2488,17 +2545,17 @@ msgstr ""
"\n"
"Želite dodati vir '%s'?"
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "manjka <relativna pot do hdlist>\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "ni mogoče ustvariti vira \"%s\"\n"
@@ -2667,19 +2724,19 @@ msgstr " -a - izberi vse vire.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - ohlapno ujemanje z imeni virov.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Samo uporabnik root lahko odstrani vir(e)"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr ""
"ničesar ni za odstraniti (uporabite urpmi.addmedia za dodajanje novega "
"vira)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2735,19 +2792,19 @@ msgstr " -a - izberi vse neizmenljive vire.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - prisili tvorbo datotek hdlist.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Samo uporabnik root lahko posodobi vire"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
"ničesar ni za posodobiti (uporabite urpmi.addmedia za dodajanje novega "
"vira)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2756,22 +2813,22 @@ msgstr ""
"manjka vnos za posodobitev\n"
"(eden od %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "onemogočanje vira %s"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "omogočanje vira %s"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2788,7 +2845,7 @@ msgstr ""
"\n"
"uporaba:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2797,54 +2854,54 @@ msgstr ""
" --searchmedia - uporabi samo podane vire za iskanje zahtevanih (ali "
"posodobljenih) paketov.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - vsili ohlapno iskanje (isto kot -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - izpiši seznam paketov, ki so na voljo.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - izpiši seznam virov, ki so na voljo.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, 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"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
" --list-nodes -izpiši seznam vozlišč, ki so na voljo pri uporabi --"
"parallel.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr ""
" --list-aliases - izpiši seznam vzporednih vzdevkov, ki so na voljo.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
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:65
+#: ../urpmq:62
#, 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"
# kaj? man pravi: Print source URLs (or file names) of all selected packages.
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
@@ -2852,14 +2909,14 @@ msgstr ""
" --sources - prikaži izvorni url (ali imena datotek) vseh izbranih "
"paketov.\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr ""
" --ignorearch - dovoli uvrstitev paketov, katerih zgradba se ne ujema,  "
"na seznam.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2868,23 +2925,23 @@ msgstr ""
" --use-distrib - nastavi urpmi na licu mesta iz distrib drevesa.\n"
" To dovoli povpraševanje po distribuciji.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - izpiši zgodovino sprememb.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - izpiši povzetek.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr ""
" --whatrequires - iskanje paketov, katerim je podan paket odvisnost.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2894,7 +2951,7 @@ msgstr ""
" - iskanje paketov, katerim je podan paket odvisnost (tudi "
"med navideznimi paketi).\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
@@ -2903,53 +2960,53 @@ msgstr " -p - išči paket po polju provides (kaj paket nudi).\n"
# kaj? man pravi: if maximal closure is used, assume that a package
# upgraded and may correct unresolved dependancies on the rpm database.
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr ""
" -c - predvidevaj da se je paket nadgradil in popravi "
"nerazrešene odvisnosti v bazi rpm.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - razširi poizvedbo na paketove odvisnosti.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - izpiši skupine skupaj z imenom.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - izpiši uporabne informacije v človeku razumljivem "
"zapisu.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - izpiši seznam datotek v paketu.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - tihi način.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - izpiši različico in izdajo skupaj z imenom.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - naslednji paket je paket z izvorno kodo (isto kot --"
"src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2957,46 +3014,46 @@ msgid ""
msgstr ""
" -u - odstrani paket, če je že nameščena novejša verzija.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - vsili ohlapno iskanje (isto kot --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - kot -y, a ujemanje ne razlikuje med velikimi in malimi "
"črkami.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " imena ali datoteke rpm podane preko ukazne vrstice so obdelane.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes je lahko uporabljeno samo s --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"Opomba: ker noben preiskan medij ne uporablja hdlist-a, urpmf ni mogel "
"vrniti nobenega rezultata\n"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -3004,11 +3061,22 @@ msgstr ""
"Opomba: ker noben preiskan medij ne uporablja hdlist-a, urpmf ni mogel "
"vrniti nobenega rezultata\n"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Dnevnik sprememb ni bil najden\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Naslednji paketi imajo nepravilne podpise:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Želite nadaljevati namestitev?"
+
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Za uporabo --use-distrib morate biti skrbnik"
diff --git a/po/sq.po b/po/sq.po
index fd9825d0..ad3f9e25 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+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"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Transfer-Encoding: 8-bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, fuzzy, c-format
msgid "RPM installation"
msgstr "Instalimi i sistemit"
@@ -26,7 +26,7 @@ msgstr "Instalimi i sistemit"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -76,7 +76,7 @@ msgstr "_Instalo"
msgid "_Save"
msgstr "_Ruaj"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Anulo"
@@ -98,17 +98,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Asnjë urdhër i specifikuar"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, fuzzy, c-format
msgid "Please wait..."
msgstr "Një moment ju lutemi."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, fuzzy, c-format
msgid "Must be root"
msgstr "Porta e Minit"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -118,42 +118,42 @@ msgstr ""
"Disa nga pakot e kërkuara nuk mund të instalohen:\n"
"%s"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Kujdes"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "Azhurno"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, fuzzy, c-format
msgid " (to install)"
msgstr "Fundi i instalimit"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Një nga pakot e radhitura nevojitet:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, fuzzy, c-format
msgid "_Abort"
msgstr "Ndërpreje"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -163,13 +163,13 @@ msgstr ""
"Pakot a radhitura duhet të zhduken që të tjerat të azhurnohen:\n"
"%s"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, 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:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -178,48 +178,49 @@ msgstr ""
"instalohen:\n"
"\n"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Instalimi i pakos..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "e pa mundur marrja e burimit të pakos, ndërpritje"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Përgatitje..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instalimi i pakove `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Ju lutemi futni burimin e emruar \"%s\" në mjetin [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Shkarkimi i pakos `%s'..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Pakot e radhitura, posedojnë nënshkrime të pa pranuara:\n"
-"\n"
-"%s\n"
-"\n"
-"A dëshironi të vazhdoni?"
+msgid "_Done"
+msgstr "Përfundoi"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -230,41 +231,27 @@ msgstr ""
"%s\n"
"A dëshironi t'azhurnoni bazën e të dhënave urpmi"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "zhdukja e %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Përgatitje..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instalimi i pakove `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, fuzzy, c-format
-msgid "_Done"
-msgstr "Përfundoi"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Instalimi dështio"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Gjdo gjë është veçse e instaluar"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Instalimi përfundoi"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "zhdukja e %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -301,7 +288,7 @@ msgstr ""
"\n"
" Raporti DrakBackup \n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Vetëm administratori i sistemin ka mundësi të instalojë pakot"
@@ -311,98 +298,98 @@ msgstr "Vetëm administratori i sistemin ka mundësi të instalojë pakot"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "e pa mundur hapja e rpmdb"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "emri i skedares rpm është invalid [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "rikuperimi i skedareve rpm [%s]..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...rikuperim i bërë"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...rikuperimi dështoi: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "e pa mundur hyrja në skedaren rpm [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "analizimi i pa mundur i \"%s\" në skedaren [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "i pa mundur regjistrimi i skedares rpm"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "gabim gjatë regjistrimit të pakove lokale"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, 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:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: nuk mund ta lexojë skedaren rpm \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "krijimi i skedares sintezë për burimin \"%s\""
@@ -592,7 +579,12 @@ msgstr "pakoja %s nuk është prezente"
msgid "malformed URL: [%s]"
msgstr "hyrje e çformuarë: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "rikuperimi i skedareve rpm nga burimi\"%s\"..."
@@ -602,7 +594,7 @@ msgstr "rikuperimi i skedareve rpm nga burimi\"%s\"..."
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -610,37 +602,42 @@ msgstr ""
"krijimi i një akcioni transmetues për një instalim në %s (remove=%d, install="
"%d, upgrade=%d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "i pa mundur krijimi i një akcioni transmetues"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "e pa mundur zhdukja e pakos %s"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "shtimi i pakove %s (id=%d, eid=%d, update=%d, file=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "i pa mundur instalimi i pakos %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "zhdukja e pakos %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "zhdukja e pakos %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "instalimi i %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, fuzzy, c-format
msgid "More information on package %s"
msgstr "Më shumë informacione mbi pakon..."
@@ -670,11 +667,103 @@ msgstr "Asnjë urdhër i specifikuar"
msgid "Cannot connect to ldap uri:"
msgstr ""
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "baza e të dhënave urpmi është e mbyllur"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Kujdes"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "baza e të dhënave urpmi është e mbyllur"
+#: ../urpm/main_loop.pm:99
+#, 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:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Pakot a radhitura kanë nënshkrime të pa pranueshëm"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "A dëshironi të vazhdoni me instalimin e tyre ?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Instalimi dështio"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "shpërndarje e %s"
+
+#: ../urpm/main_loop.pm:148
+#, fuzzy, c-format
+msgid "installing %s from %s"
+msgstr "instalimi i %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "instalimi i %s"
+
+#: ../urpm/main_loop.pm:187
+#, 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:205
+#, 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:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "Instalimi i transmetimit të %d dështio"
+msgstr[1] "Instalimi i transmetimit të %d dështio"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Instalimi është i mundur"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "Gjdo gjë është veçse e instaluar"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Gjdo gjë është veçse e instaluar"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "Gjdo gjë është veçse e instaluar"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Gjdo gjë është veçse e instaluar"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -725,7 +814,7 @@ msgstr "tento zgjedhjen e një burimi jo ekzistues \"%s\""
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "krijimi i skedares sintezë për burimin \"%s\""
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "e pa mundur hyrja në skedaren hdlist të \"%s\", burim i injoruar"
@@ -814,7 +903,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Hulumtoi polisat e instaluara"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "ekzekutim i dytë për ti mbledhur mvarjet\n"
@@ -881,144 +970,149 @@ msgstr ""
"hyrja e pa mundur në burimin e parë instalues (asnjë skedare e gjetur në "
"hdlists)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "tento zgjedhjen e një burimi jo ekzistues \"%s\""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "zgjedhje të shumta burimesh: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "zhdukja e burimit \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "rikuperimi i skedareve rpm nga burimi\"%s\"..."
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "Menyja e konfigurimit është regjistruar"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "Konfigurimi i Serverit"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "burimi \"%s\" nuk është i zgjedhur"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "kontrollimi i skedares hdlist [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "kontrollimi i skedares sintezë [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "krijimi i hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problem gjatë leximit të skedares hdlist po sintezë të burimit \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "shkruarja e skedares për listën e burimit \"%s\""
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...kopjimi dështoi"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopjimi i skedares përshkruese të \"%s\"..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...kopjimi i bërë"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopjimi i [%s] dështoi"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "llogaritja md5sum e kopjimit të burimit hdlist (ose sintezës)"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, fuzzy, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "kopjimi i [%s] dështoi"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "llogaritja md5sum e rikuperimit të burimit hdlist (ose sintezës)"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...rikuperimi dështoi: mos pajtim i md5sum"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "asnjë skedare rpm e gjetur nga [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "lexim i skedareve rpm nga [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "leximi i skedares rpm është i pa mundur nga [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1029,74 +1123,74 @@ msgstr ""
"kjo mund të ndodhë nëse ju e montoni manualisht repetorin kur e krijoni atë "
"burim."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "asnjë skedare e gjetur hdlist për burimin \"%s\""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "rikuperim i burimit hdlist (ose sintezës) të \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "hdlista tesntuese është gjetur (ose sintezuar) sikur %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "asnjë skedare e gjetur hdlist për burimin \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "verifimi i skedares pubkey të \"%s\"..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, 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:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "është e pa mundur importimi i skedares pubkey të \"%s\""
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "shkruarja e skedares për listën e burimit \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "shtuarja e burimit %s"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "analizimi i hdlist është i pa mundur të \"%s\""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problem gjatë leximit të skedares sitezë të burimit \"%s\""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "leximi i majës nga burimi \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "Yy"
@@ -1157,47 +1251,52 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "hyrje e pa mundur në burimin \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Asnjë pako e emruar %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Pakot e radhitura përmbajnë %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "ka arritur nga mungesa %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Gjdo gjë është veçse e instaluar"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "ka arritur gjatë mosmarrëveshjes %s"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "tentim në gradimin e %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "në urdhër për ta mbajturë %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "në urdhër për instalim %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "ka arritur gjatë konflikteve me %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "i pa kërkuar"
@@ -1217,6 +1316,16 @@ msgstr "Çelës invalid ID (%s)"
msgid "Missing signature (%s)"
msgstr "Mungon nënshkrimi (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "i pa mundur shkrimi i skedares konfiguruese [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Kopjimi dështoi"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1233,8 +1342,8 @@ msgstr ""
"\n"
"përdorim:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1251,20 +1360,20 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - verifikoje nëse instalimi përfundon në mënyrë korrekte.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr ""
" --force - kërkim i forcuar edhe pse disa pako nuk ekzistojnë.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
" --parallel - urmpi është i shpërndarë në pseudo makina të shumëta.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - çfaqe etiketën packager: paketues.\n"
@@ -1275,8 +1384,8 @@ msgid " --root - use another root for rpm removal.\n"
msgstr ""
" --wget - përdore wget për rikuperimin e skedareve në distancë.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
@@ -1294,19 +1403,19 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr ""
" --probe-synthesis - tento në gjetjen dhe përdorimin e skedares sintezë.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr ""
" --probe-hdlist - tento në gjetjen dhe përdorimin e skedares hdlist.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - model oratori.\n"
@@ -1316,37 +1425,37 @@ msgstr " --verbose - model oratori.\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - zgjedhni të gjitha pakot me përshkrim të njëjtë.\n"
-#: ../urpme:76
+#: ../urpme:73
#, fuzzy, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Vetëm administratori i sistemin ka mundësi të instalojë pakot"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "pako të pa njoftura"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "pako e pa njoftur"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "zhdukja a pakove %s do të dëmtoj sistemin tuaj"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Mos zhduk asgjë"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Verifikimi i zhdukjes së pakove të radhitura"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1354,24 +1463,24 @@ msgid_plural ""
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)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "zhdukja e pakos %s"
msgstr[1] "zhdukja e pakos %s"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (p/J)"
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Zhdukja dështoi"
@@ -1397,14 +1506,14 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --help - shtype këtë lajmë ndihmues.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - përdore mjedisin e veçantë (veçënarishtë një raport "
"bugi).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1417,13 +1526,13 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../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"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1436,7 +1545,7 @@ msgstr ""
msgid " --use-distrib - use the given path to access media\n"
msgstr " --synthesis - përdori skedaret e dhëna sintezë në vend të db.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - përdori skedaret e dhëna sintezë në vend të db.\n"
@@ -1446,7 +1555,7 @@ msgstr " --synthesis - përdori skedaret e dhëna sintezë në vend të db.\
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - mos i çfaqë rreshtat e njëjtë.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - përdori vetëm burimet azhurnuese.\n"
@@ -1583,88 +1692,98 @@ msgstr " --group - çfaqe etiketën group: grupi.\n"
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr " --all - çfaqi të gjitha etiketat.\n"
#: ../urpmf:73
#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr " --all - çfaqi të gjitha etiketat.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - çfaqe etiketën obsoletes: gjitha absolutisht.\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr " --packager - çfaqe etiketën packager: paketues.\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, fuzzy, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - çfaqe etiketën provides: gjitha pajisjet.\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, fuzzy, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - çfaqe etiketën requires: gjitha dëshiratë.\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --size - çfaqe etiketën size: madhësia.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, fuzzy, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - çfaqe etiketën sourcerpm: burimi rpm.\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - çfaqe etiketën obsoletes: gjitha absolutisht.\n"
+
+#: ../urpmf:81
#, fuzzy, c-format
msgid " --summary - summary\n"
msgstr " --summary - çfaqe etiketën summary: përmbledhje.\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr " --url - çfaqe etiketën serial: url.\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr " --verbose - model oratori.\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr " --list - shpalosi pakotë lira.\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - çfaqe versionin, hollësitë dhe arkitekturen me emër.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "përdorim specifik i mjedisit në %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1680,44 +1799,44 @@ msgstr ""
"\n"
"përdorim:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
" --media - përdori vetëm burimet e dhëna, të ndara me presje.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr ""
" --auto-select - zgjedhni automatikisht pakot azhurnuese në sistem.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
" --auto-select - zgjedhni automatikisht pakot azhurnuese në sistem.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr ""
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr ""
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1726,12 +1845,12 @@ msgstr ""
" --no-uninstall - mos pyet kurr për dez-instalimin e pakos, abortoje "
"instalimin.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, fuzzy, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --install-src - instalo vetëm burimet e pakove (jo binare).\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1740,7 +1859,7 @@ msgstr ""
" --keep\t - nëse ka mundësi i mbanë pakot prezente, refuzon pakot\n"
"\t\t e kërkuara me drejtim zhdukje.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1752,41 +1871,47 @@ msgstr ""
" instalohet apo uzhurnohet,\n"
" me marrëveshje është %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr ""
" --split-length - gjatësi e vogël e trans-akcionit, me marrëveshje është %"
"d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, fuzzy, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy - shfrytëzoje hulumtimin e paqartë (njëjtë si -y).\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, fuzzy, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr ""
" --src - pakoja me radhë është pako e burimit (njëjtë si -s).\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr " --install-src - instalo vetëm burimet e pakove (jo binare).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr ""
" --clean - zhduki të gjithë rpm e fshehta para gjdo operacioni.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, fuzzy, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - mbane rpm dhe mos e përdor në fshehje.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1795,7 +1920,7 @@ msgstr ""
" --allow-nodeps - mundëson që përdoruesi në pytje të instaloj\n"
" pakot pas i verifikuar mvarësit e tyre.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1804,63 +1929,63 @@ msgstr ""
" --allow-force - mundëson që përdoruesi në pytje të instaloj\n"
" pakot pas i verifikuar mvarësit dhe integritetin e tyre.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, fuzzy, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr ""
" --wget - përdore wget për rikuperimin e skedareve në distancë.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
" to install a chroot with --root option.\n"
msgstr ""
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr ""
" --wget - përdore wget për rikuperimin e skedareve në distancë.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr ""
" --curl - pëdore curl për rikuperimin e skedareve në distancë.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, fuzzy, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr ""
" --curl - pëdore curl për rikuperimin e skedareve në distancë.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - kyfizimi i shpëjtësisë së shkarkimit.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, fuzzy, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1869,7 +1994,7 @@ msgstr ""
" --verify-rpm - verifikoje nënshkrimin e rpm para instalimit\n"
" (--no-verify-rpm dezaktivizoje verifikim e tyre).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1879,7 +2004,7 @@ msgstr ""
" jetë 1080 në marrëveshje (forma është <proxyhost[:port]"
">).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1889,7 +2014,7 @@ msgstr ""
"proxy\n"
" me vërtetim (forma është <user:password>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1898,7 +2023,7 @@ msgstr ""
" --bug - dorëzoje një raport të bug(it) në repertorin e\n"
" sugjeruar nga argumenti i dytë.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, fuzzy, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1907,7 +2032,7 @@ msgstr ""
" --verify-rpm - verifikoje nënshkrimin e rpm para instalimit\n"
" (--no-verify-rpm dezaktivizoje verifikim e tyre).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, fuzzy, c-format
msgid ""
" --test - only verify if the installation can be achieved "
@@ -1915,109 +2040,115 @@ msgid ""
msgstr ""
" --test - verifikoje nëse instalimi përfundon në mënyrë korrekte.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - përdori vetëm burimet e ndara me presje.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - mos i prano skedaret doc.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, fuzzy, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --no-uninstall - mos pyet kurr për dez-instalimin e pakos, abortoje "
"instalimin.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --url - çfaqe etiketën serial: url.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - çfaqe etiketën description: përshkrimi.\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, 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:148
+#: ../urpmi:145
+#, 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:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:150
+#: ../urpmi:148
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - mbane rpm dhe mos e përdor në fshehje.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
" -a - zgjedhni të gjitha korrespondencat në linjën komanduese.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - lejon hulumtimet në pajisjetë për ta gjetur pakon.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, 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"
-#: ../urpmi:155
+#: ../urpmi:153
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - model i qetë.\n"
-#: ../urpmi:157
+#: ../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:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, 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:243
+#: ../urpmi:241
#, 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:244
+#: ../urpmi:242
#, 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)"
@@ -2027,53 +2158,55 @@ msgstr "I pa mundur krijimi i repertorit [%s] për raport të bug(it)"
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "Azhurno"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "Azhurno"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "Fundi i instalimit"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "Fundi i instalimit"
-#: ../urpmi:447
+#: ../urpmi:454
#, 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:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Cila është zgedhja e juaj? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2081,7 +2214,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2089,19 +2222,19 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Vazhdo pa marrë parasyshë?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (P/j) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2110,7 +2243,7 @@ msgstr ""
"Disa nga pakot e kërkuara nuk mund të instalohen:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2119,7 +2252,7 @@ msgstr ""
"Disa nga pakot e kërkuara nuk mund të instalohen:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2130,7 +2263,7 @@ msgstr ""
"të zhduken që të tjerat të azhurnohen:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2141,7 +2274,7 @@ msgstr ""
"të zhduken që të tjerat të azhurnohen:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2150,7 +2283,7 @@ msgstr ""
"Pakot a radhitura duhet të zhduken që të tjerat të azhurnohen:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2159,12 +2292,17 @@ msgstr ""
"Pakot a radhitura duhet të zhduken që të tjerat të azhurnohen:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2173,111 +2311,29 @@ msgstr ""
"Ju duhet të jeni administrator për t'instaluar mvarësit e radhitura:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, 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:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Shtypni mbi Enter kur jeni i gatshëm..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Anulo"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "Pakot a radhitura kanë nënshkrime të pa pranueshëm"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Pakot a radhitura kanë nënshkrime të pa pranueshëm"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "A dëshironi të vazhdoni me instalimin e tyre ?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Instalimi dështio"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "shpërndarje e %s"
-
-#: ../urpmi:726
-#, fuzzy, c-format
-msgid "installing %s from %s"
-msgstr "instalimi i %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "instalimi i %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Tento një instalim pa verifikimin e mvarësive? (p/J) "
-
-#: ../urpmi:776
-#, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Tento një instalim më të forcuar (--force)? (p/J) "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "Instalimi i transmetimit të %d dështio"
-msgstr[1] "Instalimi i transmetimit të %d dështio"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Instalimi është i mundur"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Gjdo gjë është veçse e instaluar"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Gjdo gjë është veçse e instaluar"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "Gjdo gjë është veçse e instaluar"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "Gjdo gjë është veçse e instaluar"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr ""
@@ -2410,49 +2466,49 @@ msgstr " -v - model oratori.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "i pa mundur azhurnimi i burimit \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, fuzzy, c-format
msgid "Only superuser is allowed to add media"
msgstr "Vetëm administratori i sistemin ka mundësi të instalojë pakot"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "shkruaja e skedares konfiguruese [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, fuzzy, c-format
msgid "Can't create config file [%s]"
msgstr "shkruaja e skedares konfiguruese [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "specifikim i pa nevojshëm <shteg relativë i hdlist> me --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<shteg relativë i hdlist> mungon\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "i pa mundur krijimi i burimit \"%s\"\n"
@@ -2613,17 +2669,17 @@ msgid " -y - fuzzy match on media names.\n"
msgstr ""
" -a - zgjedhni të gjitha korrespondencat në linjën komanduese.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, fuzzy, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Vetëm administratori i sistemin ka mundësi të instalojë pakot"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "mos zhduk asgjë (përdore urpmi.addmedia për të shtuar një burim)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2679,18 +2735,18 @@ msgstr " -a - zgjidhi të gjitha burimet jo levizëse.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - përfitim i forcuar në skedaret hdlist.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, fuzzy, c-format
msgid "Only superuser is allowed to update media"
msgstr "Vetëm administratori i sistemin ka mundësi të instalojë pakot"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
"asgjë për tu azhurnuar (përdore urpmi.addmedia për të shtuar një burim)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2699,22 +2755,22 @@ msgstr ""
"hyrja për azhurnim mungon\n"
"(një nga %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "ignoring media %s"
msgstr "Botimi i burimit \"%s\":"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "enabling media %s"
msgstr "zhdukja e burimit \"%s\""
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2730,7 +2786,7 @@ msgstr ""
"\n"
"përdorim:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2738,51 +2794,51 @@ msgid ""
msgstr ""
" --media - përdori vetëm burimet e dhëna, të ndara me presje.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - shfrytëzoje hulumtimin e paqartë (njëjtë si -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - shpalosi pakotë lira.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - shpalosi burimet e lira.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, fuzzy, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-media - shpalosi burimet e lira.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr " --list-nodes - shpalosi nyjet kur ato përdoren në --parallel.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr ""
" --list-aliass - shpalosi burimet e lira paralele me pseudonime të "
"njëjta.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr ""
" --src - pakoja me radhë është pako e burimit (njëjtë si -s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
@@ -2790,41 +2846,41 @@ msgstr ""
" --sources - jepi të gjitha burimet e pakove para se të shkarkohen "
"(vetëm root).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --url - çfaqe etiketën serial: url.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
" This permit to querying a distro.\n"
msgstr ""
-#: ../urpmq:84
+#: ../urpmq:81
#, fuzzy, c-format
msgid " --changelog - print changelog.\n"
msgstr " --all - çfaqi të gjitha etiketat.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - çfaqe etiketën summary: përmbledhje.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - lejon hulumtimet në pajisje për ta gjetur pakon.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, fuzzy, c-format
msgid ""
" --whatrequires-recursive\n"
" - extended reverse search (includes virtual packages).\n"
msgstr " -R - lejon hulumtimet në pajisje për ta gjetur pakon.\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
@@ -2832,48 +2888,48 @@ msgid ""
msgstr ""
" -p - lejon hulumtimet në pajisjetë për ta gjetur pakon.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - dalje komplete me pakon që duhet të zhduket.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - shtrirja e hetimeve në pakot e mvarura.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - çfaqi grupet njashtu dhe emrat.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, fuzzy, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -g - çfaqi grupet njashtu dhe emrat.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, fuzzy, c-format
msgid " -l - list files in package.\n"
msgstr " --list - shpalosi pakotë lira.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - model i qetë.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - çfaqe versionin me hollësi, njashtu dhe emrin.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - pakoja tjetër është një pako burimi (njëjtë si --src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2882,56 +2938,69 @@ msgstr ""
" -u - zhduke pakon nëse një version më i ri është veçse i "
"instaluar.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
" -y - imponoje një hulumtim të paqartë (njëjtë si --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, fuzzy, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -a - zgjedhni të gjitha korrespondencat në linjën komanduese.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
" emrat apo skedaret rpm të marra në linjën komanduese janë nën hetim.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--liste-nodes mund të përdoret vetëm me --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:425
#, fuzzy, c-format
msgid "No changelog found\n"
msgstr "Asnjë imazh i gjetur"
#, fuzzy
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Pakot e radhitura, posedojnë nënshkrime të pa pranuara:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "A dëshironi të vazhdoni?"
+
+#, fuzzy
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Ju duhet të keni një autorizim që ti shpërndani repertorët"
@@ -3270,10 +3339,6 @@ msgstr "Asnjë imazh i gjetur"
#~ " --keep\t - nëse ka mundësi i mbanë pakot prezente, refuzon pakot\n"
#~ "\t\t e kërkuara me drejtim zhdukje.\n"
-#, fuzzy
-#~ msgid "unable to write file [%s]"
-#~ msgstr "i pa mundur shkrimi i skedares konfiguruese [%s]"
-
#~ msgid ""
#~ " --distrib-XXX - automatically create a medium for XXX part of a\n"
#~ " distribution, XXX may be main, contrib, updates or\n"
diff --git a/po/sr.po b/po/sr.po
index d0d51954..f7c16d25 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+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"
@@ -25,7 +25,7 @@ msgstr ""
"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:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, fuzzy, c-format
msgid "RPM installation"
msgstr "Инсталација система"
@@ -35,7 +35,7 @@ msgstr "Инсталација система"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_У реду"
@@ -85,7 +85,7 @@ msgstr "Инсталирај"
msgid "_Save"
msgstr "_Сачувај"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Поништи"
@@ -107,17 +107,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Није одређена команда"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Молим сачекајте..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, fuzzy, c-format
msgid "Must be root"
msgstr "Порт за миша"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -127,42 +127,42 @@ msgstr ""
"Неки изабрани пакети се не могу инсталирати:\n"
"%s"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Упозорење"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "У реду"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "Ажурирање"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, fuzzy, c-format
msgid " (to install)"
msgstr "Излаз из инсталације"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Потребан(и) су следећи пакет(и):"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Одустати"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -172,19 +172,19 @@ msgstr ""
"Следећи пакети се морају уклонити да би други могли да буду ажурирани:\n"
"%s"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Ради задовољења зависности, следећи пакети ће бити уклоњени (%d MB)"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Ради задовољења зависности, следећи пакети ће бити уклоњени (%d MB)"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
@@ -192,41 +192,42 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Инсталација пакета..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "извор пакета није доступан, излазим..."
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Припремам..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Инсталирам пакет `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Убаците медиј са именом %s у уређај [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Скидам пакет `%s'..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Следећи пакети имају лоше потписе:\n"
-"\n"
-"%s\n"
-"\n"
-"да ли желите да наставите инсталацију?"
+msgid "_Done"
+msgstr "Урађено"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -237,41 +238,27 @@ msgstr ""
"%s\n"
"Можда желите да ажурирате вашу urpmi базу података."
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "уклањам %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Припремам..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Инсталирам пакет `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, fuzzy, c-format
-msgid "_Done"
-msgstr "Урађено"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Инсталација није успела"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "све је већ инсталирано"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Инсталација готова"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "уклањам %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -305,7 +292,7 @@ msgstr " -g - приказује групе укључујући и
msgid " defaults to %s.\n"
msgstr " -l - приказује фајлове у пакету.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Само администратор може да инсталира пакете"
@@ -315,98 +302,98 @@ msgstr "Само администратор може да инсталира п
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "не могу да отворим rpmdb"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "погрешно име rpm датотеке [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "добављам rpm фајл [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "... добављање завршено"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...повраћај неуспео: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "не могу да приступим rpm датотеци [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "Не могу да парсирам \"%s\" у фајл [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "не могу да региструјем rpm фајл"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "грешка при регистровању локалних пакета"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "лоша proxy-декларација у командној линији\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: не могу да прочитам rpm датотеку \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "креирам hdlist симтезну датотеку за медиј \"%s\""
@@ -595,7 +582,12 @@ msgstr "пакет %s није пронађен."
msgid "malformed URL: [%s]"
msgstr "погрешан унос: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "добављам rpm фајлове ѕа медиј \"%s\"..."
@@ -605,7 +597,7 @@ msgstr "добављам rpm фајлове ѕа медиј \"%s\"..."
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -613,37 +605,42 @@ msgstr ""
"креирана трансакција за инсталирање на %s (уклони=%d, инсталирај=%d, "
"ажурирај=%d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "не могу да креирам трансакцију"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "не могу да уклоним пакет %s"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "додајем пакет %s (id=%d, eid=%d, update=%d, file=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "не могу да инсталирам пакет %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "уклањам пакет %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "уклањам пакет %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "Инсталирам %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, fuzzy, c-format
msgid "More information on package %s"
msgstr "Додатне информације о пакету..."
@@ -673,11 +670,104 @@ msgstr "Није одређена команда"
msgid "Cannot connect to ldap uri:"
msgstr ""
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "urpmi база података закључана"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Упозорење"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "urpmi база података закључана"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "Следећи пакети имају неисправне потписе"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Следећи пакети имају неисправне потписе"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Да ли желите да наставите конфигурацију ?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Инсталација није успела"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "дистрибуирам %s"
+
+#: ../urpm/main_loop.pm:148
+#, fuzzy, c-format
+msgid "installing %s from %s"
+msgstr "Инсталирам %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "Инсталирам %s"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Инсталиација без провере зависности (да/Не)? "
+
+#: ../urpm/main_loop.pm:205
+#, fuzzy, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "Присилна инсталација (--force)? (да/Не) ?"
+
+#: ../urpm/main_loop.pm:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d инстлациона трансакција није успела"
+msgstr[1] "%d инстлациона трансакција није успела"
+msgstr[2] "%d инстлациона трансакција није успела"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Инсталација је могућа"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "све је већ инсталирано"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "све је већ инсталирано"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "све је већ инсталирано"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "све је већ инсталирано"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -727,7 +817,7 @@ msgstr "покушавам да селектујем непостојећи ме
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "креирам hdlist симтезну датотеку за медиј \"%s\""
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "не могу да приступим hdlist фајлу за \"%s\", медиј је игнорисан"
@@ -820,7 +910,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Тражи инсталиране фонтове"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "сада се проверавају међузависности пакета\n"
@@ -886,144 +976,149 @@ msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"не могу да приступим првом инсталационом медију (није пронађен hdlists фајл)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "покушавам да селектујем непостојећи медиј \"%s\""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "покушавам да селектујем вишеструки медиј: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "уклањам медиј \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "добављам rpm фајлове ѕа медиј \"%s\"..."
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "Конфигурација менија сачувана"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "Подешавање сервера"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "медиј \"%s\" није изабран"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "испитујем hdlist фајл [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "испитујем synthesis фајл [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "креирам hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "проблем са читањем hdlist или synthesis фајла за медиј \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "уписујем листу фајлова за медиј \"%s\""
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...копирање није успело"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "копирам описни фајл за \"%s\"..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...копирање завршено"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "копирање [%s] неуспело"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "прорачунавам md5sum копиране source hdlist (или synthesis)"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, fuzzy, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "копирање [%s] неуспело"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, fuzzy, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "прорачунавам md5sum копиране source hdlist (или synthesis)"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...повраћај неуспео: md5sum не одговара"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "нема rpm датотека на [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "читам rpm фајлове са [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "не могу да прочитам rpm фајлове са [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1034,74 +1129,74 @@ msgstr ""
"ово се може десити уколико сте ручно монтирали директоријум приликом "
"креирања медија."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "није пронађена hdlist датотека за медиј \"%s\""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "добављам изорни hdlist (или synthesis) за \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "пронађена тестирана hdlist (или synthesis) као %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "није пронађена hdlist датотека за медиј \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "испитукем фајл са јавним кључем за \"%s\"..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "..импортовани кључ %s од јавног кључа за \"%s\""
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "не могу да импортујем јавни кључ за \"%s\""
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "уписујем листу фајлова за медиј \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "додани медиј %s"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "не могу да парсирам hdlist датотеку за \"%s\""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "проблем са читањем synthesis фајла за медиј \"%s\""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "читам хедере са медија \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "НнNn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "ДдDdYy"
@@ -1162,47 +1257,52 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "не могу да приступим медију \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Нема пакета са именом %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Следећи пакети садрже %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "због не постојања %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "све је већ инсталирано"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "због не задовољеног %s"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "покушавам да прикажем %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "да бих задржао %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "да би инсталирао %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "због конфликта са %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "незахтевано"
@@ -1222,6 +1322,16 @@ msgstr "Погрешан ID кључа(%s)"
msgid "Missing signature (%s)"
msgstr "Недостаје потпис (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "не могу да извршим упис у конфигурациону датотеку [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Копирање није успело"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1238,8 +1348,8 @@ msgstr ""
"\n"
"употреба:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - приказује овај екран о помоћи.\n"
@@ -1255,7 +1365,7 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - проверава да ли се може извести исправна инсталација.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
@@ -1263,12 +1373,12 @@ msgstr ""
" --force - приморава на инвокацију чак и ако неки пакети не "
"постоје.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - дистрибуирани urpmi преко машина са надимком.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - приказује таг packager: packager.\n"
@@ -1278,8 +1388,8 @@ msgstr " --packager - приказује таг packager: packager.\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --curl - користи још један root за rpm инсталацију.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --curl - користи још један root за rpm инсталацију.\n"
@@ -1298,17 +1408,17 @@ msgstr ""
" --use-distrib - подешава urpmi у лету са distrib стабла.\n"
" Ова опција дозвољава испитивање дистрибуције.\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - покушава да пронађе и користи synthesis фајл.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - покушава да пронађе и користи hdlist фајл.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " -verbose - verbose режим.\n"
@@ -1318,37 +1428,37 @@ msgstr " -verbose - verbose режим.\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - изабери све пакете који одговарају изразу.\n"
-#: ../urpme:76
+#: ../urpme:73
#, fuzzy, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Само администратор може да инсталира пакете"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "непознати пакети"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "непознати пакет"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "уклањање пакета %s ће нарушити Ваш систем"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Нема ничега што би се могло уклонити"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Проверавам како бих уклонио следеће пакете"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1357,12 +1467,12 @@ msgstr[0] "Ради задовољења зависности, следећи п
msgstr[1] "Ради задовољења зависности, следећи пакети ће бити уклоњени (%d MB)"
msgstr[2] "Ради задовољења зависности, следећи пакети ће бити уклоњени (%d MB)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
@@ -1370,12 +1480,12 @@ msgstr[0] "уклањам пакет %s"
msgstr[1] "уклањам пакет %s"
msgstr[2] "уклањам пакет %s"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (д/Н) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Уклањање није успело"
@@ -1401,13 +1511,13 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --help - приказује овај екран о помоћи.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - користи специфично окружење (типично извештај о грешци).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr " --excludemedia - не користи дати медиј, одвојен зарезом.\n"
@@ -1418,12 +1528,12 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - користи само дати медиј, одвојен зарезом.\n"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1436,7 +1546,7 @@ msgid " --use-distrib - use the given path to access media\n"
msgstr ""
" --synthesis - користи дати synthesis уместо urpmi-јеве базе података.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1447,7 +1557,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - не приказује идентичне линије.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - користи само update медиј.\n"
@@ -1581,89 +1691,99 @@ msgstr " --group - приказује таг групе: група.\n"
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr " --all - приказује све тагове.\n"
#: ../urpmf:73
#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr " --all - приказује све тагове.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - приказује таг вишак: сви вишкови (у више реда).\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr " --packager - приказује таг packager: packager.\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, fuzzy, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - приказује таг обезбеђује: све обезбеђује.\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, fuzzy, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - приказује таг захтева: сви захтеви\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --size - приказује таг величине: величина.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, fuzzy, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - приказује таг sourcerpm: source rpm.\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - приказује таг вишак: сви вишкови (у више реда).\n"
+
+#: ../urpmf:81
#, fuzzy, c-format
msgid " --summary - summary\n"
msgstr " --summary - приказује таг сажетка: сажетак.\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr " --url - приказује таг url: url.\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr " -verbose - verbose режим.\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -l - приказује фајлове у пакету.\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - приказује верзију, издање и архитектуру, укључујући и "
"име.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "користим дато окружење на %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1679,41 +1799,41 @@ msgstr ""
"\n"
"употреба:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
msgstr " --media - користи само дати медиј, одвојен зарезом.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr " --auto-select - аутоматска избор пакета да би се ажурирао систем.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr " --auto-select - аутоматска избор пакета да би се ажурирао систем.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, fuzzy, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - деактивира MD5SUM проверу фајла.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, fuzzy, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - приморава на ажурирање gpg кључа.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1722,12 +1842,12 @@ msgstr ""
" --no-uninstall - никада не тражи деинсталацију пакета, обустави "
"инсталацију.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, fuzzy, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --install-src - инсталира само пакете са изворним кодом.\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1737,7 +1857,7 @@ msgstr ""
"захтевани пакет\n"
" који води уклањању.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1748,37 +1868,43 @@ msgstr ""
" више пакета од датог броја,\n"
" default је %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - мала дужина трансакције, основна поставка је %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, fuzzy, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy - узрокује fuzzy претрагу (исто као -y).\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, fuzzy, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src - следећи пакет је изворни пакет (исто као и -s).\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr " --install-src - инсталира само пакете са изворним кодом.\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - уклања rpm из кеша пре било чега другог.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, fuzzy, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - чува rpm који нису коришћени у кешу.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1788,7 +1914,7 @@ msgstr ""
"без\n"
" провере међузависности пакета.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1798,12 +1924,12 @@ msgstr ""
"без\n"
" провере међузависности и интегритета.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --curl - користи још један root за rpm инсталацију.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, fuzzy, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1812,47 +1938,47 @@ msgstr ""
" --use-distrib - подешава urpmi у лету са distrib стабла.\n"
" Ова опција дозвољава испитивање дистрибуције.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - користи wget за добављање удаљених фајлова.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - користи curl за добављање удаљених фајлова.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, fuzzy, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --curl - користи curl за добављање удаљених фајлова.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - лимитира брзину download-а.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, fuzzy, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1862,7 +1988,7 @@ msgstr ""
" (--no-verify-rpm не веригикује, стандардна је "
"верификација).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1872,7 +1998,7 @@ msgstr ""
"претпоставља\n"
" да је 1080 по default-у (формат је <proxyhost[:port]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1881,7 +2007,7 @@ msgstr ""
" --proxy-user - одређује корисника и лозинку који се користе за proxy\n"
" аутентификацију (формат је <user:password>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1890,7 +2016,7 @@ msgstr ""
" --bug - прави извештај о грешци у директоријуму прослеђеном\n"
" као следећи аргумент.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, fuzzy, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1900,7 +2026,7 @@ msgstr ""
" (--no-verify-rpm не веригикује, стандардна је "
"верификација).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, fuzzy, c-format
msgid ""
" --test - only verify if the installation can be achieved "
@@ -1908,102 +2034,108 @@ msgid ""
msgstr ""
" --test - проверава да ли се може извести исправна инсталација.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - искључује путању раздвојену зарезом.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - искључује docs фајлове.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, fuzzy, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --no-uninstall - никада не тражи деинсталацију пакета, обустави "
"инсталацију.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --url - приказује таг url: url.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - приказује таг описа: опис.\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, fuzzy, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
" --test - проверава да ли се може извести исправна инсталација.\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr ""
+" --test - проверава да ли се може извести исправна инсталација.\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:150
+#: ../urpmi:148
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - чува rpm који нису коришћени у кешу.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - бира сва поклапања у командној линији.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - дозвољава претраживање по пружању ради налажења пакета.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - не претражује доступне ради налажења пакета.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - тихи режим (мало порука).\n"
-#: ../urpmi:157
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " имена или rpm фајлови дати у командној линији ће бити инсталирани.\n"
-#: ../urpmi:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
"Шта се може учинити са бинарним rpm пакетима када се користи опција --"
"install-src"
-#: ../urpmi:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2012,7 +2144,7 @@ msgstr ""
"Директоријум [%s] већ постоји, изаберите други директоријум за пријављивање "
"багова или га избришите"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "не могу да направим директоријум [%s] за извештај о грешци"
@@ -2022,53 +2154,55 @@ msgstr "не могу да направим директоријум [%s] за
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "Ажурирање"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "Ажурирање"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "Излаз из инсталације"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "Излаз из инсталације"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "Ради задовољења зависности, следећи пакети ће бити уклоњени (%d MB)"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Шта желите? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2076,7 +2210,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2084,19 +2218,19 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Свеједно наставити ?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (Д/н) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2105,7 +2239,7 @@ msgstr ""
"Неки изабрани пакети се не могу инсталирати:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2114,7 +2248,7 @@ msgstr ""
"Неки изабрани пакети се не могу инсталирати:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2125,7 +2259,7 @@ msgstr ""
"морају бити уклоњени да би остали могли да се ажурирају:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2136,7 +2270,7 @@ msgstr ""
"морају бити уклоњени да би остали могли да се ажурирају:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2145,7 +2279,7 @@ msgstr ""
"Следећи пакети се морају уклонити да би други могли да буду ажурирани:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2154,12 +2288,17 @@ msgstr ""
"Следећи пакети се морају уклонити да би други могли да буду ажурирани:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2168,12 +2307,12 @@ msgstr ""
"Морате да имате root овлашћења да би инсталирали следеће пакете:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2181,100 +2320,17 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../urpmi:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Притисните enter када будете спремни..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Одустани"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "Следећи пакети имају неисправне потписе"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Следећи пакети имају неисправне потписе"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Да ли желите да наставите конфигурацију ?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Инсталација није успела"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "дистрибуирам %s"
-
-#: ../urpmi:726
-#, fuzzy, c-format
-msgid "installing %s from %s"
-msgstr "Инсталирам %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "Инсталирам %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Инсталиација без провере зависности (да/Не)? "
-
-#: ../urpmi:776
-#, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Присилна инсталација (--force)? (да/Не) ?"
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d инстлациона трансакција није успела"
-msgstr[1] "%d инстлациона трансакција није успела"
-msgstr[2] "%d инстлациона трансакција није успела"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Инсталација је могућа"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "све је већ инсталирано"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "све је већ инсталирано"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "све је већ инсталирано"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "све је већ инсталирано"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "рестартујем urpmi"
@@ -2403,49 +2459,49 @@ msgstr " -v - verbose режим.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "не могу да ажурирам медиј \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, fuzzy, c-format
msgid "Only superuser is allowed to add media"
msgstr "Само администратор може да инсталира пакете"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "уписујем у конфигурациону датотеку [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, fuzzy, c-format
msgid "Can't create config file [%s]"
msgstr "уписујем у конфигурациону датотеку [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "недостаје <релативна путања hdlist> са --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "недостаје <релативна путања hdlist>\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "не могу да креирам медиј \"%s\"\n"
@@ -2606,17 +2662,17 @@ msgstr " -a - селектује све медије.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -a - бира сва поклапања у командној линији.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, fuzzy, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Само администратор може да инсталира пакете"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "нема ничега за брисање (користи urpmi.addmedia за додавање медија)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2672,17 +2728,17 @@ msgstr " -a - селектује све не преносиве м
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - приморава на генерисање hdlist фајлова.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, fuzzy, c-format
msgid "Only superuser is allowed to update media"
msgstr "Само администратор може да инсталира пакете"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "нема ничега за ажурирање (користи urpmi.addmedia за додавање медија)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2691,22 +2747,22 @@ msgstr ""
"недостаје унос за ажурирање\n"
"(један од %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "ignoring media %s"
msgstr "Мењам медиј \"%s\":"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "enabling media %s"
msgstr "уклањам медиј \"%s\""
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2722,70 +2778,70 @@ msgstr ""
"\n"
"употреба:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
"packages.\n"
msgstr " --media - користи само дати медиј, одвојен зарезом.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - узрокује fuzzy претрагу (исто као -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - приказује листу пакета.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - приказује листу медија.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-media - приказује листу медија и љихов урл.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
" --list-nodes - приказује листу чворова при коришћењу опције --"
"parallel.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - приказује листу паралелних алијаса.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr " --src - следећи пакет је изворни пакет (исто као и -s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr ""
" --sources - приказује све изворне пакете пре download-а (само root).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --url - приказује таг url: url.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2794,29 +2850,29 @@ msgstr ""
" --use-distrib - подешава urpmi у лету са distrib стабла.\n"
" Ова опција дозвољава испитивање дистрибуције.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - приказује лог са изменама.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - приказује таг сажетка: сажетак.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - претрага уназад за оним што захтева пакет.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, fuzzy, c-format
msgid ""
" --whatrequires-recursive\n"
" - extended reverse search (includes virtual packages).\n"
msgstr " -R - претрага уназад за оним што захтева пакет.\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
@@ -2824,50 +2880,50 @@ msgid ""
msgstr ""
" -p - дозвољава претраживање по пружању ради налажења пакета.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - потпун излаз са пакетом који треба да се уклони.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - проширује претрагу на зависност пакета.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - приказује групе укључујући и име.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - приказје корисне информације у, за људе читљивном "
"облику.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - приказује фајлове у пакету.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - тихи режим (мало порука).\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - приказује верзију укључујући и име.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - следећи пакет је изворни пакет (исто као и --src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2875,54 +2931,67 @@ msgid ""
msgstr ""
" -u - уклања пакете уколико је новија верзија већ инсталирана.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - узрокује fuzzy претрагу (као и --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, fuzzy, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -a - бира сва поклапања у командној линији.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
" имена или rpm фајлови који су дати у командној линији се проверавају.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr " --list-nodes се може користити само са опцијом --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:425
#, fuzzy, c-format
msgid "No changelog found\n"
msgstr "НИје пронађен image"
#, fuzzy
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Следећи пакети имају лоше потписе:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "да ли желите да наставите инсталацију?"
+
+#, fuzzy
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Морате да рестартујете машину да би кориситили ову команду ! \n"
@@ -3249,10 +3318,6 @@ msgstr "НИје пронађен image"
#~ "захтевани пакет\n"
#~ " који води уклањању.\n"
-#, fuzzy
-#~ msgid "unable to write file [%s]"
-#~ msgstr "не могу да извршим упис у конфигурациону датотеку [%s]"
-
#~ msgid ""
#~ " --distrib-XXX - automatically create a medium for XXX part of a\n"
#~ " distribution, XXX may be main, contrib, updates or\n"
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 150525e0..8c7d2b1f 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+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"
@@ -25,7 +25,7 @@ msgstr ""
"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:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, fuzzy, c-format
msgid "RPM installation"
msgstr "Instalacija sistema"
@@ -35,7 +35,7 @@ msgstr "Instalacija sistema"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_U redu"
@@ -85,7 +85,7 @@ msgstr "Instaliraj"
msgid "_Save"
msgstr "_Sačuvaj"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Poništi"
@@ -107,17 +107,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Nije određena komanda"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Molim sačekajte..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, fuzzy, c-format
msgid "Must be root"
msgstr "Port za miša"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -127,42 +127,42 @@ msgstr ""
"Neki izabrani paketi se ne mogu instalirati:\n"
"%s"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Upozorenje"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "U redu"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "Ažuriranje"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, fuzzy, c-format
msgid " (to install)"
msgstr "Izlaz iz instalacije"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Potreban(i) su sledeći paket(i):"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Odustati"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -172,19 +172,19 @@ msgstr ""
"Sledeći paketi se moraju ukloniti da bi drugi mogli da budu ažurirani:\n"
"%s"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, 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:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, 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:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
@@ -192,41 +192,42 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Instalacija paketa..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "izvor paketa nije dostupan, izlazim..."
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Pripremam..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instaliram paket `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Ubacite medij sa imenom %s u uređaj [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Skidam paket `%s'..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Sledeći paketi imaju loše potpise:\n"
-"\n"
-"%s\n"
-"\n"
-"da li želite da nastavite instalaciju?"
+msgid "_Done"
+msgstr "Urađeno"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -237,41 +238,27 @@ msgstr ""
"%s\n"
"Možda želite da ažurirate vašu urpmi bazu podataka."
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "uklanjam %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Pripremam..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instaliram paket `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, fuzzy, c-format
-msgid "_Done"
-msgstr "Urađeno"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Instalacija nije uspela"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "sve je već instalirano"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Instalacija gotova"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "uklanjam %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -305,7 +292,7 @@ msgstr " -g - prikazuje grupe uključujući i ime.\n"
msgid " defaults to %s.\n"
msgstr " -l - prikazuje fajlove u paketu.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Samo administrator može da instalira pakete"
@@ -315,98 +302,98 @@ msgstr "Samo administrator može da instalira pakete"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "ne mogu da otvorim rpmdb"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "pogrešno ime rpm datoteke [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "dobavljam rpm fajl [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "... dobavljanje završeno"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...povraćaj neuspeo: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "ne mogu da pristupim rpm datoteci [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "Ne mogu da parsiram \"%s\" u fajl [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "ne mogu da registrujem rpm fajl"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "greška pri registrovanju lokalnih paketa"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "loša proxy-deklaracija u komandnoj liniji\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: ne mogu da pročitam rpm datoteku \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "kreiram hdlist simteznu datoteku za medij \"%s\""
@@ -595,7 +582,12 @@ msgstr "paket %s nije pronađen."
msgid "malformed URL: [%s]"
msgstr "pogrešan unos: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "dobavljam rpm fajlove dza medij \"%s\"..."
@@ -605,7 +597,7 @@ msgstr "dobavljam rpm fajlove dza medij \"%s\"..."
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -613,37 +605,42 @@ msgstr ""
"kreirana transakcija za instaliranje na %s (ukloni=%d, instaliraj=%d, "
"ažuriraj=%d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "ne mogu da kreiram transakciju"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "ne mogu da uklonim paket %s"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "dodajem paket %s (id=%d, eid=%d, update=%d, file=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "ne mogu da instaliram paket %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "uklanjam paket %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "uklanjam paket %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "Instaliram %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, fuzzy, c-format
msgid "More information on package %s"
msgstr "Dodatne informacije o paketu..."
@@ -673,11 +670,104 @@ msgstr "Nije određena komanda"
msgid "Cannot connect to ldap uri:"
msgstr ""
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "urpmi baza podataka zaključana"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Upozorenje"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "urpmi baza podataka zaključana"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "Sledeći paketi imaju neispravne potpise"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Sledeći paketi imaju neispravne potpise"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Da li želite da nastavite konfiguraciju ?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Instalacija nije uspela"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "distribuiram %s"
+
+#: ../urpm/main_loop.pm:148
+#, fuzzy, c-format
+msgid "installing %s from %s"
+msgstr "Instaliram %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "Instaliram %s"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Instaliacija bez provere zavisnosti (da/Ne)? "
+
+#: ../urpm/main_loop.pm:205
+#, fuzzy, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "Prisilna instalacija (--force)? (da/Ne) ?"
+
+#: ../urpm/main_loop.pm:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d instlaciona transakcija nije uspela"
+msgstr[1] "%d instlaciona transakcija nije uspela"
+msgstr[2] "%d instlaciona transakcija nije uspela"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Instalacija je moguća"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "sve je već instalirano"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "sve je već instalirano"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "sve je već instalirano"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "sve je već instalirano"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -727,7 +817,7 @@ msgstr "pokušavam da selektujem nepostojeći medij \"%s\""
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "kreiram hdlist simteznu datoteku za medij \"%s\""
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "ne mogu da pristupim hdlist fajlu za \"%s\", medij je ignorisan"
@@ -820,7 +910,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Traži instalirane fontove"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "sada se proveravaju međuzavisnosti paketa\n"
@@ -886,144 +976,149 @@ 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:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "pokušavam da selektujem nepostojeći medij \"%s\""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "pokušavam da selektujem višestruki medij: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "uklanjam medij \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "dobavljam rpm fajlove dza medij \"%s\"..."
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "Konfiguracija menija sačuvana"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "Podešavanje servera"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "medij \"%s\" nije izabran"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "ispitujem hdlist fajl [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "ispitujem synthesis fajl [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "kreiram hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problem sa čitanjem hdlist ili synthesis fajla za medij \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "upisujem listu fajlova za medij \"%s\""
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...kopiranje nije uspelo"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopiram opisni fajl za \"%s\"..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...kopiranje završeno"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopiranje [%s] neuspelo"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "proračunavam md5sum kopirane source hdlist (ili synthesis)"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, fuzzy, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "kopiranje [%s] neuspelo"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, fuzzy, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "proračunavam md5sum kopirane source hdlist (ili synthesis)"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...povraćaj neuspeo: md5sum ne odgovara"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "nema rpm datoteka na [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "čitam rpm fajlove sa [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "ne mogu da pročitam rpm fajlove sa [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1034,74 +1129,74 @@ msgstr ""
"ovo se može desiti ukoliko ste ručno montirali direktorijum prilikom "
"kreiranja medija."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "dobavljam izorni hdlist (ili synthesis) za \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "pronađena testirana hdlist (ili synthesis) kao %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "ispitukem fajl sa javnim ključem za \"%s\"..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "..importovani ključ %s od javnog ključa za \"%s\""
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "ne mogu da importujem javni ključ za \"%s\""
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "upisujem listu fajlova za medij \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "dodani medij %s"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "ne mogu da parsiram hdlist datoteku za \"%s\""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problem sa čitanjem synthesis fajla za medij \"%s\""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "čitam hedere sa medija \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "NnNn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "DdDdYy"
@@ -1162,47 +1257,52 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "ne mogu da pristupim mediju \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Nema paketa sa imenom %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Sledeći paketi sadrže %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "zbog ne postojanja %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "sve je već instalirano"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "zbog ne zadovoljenog %s"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "pokušavam da prikažem %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "da bih zadržao %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "da bi instalirao %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "zbog konflikta sa %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "nezahtevano"
@@ -1222,6 +1322,16 @@ msgstr "Pogrešan ID ključa(%s)"
msgid "Missing signature (%s)"
msgstr "Nedostaje potpis (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "ne mogu da izvršim upis u konfiguracionu datoteku [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Kopiranje nije uspelo"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1238,8 +1348,8 @@ msgstr ""
"\n"
"upotreba:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1255,7 +1365,7 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - proverava da li se može izvesti ispravna instalacija.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
@@ -1263,12 +1373,12 @@ msgstr ""
" --force - primorava na invokaciju čak i ako neki paketi ne "
"postoje.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - distribuirani urpmi preko mašina sa nadimkom.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - prikazuje tag packager: packager.\n"
@@ -1278,8 +1388,8 @@ msgstr " --packager - prikazuje tag packager: packager.\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --curl - koristi još jedan root za rpm instalaciju.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --curl - koristi još jedan root za rpm instalaciju.\n"
@@ -1298,17 +1408,17 @@ msgstr ""
" --use-distrib - podešava urpmi u letu sa distrib stabla.\n"
" Ova opcija dozvoljava ispitivanje distribucije.\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - pokušava da pronađe i koristi synthesis fajl.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - pokušava da pronađe i koristi hdlist fajl.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " -verbose - verbose režim.\n"
@@ -1318,37 +1428,37 @@ msgstr " -verbose - verbose režim.\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - izaberi sve pakete koji odgovaraju izrazu.\n"
-#: ../urpme:76
+#: ../urpme:73
#, fuzzy, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Samo administrator može da instalira pakete"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "nepoznati paketi"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "nepoznati paket"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "uklanjanje paketa %s će narušiti Vaš sistem"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Nema ničega što bi se moglo ukloniti"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Proveravam kako bih uklonio sledeće pakete"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1360,12 +1470,12 @@ msgstr[1] ""
msgstr[2] ""
"Radi zadovoljenja zavisnosti, sledeći paketi će biti uklonjeni (%d MB)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
@@ -1373,12 +1483,12 @@ msgstr[0] "uklanjam paket %s"
msgstr[1] "uklanjam paket %s"
msgstr[2] "uklanjam paket %s"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (d/N) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Uklanjanje nije uspelo"
@@ -1404,14 +1514,14 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --help - prikazuje ovaj ekran o pomoći.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - koristi specifično okruženje (tipično izveštaj o "
"grešci).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr " --excludemedia - ne koristi dati medij, odvojen zarezom.\n"
@@ -1422,12 +1532,12 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - koristi samo dati medij, odvojen zarezom.\n"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1440,7 +1550,7 @@ msgid " --use-distrib - use the given path to access media\n"
msgstr ""
" --synthesis - koristi dati synthesis umesto urpmi-jeve baze podataka.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1451,7 +1561,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - ne prikazuje identične linije.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - koristi samo update medij.\n"
@@ -1585,89 +1695,99 @@ msgstr " --group - prikazuje tag grupe: grupa.\n"
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr " --all - prikazuje sve tagove.\n"
#: ../urpmf:73
#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr " --all - prikazuje sve tagove.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - prikazuje tag višak: svi viškovi (u više reda).\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr " --packager - prikazuje tag packager: packager.\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, fuzzy, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - prikazuje tag obezbeđuje: sve obezbeđuje.\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, fuzzy, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - prikazuje tag zahteva: svi zahtevi\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --size - prikazuje tag veličine: veličina.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, fuzzy, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - prikazuje tag sourcerpm: source rpm.\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - prikazuje tag višak: svi viškovi (u više reda).\n"
+
+#: ../urpmf:81
#, fuzzy, c-format
msgid " --summary - summary\n"
msgstr " --summary - prikazuje tag sažetka: sažetak.\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr " --url - prikazuje tag url: url.\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr " -verbose - verbose režim.\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -l - prikazuje fajlove u paketu.\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - prikazuje verziju, izdanje i arhitekturu, uključujući i "
"ime.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "koristim dato okruženje na %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1683,41 +1803,41 @@ msgstr ""
"\n"
"upotreba:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
msgstr " --media - koristi samo dati medij, odvojen zarezom.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr " --auto-select - automatska izbor paketa da bi se ažurirao sistem.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr " --auto-select - automatska izbor paketa da bi se ažurirao sistem.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, fuzzy, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - deaktivira MD5SUM proveru fajla.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, fuzzy, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - primorava na ažuriranje gpg ključa.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1726,12 +1846,12 @@ msgstr ""
" --no-uninstall - nikada ne traži deinstalaciju paketa, obustavi "
"instalaciju.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, fuzzy, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --install-src - instalira samo pakete sa izvornim kodom.\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1741,7 +1861,7 @@ msgstr ""
"zahtevani paket\n"
" koji vodi uklanjanju.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1752,37 +1872,43 @@ msgstr ""
" više paketa od datog broja,\n"
" default je %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - mala dužina transakcije, osnovna postavka je %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, fuzzy, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy - uzrokuje fuzzy pretragu (isto kao -y).\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, fuzzy, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src - sledeći paket je izvorni paket (isto kao i -s).\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr " --install-src - instalira samo pakete sa izvornim kodom.\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - uklanja rpm iz keša pre bilo čega drugog.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, fuzzy, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - čuva rpm koji nisu korišćeni u kešu.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1792,7 +1918,7 @@ msgstr ""
"bez\n"
" provere međuzavisnosti paketa.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1802,12 +1928,12 @@ msgstr ""
"bez\n"
" provere međuzavisnosti i integriteta.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --curl - koristi još jedan root za rpm instalaciju.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, fuzzy, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1816,47 +1942,47 @@ msgstr ""
" --use-distrib - podešava urpmi u letu sa distrib stabla.\n"
" Ova opcija dozvoljava ispitivanje distribucije.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - koristi wget za dobavljanje udaljenih fajlova.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - koristi curl za dobavljanje udaljenih fajlova.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, fuzzy, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --curl - koristi curl za dobavljanje udaljenih fajlova.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - limitira brzinu download-a.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, fuzzy, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1866,7 +1992,7 @@ msgstr ""
" (--no-verify-rpm ne verigikuje, standardna je "
"verifikacija).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1876,7 +2002,7 @@ msgstr ""
"pretpostavlja\n"
" da je 1080 po default-u (format je <proxyhost[:port]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1885,7 +2011,7 @@ msgstr ""
" --proxy-user - određuje korisnika i lozinku koji se koriste za proxy\n"
" autentifikaciju (format je <user:password>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1894,7 +2020,7 @@ msgstr ""
" --bug - pravi izveštaj o grešci u direktorijumu prosleđenom\n"
" kao sledeći argument.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, fuzzy, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1904,7 +2030,7 @@ msgstr ""
" (--no-verify-rpm ne verigikuje, standardna je "
"verifikacija).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, fuzzy, c-format
msgid ""
" --test - only verify if the installation can be achieved "
@@ -1912,103 +2038,109 @@ msgid ""
msgstr ""
" --test - proverava da li se može izvesti ispravna instalacija.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - isključuje putanju razdvojenu zarezom.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - isključuje docs fajlove.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, fuzzy, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --no-uninstall - nikada ne traži deinstalaciju paketa, obustavi "
"instalaciju.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --url - prikazuje tag url: url.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - prikazuje tag opisa: opis.\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, 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:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr ""
+" --test - proverava da li se može izvesti ispravna instalacija.\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:150
+#: ../urpmi:148
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - čuva rpm koji nisu korišćeni u kešu.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - bira sva poklapanja u komandnoj liniji.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, 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"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - ne pretražuje dostupne radi nalaženja paketa.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - tihi režim (malo poruka).\n"
-#: ../urpmi:157
+#: ../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:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, 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:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2017,7 +2149,7 @@ msgstr ""
"Direktorijum [%s] već postoji, izaberite drugi direktorijum za "
"prijavljivanje bagova ili ga izbrišite"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "ne mogu da napravim direktorijum [%s] za izveštaj o grešci"
@@ -2027,53 +2159,55 @@ msgstr "ne mogu da napravim direktorijum [%s] za izveštaj o grešci"
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "Ažuriranje"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "Ažuriranje"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "Izlaz iz instalacije"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "Izlaz iz instalacije"
-#: ../urpmi:447
+#: ../urpmi:454
#, 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:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Šta želite? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2081,7 +2215,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2089,19 +2223,19 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Svejedno nastaviti ?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (D/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2110,7 +2244,7 @@ msgstr ""
"Neki izabrani paketi se ne mogu instalirati:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2119,7 +2253,7 @@ msgstr ""
"Neki izabrani paketi se ne mogu instalirati:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2130,7 +2264,7 @@ msgstr ""
"moraju biti uklonjeni da bi ostali mogli da se ažuriraju:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2141,7 +2275,7 @@ msgstr ""
"moraju biti uklonjeni da bi ostali mogli da se ažuriraju:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2150,7 +2284,7 @@ msgstr ""
"Sledeći paketi se moraju ukloniti da bi drugi mogli da budu ažurirani:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2159,12 +2293,17 @@ msgstr ""
"Sledeći paketi se moraju ukloniti da bi drugi mogli da budu ažurirani:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2173,12 +2312,12 @@ msgstr ""
"Morate da imate root ovlašćenja da bi instalirali sledeće pakete:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2186,100 +2325,17 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../urpmi:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Pritisnite enter kada budete spremni..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Odustani"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "Sledeći paketi imaju neispravne potpise"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Sledeći paketi imaju neispravne potpise"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Da li želite da nastavite konfiguraciju ?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Instalacija nije uspela"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "distribuiram %s"
-
-#: ../urpmi:726
-#, fuzzy, c-format
-msgid "installing %s from %s"
-msgstr "Instaliram %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "Instaliram %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Instaliacija bez provere zavisnosti (da/Ne)? "
-
-#: ../urpmi:776
-#, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Prisilna instalacija (--force)? (da/Ne) ?"
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d instlaciona transakcija nije uspela"
-msgstr[1] "%d instlaciona transakcija nije uspela"
-msgstr[2] "%d instlaciona transakcija nije uspela"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Instalacija je moguća"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "sve je već instalirano"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "sve je već instalirano"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "sve je već instalirano"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "sve je već instalirano"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "restartujem urpmi"
@@ -2408,49 +2464,49 @@ msgstr " -v - verbose režim.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "ne mogu da ažuriram medij \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, fuzzy, c-format
msgid "Only superuser is allowed to add media"
msgstr "Samo administrator može da instalira pakete"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "upisujem u konfiguracionu datoteku [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, fuzzy, c-format
msgid "Can't create config file [%s]"
msgstr "upisujem u konfiguracionu datoteku [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "nedostaje <relativna putanja hdlist> sa --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "nedostaje <relativna putanja hdlist>\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "ne mogu da kreiram medij \"%s\"\n"
@@ -2611,17 +2667,17 @@ msgstr " -a - selektuje sve medije.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -a - bira sva poklapanja u komandnoj liniji.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, fuzzy, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Samo administrator može da instalira pakete"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "nema ničega za brisanje (koristi urpmi.addmedia za dodavanje medija)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2677,18 +2733,18 @@ msgstr " -a - selektuje sve ne prenosive medije.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - primorava na generisanje hdlist fajlova.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, fuzzy, c-format
msgid "Only superuser is allowed to update media"
msgstr "Samo administrator može da instalira pakete"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
"nema ničega za ažuriranje (koristi urpmi.addmedia za dodavanje medija)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2697,22 +2753,22 @@ msgstr ""
"nedostaje unos za ažuriranje\n"
"(jedan od %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "ignoring media %s"
msgstr "Menjam medij \"%s\":"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "enabling media %s"
msgstr "uklanjam medij \"%s\""
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2728,70 +2784,70 @@ msgstr ""
"\n"
"upotreba:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
"packages.\n"
msgstr " --media - koristi samo dati medij, odvojen zarezom.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - uzrokuje fuzzy pretragu (isto kao -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - prikazuje listu paketa.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - prikazuje listu medija.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-media - prikazuje listu medija i ljihov url.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
" --list-nodes - prikazuje listu čvorova pri korišćenju opcije --"
"parallel.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - prikazuje listu paralelnih alijasa.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr " --src - sledeći paket je izvorni paket (isto kao i -s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr ""
" --sources - prikazuje sve izvorne pakete pre download-a (samo root).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --url - prikazuje tag url: url.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2800,29 +2856,29 @@ msgstr ""
" --use-distrib - podešava urpmi u letu sa distrib stabla.\n"
" Ova opcija dozvoljava ispitivanje distribucije.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - prikazuje log sa izmenama.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - prikazuje tag sažetka: sažetak.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - pretraga unazad za onim što zahteva paket.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, fuzzy, c-format
msgid ""
" --whatrequires-recursive\n"
" - extended reverse search (includes virtual packages).\n"
msgstr " -R - pretraga unazad za onim što zahteva paket.\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
@@ -2831,50 +2887,50 @@ msgstr ""
" -p - dozvoljava pretraživanje po pružanju radi nalaženja "
"paketa.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - potpun izlaz sa paketom koji treba da se ukloni.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - proširuje pretragu na zavisnost paketa.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - prikazuje grupe uključujući i ime.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - prikazje korisne informacije u, za ljude čitljivnom "
"obliku.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - prikazuje fajlove u paketu.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - tihi režim (malo poruka).\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - prikazuje verziju uključujući i ime.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - sledeći paket je izvorni paket (isto kao i --src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2883,54 +2939,67 @@ msgstr ""
" -u - uklanja pakete ukoliko je novija verzija već "
"instalirana.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - uzrokuje fuzzy pretragu (kao i --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, fuzzy, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -a - bira sva poklapanja u komandnoj liniji.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
" imena ili rpm fajlovi koji su dati u komandnoj liniji se proveravaju.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr " --list-nodes se može koristiti samo sa opcijom --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:425
#, fuzzy, c-format
msgid "No changelog found\n"
msgstr "NIje pronađen image"
#, fuzzy
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Sledeći paketi imaju loše potpise:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "da li želite da nastavite instalaciju?"
+
+#, fuzzy
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Morate da restartujete mašinu da bi korisitili ovu komandu ! \n"
@@ -3257,10 +3326,6 @@ msgstr "NIje pronađen image"
#~ "zahtevani paket\n"
#~ " koji vodi uklanjanju.\n"
-#, fuzzy
-#~ msgid "unable to write file [%s]"
-#~ msgstr "ne mogu da izvršim upis u konfiguracionu datoteku [%s]"
-
#~ msgid ""
#~ " --distrib-XXX - automatically create a medium for XXX part of a\n"
#~ " distribution, XXX may be main, contrib, updates or\n"
diff --git a/po/sv.po b/po/sv.po
index 99e18fb7..d4fb8e0e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -18,7 +18,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-sv - Mandriva 2007 Release\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2006-08-28 20:45+0300\n"
"Last-Translator: Thomas Backlund <tmb@mandriva.org>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -28,7 +28,7 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "RPM installation"
@@ -38,7 +38,7 @@ msgstr "RPM installation"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Fel: kan inte hitta filen %s, avbryter operationen"
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_OK"
@@ -104,7 +104,7 @@ msgstr "_Installera"
msgid "_Save"
msgstr "_Spara"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "Av_bryt"
@@ -124,17 +124,17 @@ msgstr "Okända flagga %s"
msgid "No packages specified"
msgstr "Inga paket specifierade"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Var god vänta..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "Måste vara root"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -145,42 +145,42 @@ msgstr ""
"%s\n"
"Vill du fortsätta ändå?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Varning"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "OK"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (för att uppdatera)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (för att installera)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "Val av paket"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Ett av följande paket är nödvändigt:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Avbryt"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -191,60 +191,62 @@ msgstr ""
"%s\n"
"Vill du fortsätta ändå?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, fuzzy, 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"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "För att tillfredsställa beroenden kommer följandepaket att installeras"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, fuzzy, 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:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Paketinstallation..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "kunde inte läsa källan, avbryter"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Förbereder..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Installerar paket \"%s\" (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Lägg i media med namnet \"%s\" i enhet [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Laddar ner paket \"%s\"..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Följande paket har felaktiga signaturer:\n"
-"%s\n"
-"\n"
-"Vill du fortsätta med installationen?"
+msgid "_Done"
+msgstr "_Klar"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -255,41 +257,27 @@ msgstr ""
"%s\n"
"Du bör försöka uppdatera urpmi-databasen."
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "tar bort %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Förbereder..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Installerar paket \"%s\" (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Klar"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, c-format
msgid "Installation failed:"
msgstr "Installationen misslyckades:"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Allt är redan installerat"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Installation slutförd"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "tar bort %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -324,7 +312,7 @@ msgstr " -g - visa grupper med namn.\n"
msgid " defaults to %s.\n"
msgstr " standard är %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Endast systemadministratörer får installera paket"
@@ -334,98 +322,98 @@ 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:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "kunde inte öppna RPM-db"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "ogiltigt RPM-filnamn [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "hämtar RPM-fil [%s]..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...hämtning klar"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...hämtning misslyckades: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "kan inte läsa rpm-fil [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "kan inte tyda spec-fil %s [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "kan inte registrera RPM-fil"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Inkompatibel arkitektur för rpm [%s]"
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "fel vid registrering av lokala paket"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, 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:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "felaktig proxydeklaration på kommandorad\n"
-#: ../urpm/args.pm:135
-#, fuzzy, c-format
-msgid "chroot directory doesn't exist"
-msgstr "Omgivning sökväg %s existerar inte"
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: kan inte läsa rpm-fil \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
+#, fuzzy, c-format
+msgid "chroot directory doesn't exist"
+msgstr "Omgivning sökväg %s existerar inte"
+
+#: ../urpm/args.pm:424
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr "För många argument\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "bygg hdlist synthesis fil för media \"%s\""
@@ -614,7 +602,12 @@ msgstr "paketet %s hittas inte."
msgid "malformed URL: [%s]"
msgstr "felaktig sökväg: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "hämtar RPM-filer från media \"%s\"..."
@@ -624,7 +617,7 @@ msgstr "hämtar RPM-filer från media \"%s\"..."
msgid "[repackaging]"
msgstr "[ompaketering]"
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -632,37 +625,42 @@ msgstr ""
"skapade transaktion för installation på %s (ta bort=%d, installera=%d, "
"uppdatera=%d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "kunde inte skapa transaktion"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, 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:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "lägger till paket %s (id=%d, eid=%d, uppdatera=%d, fil=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "kan inte installera paket %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "tar bort paket %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "tar bort paket %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "installerar %s från %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Mer information om paket %s"
@@ -692,11 +690,103 @@ msgstr "Inga paket specifierade"
msgid "Cannot connect to ldap uri:"
msgstr ""
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "urpmi-databas låst"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Varning"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "urpmi-databas låst"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "Följande paket har felaktiga signaturer"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Följande paket har felaktiga signaturer"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Vill du fortsätta installationen?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Installationen misslyckades"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "distribuerar %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "installerar %s från %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "installerar %s"
+
+#: ../urpm/main_loop.pm:187
+#, 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:205
+#, 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:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d installationstransaktioner misslyckades"
+msgstr[1] "%d installationstransaktioner misslyckades"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Installation är möjlig"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "Allt är redan installerat"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Allt är redan installerat"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "Allt är redan installerat"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Allt är redan installerat"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -746,7 +836,7 @@ msgstr "försöker välja media som inte finns \"%s\""
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "bygg hdlist synthesis fil för media \"%s\""
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "kunde inte komma åt hdlist-fil för \"%s\", media ignorerat"
@@ -840,7 +930,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Sök början: %s slut: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "utför andra passet för att räkna ut beroenden\n"
@@ -906,67 +996,72 @@ msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"kan inte läsa det första installationsmediumet (hittade ingen hdlists-fil)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "försöker välja media som inte finns \"%s\""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "väljer flera media: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "tar bort media \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "omkonfigurerar urpmi för media \"%s\""
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...omkonfigurering misslyckades"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "omkonfigurering utförd"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Fel vid generering av namnfil: beroende %d kan inte hittas"
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr "Fel vid skrivning av namnfil: Kan inte skriva till filen (%s)"
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "mediat \"%s\" är inte valt"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "undersöker hdlist-fil [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "undersöker synthesis-fil [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "bygger hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -975,77 +1070,77 @@ msgstr ""
"Kan inte bygga synthesis fil för medium \"%s\". Din hdlist fil kan vara "
"skadad."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problem med att läsa hdlist- eller synthesis-fil för media \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "skriver listfil för media \"%s\""
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...kopiering misslyckades"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopierar beskrivningsfil för \"%s\"..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...kopiering klar"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopiering av [%s] misslyckades (filen är misstänkligt liten)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "Beräknar MD5-summa för kopierad käll-hdlist (eller synthesis)"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "kopiering av [%s] misslyckades (md5sum stämmer inte)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "beräknar MD5-summa för hämtade hdlist- (eller syntheses) källor"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...hämtning misslyckades: felaktig MD5-summa"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "inga RPM-filer hittade från [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "läser RPM-filer från [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "kan inte läsa RPM-filer från [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "inga rpms lästa"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1056,74 +1151,74 @@ msgstr ""
"detta kan hända om du manuellt monterade katalogen när du skapade detta "
"media."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ingen hdlist-fil hittad för media \"%s\""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "hämtar käll-hdlist (eller synthesis) för \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "hittat undersökt hdlist (eller synthesis) som %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "ingen hdlist-fil hittad för media \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "undersöker \"pubkey\"-fil för \"%s\"..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...importerarde nyckel %s från \"pubkey\"-fil av \"%s\""
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "kunde inte importera \"pubkey\"-fil för \"%s\""
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "skriver listfil för media \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "lade till media %s"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "kunde ej tyda hdlist-fil för \"%s\""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, 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:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "läser huvuden från media \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "JjYy"
@@ -1183,47 +1278,52 @@ msgstr "Felkonfigurerat media \"%s\" är markerat som flyttbart men är inte det
msgid "unable to access medium \"%s\""
msgstr "kunde inte komma åt media \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Inget paket med namn %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Följande paket innehåller %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "för att %s saknas"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Allt är redan installerat"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "på grund av otillräckliga %s"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "försöker befordra %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "för att behålla %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "för att installera %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "på grund av konflikter med %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "obegärd"
@@ -1243,6 +1343,16 @@ msgstr "Ogiltigt nyckel-id (%s)"
msgid "Missing signature (%s)"
msgstr "Signatur saknas (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Kan inte skapa inställningsfil [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Kopiering misslyckades"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1259,8 +1369,8 @@ msgstr ""
"\n"
"användning:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1275,18 +1385,18 @@ msgstr " --auto - välj automatiskt ett paket från valen.\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - verifiera om borttagningen kan utföras korrekt.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr " --force - tvinga användning även om vissa paket inte finns.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - distribuerad urpmi över alla maskiner med alias.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Ompaketera filerna före avinstallation\n"
@@ -1296,8 +1406,8 @@ msgstr " --repackage - Ompaketera filerna före avinstallation\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - använd en annan root för att ta bort rpm .\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - använd en annan root för rpm installation.\n"
@@ -1317,17 +1427,17 @@ msgstr ""
"distributionsträd, användbart\n"
" vid (av)installation av chroot med --root option.\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - försök hitta och använda synthesis fil.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - försök att hitta och använda hdlist-fil.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - utförligt läge.\n"
@@ -1337,37 +1447,37 @@ msgstr " --verbose - utförligt läge.\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - välj alla paket som matchar uttryck.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Endast systemadministratör får ta bort paket"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "okända paket"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "okänt paket"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "att ta bort paketet %s skulle förstöra systemet"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Ingenting att ta bort"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Kontrollerar för att ta bort följande paket"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1379,24 +1489,24 @@ msgstr[1] ""
"För att tillfredsställa beroenden kommer följande %d paket att tas bort (%d "
"MB)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "Ta bort %d paket?"
msgstr[1] "Ta bort %d paket?"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (j/N) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Borttagning misslyckades"
@@ -1422,12 +1532,12 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - visa detta verktygs versionsnummer.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr " --env - använd specifik miljö (vanligen en felrapport).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1439,12 +1549,12 @@ 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"
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../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"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1456,7 +1566,7 @@ msgstr ""
msgid " --use-distrib - use the given path to access media\n"
msgstr " --synthesis - använd given synthesis istället för urpmi db.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - använd given synthesis istället för urpmi db.\n"
@@ -1466,7 +1576,7 @@ msgstr " --synthesis - använd given synthesis istället för urpmi db.\n"
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - visa inte identiska rader.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - använd endast uppdateringsmedia.\n"
@@ -1603,76 +1713,86 @@ msgid " --group - group\n"
msgstr " --group - visa grupp\n"
#: ../urpmf:72
+#, fuzzy, c-format
+msgid " --license - license\n"
+msgstr " --name - visa paketnamn\n"
+
+#: ../urpmf:73
#, c-format
msgid " --name - package name\n"
msgstr " --name - visa paketnamn\n"
-#: ../urpmf:73
+#: ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - visa ersätter\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr " --packager - visa paketerare\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - visa tillhandahålls\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - visa krav\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, c-format
msgid " --size - installed size\n"
msgstr " --size - visa installerad storlek\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - visa källrpm-namn\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - visa ersätter\n"
+
+#: ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr " --summary - visa summerig\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, c-format
msgid " --url - url\n"
msgstr " --url - visa url\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, c-format
msgid " --vendor - vendor\n"
msgstr " --vendor - visa distributör\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -m - visa källan paketet finns i\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - visa version, utgåva och arkitektur med namn.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Felaktigt format: du kan endast använda en flervals-tagg"
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "använder specifik miljö på %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1681,12 +1801,12 @@ msgstr ""
"Notera: eftersom inget genomsökt media använder hdlists, kunde inte urpmf "
"ge resultat tillbaka\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Du kanske vill använda --name för att söka efter paketnamn.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1702,7 +1822,7 @@ msgstr ""
"\n"
"användning:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1710,7 +1830,7 @@ msgstr ""
" --searchmedia - använd endast givet media för att söka efter valda "
"paket.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
@@ -1718,30 +1838,30 @@ msgid ""
msgstr ""
" --auto - ej interaktivt läge. väljer standardsvar på alla frågor.\n"
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../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"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
" --auto-select - välj automatiskt paket för att uppdatera systemet.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, fuzzy, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum -inaktivera md5sum-kontroll av filer.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, fuzzy, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - tvinga uppdatering av gpg-nyckel.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1750,12 +1870,12 @@ msgstr ""
" --no-uninstall - fråga aldrig om ett paket ska avinstalleras, avbryt "
"installationen.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - installera inte paket (endast nedladdning)\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1765,7 +1885,7 @@ msgstr ""
"efterfrågade \n"
" paket som leder till avinstalleringar.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1776,37 +1896,43 @@ msgstr ""
" kommer att installeras eller uppdateras,\n"
" standard är %d\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - liten transaktionslängd, standard är %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy, -y - använd luddig sökning.\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src, -s - nästa paket är ett källpaket.\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr " --install-src - installera endast källpaket (inga binärer).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - ta bort rpm från cache före allt annat.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - rensa inte rpms från cache.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1815,7 +1941,7 @@ msgstr ""
" --allow-nodeps - tillåter användaren installera paket utan\n"
" att kontrollera beroenden.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1824,12 +1950,12 @@ msgstr ""
" --allow-force - tillåter användaren att installera paket utan\n"
" kontroll av beroenden och integritet.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - använd en annan root för rpm installation.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1839,47 +1965,47 @@ msgstr ""
"distributionsträd, användbart\n"
" vid installation av chroot med --root option.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - använd wget för att hämta fjärrfiler.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - använd curl för att hämta fjärrfiler.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, fuzzy, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --curl - använd curl för att hämta fjärrfiler.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr " --curl-options - tilläggsparametrar åt curl\n"
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr " --rsync-options- tilläggsparametrar åt rsync\n"
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr " --wget-options - tilläggsparametrar åt wget\n"
-#: ../urpmi:127
+#: ../urpmi:124
#, fuzzy, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr " --curl-options - tilläggsparametrar åt curl\n"
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - begränsa nedladdningshastigheten.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1889,7 +2015,7 @@ msgstr ""
" (--no-resume inaktiverar det, som standard är det "
"inaktiverat).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1899,7 +2025,7 @@ msgstr ""
" vara 1080 som standard (formatet är <proxydator[:port]"
">).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1908,7 +2034,7 @@ msgstr ""
" --proxy-user - ange användare och lösenord för proxy-\n"
" autentisering (formatet är <användare:lösenord>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1917,7 +2043,7 @@ msgstr ""
" --bug - mata ut en felrapport i katalogen som indikeras av\n"
" nästa arg.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1926,7 +2052,7 @@ msgstr ""
" --verify-rpm - verifiera rpm-signatur före installation (standard)\n"
" (--no-verify-rpm inaktiverar det).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
@@ -1934,38 +2060,43 @@ msgid ""
msgstr ""
" --test - verifiera endast om installationen kan utföras korrekt.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - ignorera sökväg separerad av komma.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - exkludera dokumentfiler.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr " --ignoresize - kontrollera inte diskutrymme före installation.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr ""
" --ignorearch - tillåt installation av rpm som inte matchar arkitektur.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - kör inte paketens skript\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - paket som ej ska installeras.\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - paket som ej ska installeras.\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1974,48 +2105,48 @@ msgstr ""
" --more-choices - om flera paket hittas, föreslå fler alternativ\n"
" än standard.\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - lås inte rpm db.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - uppdatera endast paket med samma arkitektur.\n"
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - välj alla träffar på kommandoraden.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, 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"
-#: ../urpmi:154
+#: ../urpmi:152
#, 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"
-#: ../urpmi:155
+#: ../urpmi:153
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - tyst läge.\n"
-#: ../urpmi:157
+#: ../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:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2024,12 +2155,12 @@ msgstr ""
"Fel: För att skapa felrapport, använd samma argument som tidigare\n"
"och lägg till --bug.\n"
-#: ../urpmi:220
+#: ../urpmi:218
#, 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:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2038,7 +2169,7 @@ msgstr ""
"Katalogen [%s] finns redan, välj en annan katalog för felrapport eller "
"radera den"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Kunde inte skapa katalog [%s] för felrapport"
@@ -2048,7 +2179,7 @@ msgstr "Kunde inte skapa katalog [%s] för felrapport"
msgid "Environment directory %s does not exist"
msgstr "Omgivning sökväg %s existerar inte"
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2057,34 +2188,36 @@ msgstr ""
"Fel: %s verkar vara monterad som read-only.\n"
"Använd --allow-force för att tvinga operationen."
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr "Uppdaterar media...\n"
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (för att uppdatera)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (för att uppdatera)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (för att installera)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (för att installera)"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2093,12 +2226,12 @@ msgstr ""
"För att tillfredsställa beroenden kommer följande %d paket att tas bort (%d "
"MB)"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Vad är ditt val? ( 1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2109,7 +2242,7 @@ msgstr ""
"är äldre än de installerade paketen:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2120,7 +2253,7 @@ msgstr ""
"är äldre än de installerade paketen:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, c-format
msgid ""
"\n"
@@ -2129,12 +2262,12 @@ msgstr ""
"\n"
"Fortsätt installation ändå?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (J/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2143,7 +2276,7 @@ msgstr ""
"Vissa begärda paket kan inte installeras:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2152,7 +2285,7 @@ msgstr ""
"Vissa begärda paket kan inte installeras:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2163,7 +2296,7 @@ msgstr ""
"tas bort så att andra kan uppdateras:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2174,7 +2307,7 @@ msgstr ""
"tas bort så att andra kan uppdateras:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2183,7 +2316,7 @@ msgstr ""
"Följande paket måste tas bort för att andra ska bli uppdaterade:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2192,12 +2325,17 @@ msgstr ""
"Följande paket måste tas bort för att andra ska bli uppdaterade:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(endast test, ingenting kommer att bli borttaget)"
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2206,111 +2344,29 @@ msgstr ""
"Du måste vara root för att kunna installera följande beroenden:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(endast test, installation kommer inte att utföras)"
-#: ../urpmi:597
+#: ../urpmi:617
#, fuzzy, 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 av %d paket? (%d MB)"
msgstr[1] "Fortsätt installationen av %d paket? (%d MB)"
-#: ../urpmi:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Tryck \"Enter\" vid klart..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Avbryt"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "Följande paket har felaktiga signaturer"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Följande paket har felaktiga signaturer"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Vill du fortsätta installationen?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Installationen misslyckades"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "distribuerar %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "installerar %s från %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "installerar %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Prova att installera utan att kontrollera behov av andra filer? (j/N) "
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Försök ännu hårdare att installera (--force)? (j/N) "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d installationstransaktioner misslyckades"
-msgstr[1] "%d installationstransaktioner misslyckades"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Installation är möjlig"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Allt är redan installerat"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Allt är redan installerat"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "Allt är redan installerat"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "Allt är redan installerat"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "startar om urpmi"
@@ -2443,32 +2499,32 @@ msgstr " -v - utförligt läge.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "kunde ej uppdatera media \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Endast systemadministratörer får lägga till media"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "Skapar inställningsfil [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "Kan inte skapa inställningsfil [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "behöver inte ange <relativ sökväg till hdlist> med --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
@@ -2477,17 +2533,17 @@ msgstr ""
"\n"
"Vill du lägga till källa '%s'"
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<relativ sökväg till hdlist> saknas\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "kunde inte skapa media \"%s\"\n"
@@ -2651,17 +2707,17 @@ msgstr " -a - välj all media.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - fuzzy search på medianamn.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Endast systemadministratör får ta bort media"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "inget att ta bort (använd urpmi.addmedia för att lägga till media)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2717,17 +2773,17 @@ msgstr " -a - välj all icke-flyttbar media.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - tvinga generering av hdlist-filer.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Endast systemadministratör får uppdatera media"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "inget att uppdatera (använd urpmi.addmedia för att lägga till media)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2736,22 +2792,22 @@ msgstr ""
"objektet som ska uppdateras saknas\n"
"(en av %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "ignorerar media %s"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "aktiverar media %s"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2767,7 +2823,7 @@ msgstr ""
"\n"
"användning:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2776,63 +2832,63 @@ msgstr ""
" --searchmedia - använd endast givet media för att söka efter valda (eller "
"uppdaterade) paket.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - kräv luddig sökning (samma som -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - visa tillgängliga paket.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - visa tillgänglig media.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - lista tillgänglig media och dess sökväg.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, 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"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - lista tillgängliga parallellalias.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, 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"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr " --src - nästa paket är ett källpaket (samma som -s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr " --sources - ge alla källpaket före nedladdning (endast root).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr ""
" --ignorearch - tillåt sökande för rpm-paket som inte motsvarar "
"arkitekturen.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2842,22 +2898,22 @@ msgstr ""
"distributionsträd.\n"
" Detta tillåter kontroll av distribution.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - skriv ut ändringsloggen (changelog).\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - skriv ut summering.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - omvänd sökning för vad som krävs av paket.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2866,58 +2922,58 @@ msgstr ""
" --whatrequires-recursive\n"
" - utökad omvänd sökning (inkluderar virtuella paket).\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -p - sök i \"provides\" för att hitta paket.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr ""
" -c - fullständig utmatning med paketet som ska tas bort.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr ""
" -d - utöka förfrågning till att omfatta paketberoenden.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - visa grupper med namn.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - visa användbar information i en för människan läsbar "
"form.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - lista filerna i paketet.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - tyst läge.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - visa version och utgåva med namn.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - nästa paket är ett källpaket (samma som --src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2925,46 +2981,46 @@ msgid ""
msgstr ""
" -u - ta bort paket om en nyare version redan är installerad.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - kräv luddig sökning (samma som --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - som -y, fast tvingar matchning av stora och små "
"bokstäver.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " namn eller rpm-filer som anges på kommandoraden förfrågas.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes kan endast användas med --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"Notera: eftersom inget genomsökt media använder hdlists, kunde inte urpmf "
"ge resultat tillbaka\n"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2972,11 +3028,22 @@ msgstr ""
"Notera: eftersom inget genomsökt media använder hdlists, kunde inte urpmf "
"ge resultat tillbaka\n"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Ingen ändringslogg hittades\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Följande paket har felaktiga signaturer:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Vill du fortsätta med installationen?"
+
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Du måste vara root för att kunna använda --use-distrib"
diff --git a/po/tg.po b/po/tg.po
index 3c620b89..515df45a 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+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"
@@ -25,7 +25,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.10\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "Коргузориши RPM"
@@ -35,7 +35,7 @@ msgstr "Коргузориши RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Ок"
@@ -104,7 +104,7 @@ msgstr "_Коргузорӣ"
msgid "_Save"
msgstr "_Нигоҳ доштан"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Бекор кардан"
@@ -126,17 +126,17 @@ msgstr ""
msgid "No packages specified"
msgstr "қуттии бо номи %s нест"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Интизор бошед..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, fuzzy, c-format
msgid "Must be root"
msgstr "Даргоҳи муш"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -146,42 +146,42 @@ msgstr ""
"Якчанд барномаҳои коромода коргузорӣ нахоҳанд шуд:\n"
"%s"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Огоҳӣ"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "Афзоиш"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, fuzzy, c-format
msgid " (to install)"
msgstr "Коргузорӣ ба итмом расид"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Яке аз қуттиҳои зерин даркор аст:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Қатъ кардан"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -192,62 +192,63 @@ msgstr ""
"%s\n"
"Шумо розӣ ҳастед?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
"Барои қаноатмандии тобеиятҳо бастаҳои зерин кор гузошта мешаванд (%d Мб)"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
"Барои қаноатмандии тобеиятҳо бастаҳои %d зерин кор гузошта мешаванд (%d МБ)"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "барномаи коромода насб мегардад..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "қуттиҳои сарчашмавӣ гирифтан номумкин, кандашавӣ"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Тайёрӣ..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Барномаи коромодаи `%s' (%s/%s) коргузорӣ мешавад..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Лутфан муҳити бо номи \"%s\" ба дастгоҳи [%s] дароред"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Фаровири қуттии `%s'..."
-#: ../gurpmi2:279
-#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Дар қуттиҳои зерин имзоҳои нодуруст оварда шудаанд:\n"
-"\n"
-"%s\n"
-"\n"
-"Давом додан гирем?"
+#: ../gurpmi2:291
+#, c-format
+msgid "_Done"
+msgstr "_Шуд"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -258,41 +259,27 @@ msgstr ""
"%s\n"
"Мумкин шумо додаҳои urpmi-ро нав мекунед"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "хориҷи қуттии %s "
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Тайёрӣ..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Барномаи коромодаи `%s' (%s/%s) коргузорӣ мешавад..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Шуд"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Коргузорӣ нагузашт"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Ҳамааш аллакай кор гузошта шудааст"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Коргузориш шуд"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "хориҷи қуттии %s "
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -327,7 +314,7 @@ msgstr " -g - чопи гурӯҳҳо ҳамчун бо ном.\n"
msgid " defaults to %s.\n"
msgstr " бо нобаёнӣ %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Танҳо фавқулкорванд барои коргузоштани қуттиҳо рухсат дорад"
@@ -337,98 +324,98 @@ msgstr "Танҳо фавқулкорванд барои коргузоштан
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "кушодани rpmdb номумкин"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "номи файли rpm-и нодурусти [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "барқароркунии файли rpm [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...барқароркунӣ шуд"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...барқароркунӣ нагузашт: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "дохилшавии файли rpm-и [%s] номумкин"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "таҷзияи \"%s\" дар файли [%s] номумкин"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "бақайдгирии файли rpm номумкин"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "хатогии ба қайдгирии қуттиҳои маҳаллӣ"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "дар сатри фармонӣ proxy нодуруст нишон дода шудааст\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: хондани файли rpm \"%s\" намешавад\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "файли сунъии офаридаи hdlist барои муҳити \"%s\""
@@ -617,7 +604,12 @@ msgstr "қуттии %s ёфт нашуд."
msgid "malformed URL: [%s]"
msgstr "даровардани бад: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "барқароркунии файли rpm аз миёна \"%s\"..."
@@ -627,43 +619,48 @@ msgstr "барқароркунии файли rpm аз миёна \"%s\"..."
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, 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:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "офаридани муҳит номумкин аст"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "хориҷи қуттии %s номумкин"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "иловаи барномаи коромода %s (id=%d, eid=%d, update=%d, file=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "кор гузоштани қуттии %s номумкин"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "хориҷкунии қуттии %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "хориҷкунии қуттии %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "коргузории %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Ахбороти изофагӣ дар бастаи %s"
@@ -693,11 +690,103 @@ msgstr "қуттии бо номи %s нест"
msgid "Cannot connect to ldap uri:"
msgstr ""
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "urpmi манбаи маълумот дастнорас аст"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Огоҳӣ"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "urpmi манбаи маълумот дастнорас аст"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "Қуттиҳои зерин имзоҳои бад доранд"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Қуттиҳои зерин имзоҳои бад доранд"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Шумо хоҳиши давом додани коргузориро доред ?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Коргузорӣ нагузашт"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "тақсимкунии %s"
+
+#: ../urpm/main_loop.pm:148
+#, fuzzy, c-format
+msgid "installing %s from %s"
+msgstr "коргузории %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "коргузории %s"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Коргузориро бе тафтиши тобеиятҳо кӯшиш кунем? (Ҳ/Н) "
+
+#: ../urpm/main_loop.pm:205
+#, fuzzy, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "Коргузориро боз устувортар (--force) кӯшиш кунем? (Ҳ/Н) "
+
+#: ../urpm/main_loop.pm:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d коргузорӣ амалӣ нагардид"
+msgstr[1] "%d коргузорӣ амалӣ нагардид"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Коргузорӣ мумкин аст"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "Ҳамааш аллакай кор гузошта шудааст"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Ҳамааш аллакай кор гузошта шудааст"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "Ҳамааш аллакай кор гузошта шудааст"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Ҳамааш аллакай кор гузошта шудааст"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -748,7 +837,7 @@ msgstr "кӯшиши интихоби муҳити вуҷуд надоштаи \
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "файли сунъии офаридаи hdlist барои муҳити \"%s\""
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "дохилшавии файли hdlist-и \"%s\" номумкин, муҳит рад шуд"
@@ -843,7 +932,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Кофтукови рамзҳои муқарраршуда"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "роҳи дуюми ҳисоби вобастагиҳо ба амал оварда мешавад\n"
@@ -909,146 +998,151 @@ msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"дохилшавӣ ба миёнаи коргузориши аввала номумкин (файли hdlists ёфт нашуд)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "кӯшиши интихоби муҳити вуҷуд надоштаи \"%s\""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "интихобкунии миёнаи бисёр: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "хориҷкунии миёнаи \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "бозтанзимкунии urpmi барои миёнаи \"%s\""
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...бозтанзимкунӣ бо нокомӣ анҷомид"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "бозтанзимгузорӣ хотима ёфт"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "муҳити \"%s\" интихоб нашудааст"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "санҷидани файли hdlist [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "санҷидани файли synthesis [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "офариниши hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "муаммои хондани файли hdlist ё файли сарчашмаи synthesis \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "навиштани файли рӯйхат барои миёнаи \"%s\""
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...нусхабардорӣ нагузашт"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "нусхабардории файли тавсифоти \"%s\"..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...нусхабардорӣ шуд"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "нусхабардории [%s] бо нокомӣ анҷомид (файл шубҳаомез кӯтоҳ аст)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr ""
"hdlist (ё ин ки synthesis) аввали нусха гирифташуда ҳисоб мешавад md5sum"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "нусхабардории [%s] бо нокомӣ анҷомид (ба md5sum мутобиқат намекунад)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr ""
"аз hdlist-и аввалаи гирифташуда md5sum ҳисоб карда мешавад(ё ин ки synthesis)"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...барқароркунӣ нагузашт: мувофиқ набудан ба md5sum"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "файлҳои rpm аз [%s] ёфт нашуданд"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "хониши файлҳои rpm аз [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "хондани файли rpm номумкин аз [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1059,74 +1153,74 @@ msgstr ""
"ин ҳангоми ба таври дастӣ насб намудани феҳрист дар ҳолати сохтанисарчашма "
"ба амал меояд."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "файли hdlist барои муҳити \"%s\" ёфт нашуд"
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "барқароркунии сарчашмаи hdlist (ё synthesis) \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "hdlist (ё synthesis)-и таҳқиқшуда ёфт шуд ҳамчун %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "файли hdlist барои муҳити \"%s\" ёфт нашуд"
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "барои \"%s\"файли калиди кушод тафтиш карда мешавад..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...калиди гирифта шуда %s аз файли калиди кушода \"%s\""
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "навиштани файли рӯйхатии \"%s\" номумкин"
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "навиштани файли рӯйхат барои миёнаи \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "миёнаи иловашуда %s"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "таҷзияи файли hdlist - и \"%s\" номумкин"
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "муаммои хондани файли synthesis-и муҳити \"%s\""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "хониши сарлавҳаҳо аз миёнаи \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "НнNn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "ҲҳYy"
@@ -1187,47 +1281,52 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "дохилшавии муҳити \"%s\" номумкин"
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Қуттии бо номи %s нест"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Қуттиҳои зерин соҳиби %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "аз сабаби мавҷуд набудан %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Ҳамааш аллакай кор гузошта шудааст"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "аз сабаби қонеъ набудан %s"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "кӯшиши фаъол намудан %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "барои нигоҳдории %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "барои коргузоштани %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "аз ҳисоби ба вуҷуд омадани муаммо бо %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "хоҳиш нашуда"
@@ -1247,6 +1346,16 @@ msgstr "Калиди нодуруст ID (%s)"
msgid "Missing signature (%s)"
msgstr "Имзо мавҷуд нест (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "файли танзимдарории [%s] нависед"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Нусхабардорӣ нагузашт"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1264,8 +1373,8 @@ msgstr ""
"\n"
"истифода:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - чопи ин пайғоми ёрӣ.\n"
@@ -1283,7 +1392,7 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - тафтиш намоед, ки оё коргузории дуруст ба амал меояд.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
@@ -1291,13 +1400,13 @@ msgstr ""
" --force - ба таври маҷбурӣ истифода баред, ҳатто агар якчанд "
"барномаҳои коромода вуҷуд надошта бошад.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
" --parallel - urpmi, ки аз рӯи ангалҳои мошинаҳо тақсим шудааст.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - тэг packager-ро чоп намоед: қуттӣ тартибдиҳанда.\n"
@@ -1307,8 +1416,8 @@ msgstr " --packager - тэг packager-ро чоп намоед: қуттӣ
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - дигар решаро барои коргузории rpm истифода баред.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - дигар решаро барои коргузории rpm истифода баред.\n"
@@ -1328,19 +1437,19 @@ msgstr ""
" барои коргузорӣ (на)кардани chroot бо хосият --root "
"фоиданок аст.\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr ""
" --probe-synthesis - кӯшиши ёфтан ва истифодаи файли synthesis-ро намоед.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr ""
" --probe-hdlist - барои кофтан ва истифодаи файли hdlist кӯшиш намоед.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - ҳолати муфассал.\n"
@@ -1350,38 +1459,38 @@ msgstr " --verbose - ҳолати муфассал.\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - интихоби ҳамаи қуттиҳои бо ифода мувофиқ буда.\n"
-#: ../urpme:76
+#: ../urpme:73
#, fuzzy, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Танҳо фавқулкорванд барои хориҷкунии муҳит рухсат дорад"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "қуттиҳои номаълум"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "қуттии номаълум"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr ""
"хориҷ намудани барномаи коромода %s боиси қатъи кори системи шумомегардад"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Ҳеҷ чизро хориҷ карда намешавад"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Тафтишкунӣ барои хориҷи қуттиҳои зерин"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1391,24 +1500,24 @@ msgstr[0] ""
msgstr[1] ""
"Барои қаноатмандии тобеиятҳо, қуттиҳои зерин хориҷ карда мешаванд (%d МБ)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "хориҷкунии қуттии %s"
msgstr[1] "хориҷкунии қуттии %s"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (ҳ/Н) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Хориҷкунӣ нагузашт"
@@ -1435,14 +1544,14 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --help - чопи ин пайғоми ёрӣ.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - муҳити махсусро истифода баред (одатан ҳисоботи "
"хатогиҳо).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1454,13 +1563,13 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - истифодаи танҳо муҳити додашуда, бо вергул ҷудошуда.\n"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1475,7 +1584,7 @@ msgstr ""
" --synthesis - synthesis -и додашударо ба ивази urpmi db истифода "
"намоед.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1487,7 +1596,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - хати рости монандро чоп накунед.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - танҳо муҳити навкунӣ истифода баред.\n"
@@ -1621,79 +1730,90 @@ msgstr " --group - чопи гурӯҳи тэг: гурӯҳ.\n"
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr " --name - танҳо номҳои бастаҳоро чоп кунед.\n"
#: ../urpmf:73
#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr " --name - танҳо номҳои бастаҳоро чоп кунед.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr ""
" --obsoletes - тэг obsoletes-ро чоп намоед: ҳамаи файлҳои кӯҳнашуда.\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr " --packager - тэг packager-ро чоп намоед: қуттӣ тартибдиҳанда.\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, fuzzy, c-format
msgid " --provides - provides tags\n"
msgstr ""
" --provides - тэг provides-ро чоп намоед: ҳамаи файлҳои "
"пешниҳодшаванда.\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, fuzzy, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - тэг requires-ро чоп намоед: ҳамаи вобастагиҳоро.\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --size - чопи ҳаҷми тэг: ҳаҷм.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, fuzzy, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - тэг sourcerpm-ро чоп намоед: rpm-и аввала.\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr ""
+" --obsoletes - тэг obsoletes-ро чоп намоед: ҳамаи файлҳои кӯҳнашуда.\n"
+
+#: ../urpmf:81
#, fuzzy, c-format
msgid " --summary - summary\n"
msgstr " --summary - чопи ҷамъбасти тэг: ҷамъбаст.\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr " --url - чоп намоед тэг url: url.\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr " --verbose - ҳолати муфассал.\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -l - барориш рӯйхати файлҳои баста.\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - тафсир, релиз ва архитектураро бо номҳояшон чоп намоед.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "барои %s давраи махсус истифода мегардад\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1702,12 +1822,12 @@ msgstr ""
"Эзоҳ: то даме, ки расонаи ҷустуҷӯшуда hdlists-ро истифода набарад, urpmf "
"ягон натиҷаро баргардонида наметавонад\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Шумо метавонед --name барои ҷустуҷӯ барои бастаи номҳо, хоҳед бинед.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1724,21 +1844,21 @@ msgstr ""
"\n"
"истифода:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
" --media - истифодаи танҳо муҳити додашуда, бо вергул ҷудошуда.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
@@ -1746,24 +1866,24 @@ msgstr ""
" --auto-select - барои аз нав намудани систем барномаҳои "
"коромодаробеихтиёрона интихоб намуд.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
" --auto-select - барои аз нав намудани систем барномаҳои "
"коромодаробеихтиёрона интихоб намуд.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, fuzzy, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - тафтиши файли MD5SUM-ро хомӯш кунед.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, fuzzy, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - зӯран навкунии gpg-калид.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1772,7 +1892,7 @@ msgstr ""
" --no-uninstall - барои хориҷи барномаи коромода ҳеҷ чизро пешниҳоднакунед, "
"коргузориро қатъ накунед.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, fuzzy, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr ""
@@ -1780,7 +1900,7 @@ msgstr ""
"коргузорӣнамоед\n"
" (бе ҳисоби дуӣ).\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1790,7 +1910,7 @@ msgstr ""
"доред, хориҷ намоед\n"
" барномаҳои коромодаҳое ки ба хориҷшавӣ меоранд.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1802,24 +1922,24 @@ msgstr ""
"гардад \n"
" нобаён %d мебошад.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - дарозии тарокуниши хурд, пешфарз %d мебошад.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, fuzzy, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr ""
" --fuzzy - дар асоси мантиқи нодуруст ба кофтукобӣ оғоз намоед(ба "
"монандӣ -y).\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, fuzzy, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src - қуттии оянда қуттии аввала аст (ба монандӣ -s).\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
@@ -1827,18 +1947,24 @@ msgstr ""
"коргузорӣнамоед\n"
" (бе ҳисоби дуӣ).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - rpm-ро пеш аз ҳама аз пинҳонӣ хориҷ кунед.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, fuzzy, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr ""
" --noclean - rpm-и истифода бурда нашударо дар пинҳонӣ нигоҳ доред.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1848,7 +1974,7 @@ msgstr ""
" барномаҳои коромодаро бе тафтиши вобастагиҳо муаяйн "
"намояд.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1858,12 +1984,12 @@ msgstr ""
" вобастагиҳо ва бутунӣ барои пурсиши корван иҷозат дода "
"шавад.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - дигар решаро барои коргузории rpm истифода баред.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1873,53 +1999,53 @@ msgstr ""
" барои коргузоркунии chroot бо хосият --root фоиданок "
"аст.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr ""
" --wget - барои гирифтани файлҳои хориҷшуда wget-ро истифода "
"баред.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr ""
" --curl - curl-ро барои гирифтани файлҳои хориҷшуда истифода "
"намоед.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, fuzzy, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr ""
" --curl - curl-ро барои гирифтани файлҳои хориҷшуда истифода "
"намоед.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - суръати қабулро маҳдуд намоед.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1929,7 +2055,7 @@ msgstr ""
" (--no-resume онро хомӯш мекунад, бо нобаёнӣ хомӯш карда "
"мешавад).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1939,7 +2065,7 @@ msgstr ""
" даргоҳи 1080 истифода мешавад (шакли <proxyhost[:port]"
">).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1949,7 +2075,7 @@ msgstr ""
"диҳед\n"
" (шакли <корванд:гузарвожа>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1958,7 +2084,7 @@ msgstr ""
" --bug - ба феҳрист ҳисобот оиди хатогиҳо бароред\n"
" бо далели зерин.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, fuzzy, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1968,7 +2094,7 @@ msgstr ""
" (--no-verify-rpm онро хомӯш намоед, дохил шудааст аз "
"рӯипешфарз).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, fuzzy, c-format
msgid ""
" --test - only verify if the installation can be achieved "
@@ -1976,40 +2102,46 @@ msgid ""
msgstr ""
" --test - тафтиш намоед, ки оё коргузории дуруст ба амал меояд.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - роҳҳое ки бо вергул ишора шудаанд, хориҷ намоед.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - файлҳои ҳуҷҷатҳоро хориҷ намоед.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, fuzzy, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --no-uninstall - барои хориҷи барномаи коромода ҳеҷ чизро пешниҳоднакунед, "
"коргузориро қатъ накунед.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --url - чоп намоед тэг url: url.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - чопи тасвироти тэг: тасвирот.\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
" --skip - бастаҳое, ки коргузории онҳо бояд рад карда шаванд\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr ""
+" --skip - бастаҳое, ки коргузории онҳо бояд рад карда шаванд\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2019,65 +2151,65 @@ msgstr ""
"бештар пешкаш мегарданд\n"
" назар ба нобаёнӣ.\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr ""
" --noclean - rpm-и истифода бурда нашударо дар пинҳонӣ нигоҳ доред.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
" -a - ҳамаи мувофиқатҳоро аз сатри фармонӣ интихоб намоед.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - ба ҷустуҷӯӣ дар provides иҷозат диҳед барои дастрас "
"намуданибарномаҳои коромода.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
" -P - барои барномаи коромода provides-ро истифода набаред.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - усули ором.\n"
-#: ../urpmi:157
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
" номҳо ё файлҳое ки дар сатри фармони ишора шуда коргузорӣ хоҳанд шуд.\n"
-#: ../urpmi:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "Ҳангоми истифодаи --install-src чӣ бояд кард бо файлҳои дуии rpm"
-#: ../urpmi:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2086,7 +2218,7 @@ msgstr ""
"Феҳристи [%s] аллакай мавҷуд аст, марҳамат карда дигар феҳристро барои "
"маърӯзаи оиди хато, истифода баред ё онро нобуд созед"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Офридани феҳристи [%s] барои маърӯзаи ғалат номумкин"
@@ -2096,41 +2228,43 @@ msgstr "Офридани феҳристи [%s] барои маърӯзаи ға
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "Афзоиш"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "Афзоиш"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "Коргузорӣ ба итмом расид"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "Коргузорӣ ба итмом расид"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2138,12 +2272,12 @@ msgid ""
msgstr ""
"Барои қаноатмандии тобеиятҳо, қуттиҳои зерин хориҷ карда мешаванд (%d МБ)"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Интихоби шумо чист? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2151,7 +2285,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2159,19 +2293,19 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Ба ҳар ҳол давом диҳем?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (Ҳ/н) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2180,7 +2314,7 @@ msgstr ""
"Якчанд барномаҳои коромода коргузорӣ нахоҳанд шуд:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2189,7 +2323,7 @@ msgstr ""
"Якчанд барномаҳои коромода коргузорӣ нахоҳанд шуд:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2200,7 +2334,7 @@ msgstr ""
"кард, онгоҳ коргузориро давом додан мумкин нест\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2211,7 +2345,7 @@ msgstr ""
"кард, онгоҳ коргузориро давом додан мумкин нест\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2221,7 +2355,7 @@ msgstr ""
"%s\n"
"Шумо розӣ ҳастед?"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2231,12 +2365,17 @@ msgstr ""
"%s\n"
"Шумо розӣ ҳастед?"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2245,111 +2384,29 @@ msgstr ""
"Шумо бояд ҳуқуқи root-ро дошта бошед барои насб намудани вобастагиҳоизерин:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, 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:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Вақте, ки тайёр Enter-ро пахш кунед..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Бекор кардан"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "Қуттиҳои зерин имзоҳои бад доранд"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Қуттиҳои зерин имзоҳои бад доранд"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Шумо хоҳиши давом додани коргузориро доред ?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Коргузорӣ нагузашт"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "тақсимкунии %s"
-
-#: ../urpmi:726
-#, fuzzy, c-format
-msgid "installing %s from %s"
-msgstr "коргузории %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "коргузории %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Коргузориро бе тафтиши тобеиятҳо кӯшиш кунем? (Ҳ/Н) "
-
-#: ../urpmi:776
-#, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Коргузориро боз устувортар (--force) кӯшиш кунем? (Ҳ/Н) "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d коргузорӣ амалӣ нагардид"
-msgstr[1] "%d коргузорӣ амалӣ нагардид"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Коргузорӣ мумкин аст"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Ҳамааш аллакай кор гузошта шудааст"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Ҳамааш аллакай кор гузошта шудааст"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "Ҳамааш аллакай кор гузошта шудааст"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "Ҳамааш аллакай кор гузошта шудааст"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "urpmi бозоғоз шуда истодааст"
@@ -2480,49 +2537,49 @@ msgstr " -v - намуди муфассал.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "нав кардани муҳити \"%s\" номумкин\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Танҳо фавқулкорванд барои коргузоштани муҳит рухсат дорад"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "файли танзимдарории [%s] нависед"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, fuzzy, c-format
msgid "Can't create config file [%s]"
msgstr "файли танзимдарории [%s] нависед"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "ҳоҷат нест барои додани <роҳи нисбии hdlist> бо --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<роҳи нисбии hdlist> ҳозир нест\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "офаридани муҳити \"%s\" номумкин\n"
@@ -2685,18 +2742,18 @@ msgid " -y - fuzzy match on media names.\n"
msgstr ""
" -y - ҳамаи норавшаниҳо ба номҳои муҳит мувофиқат мекунанд.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Танҳо фавқулкорванд барои хориҷкунии муҳит рухсат дорад"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr ""
"ба хориҷкунӣ чизе нест (барои иловаи муҳит urpmi.addmedia истифода баред)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2751,18 +2808,18 @@ msgstr " -a - ҳамаи сарчашмаҳои ҷудонашав
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - ба таври маҷбурӣ файлҳои hdlist-ро созед.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Танҳо фавқулкорванд барои навсозии муҳит рухсат дорад"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
"ба навкунӣ чизе нест (барои иловаи муҳит urpmi.addmedia-ро истифода баред)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2771,22 +2828,22 @@ msgstr ""
"элемент барои нав кардан ҳозир нест\n"
"(яке аз %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "ignoring media %s"
msgstr "Таҳрири сарчашмаи \"%s\":"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "enabling media %s"
msgstr "хориҷкунии миёнаи \"%s\""
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2803,7 +2860,7 @@ msgstr ""
"\n"
"истифодаи:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2811,52 +2868,52 @@ msgid ""
msgstr ""
" --media - истифодаи танҳо муҳити додашуда, бо вергул ҷудошуда.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr ""
" --fuzzy - дар асоси мантиқи нодуруст ба кофтукобӣ оғоз намоед(ба "
"монандӣ -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - рӯйхаткунии қуттиҳои дастрас.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - рӯйхаткунии муҳити дастрас.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - рӯйхати муҳитҳои дастрас ва url-и онҳо.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
" --list-nodes - рӯйхаткунии гиреҳҳои дастрас бо истифодаи --parallel.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - рӯйхаткунии тахаллусҳои пареллели дастрас.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
" --dump-config - рӯгирифти config дар намуди нишонванди urpmi.addmedia.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr " --src - қуттии оянда қуттии аввала аст (ба монандӣ -s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
@@ -2865,12 +2922,12 @@ msgstr ""
"коромодарогиред\n"
" (танҳо барои root).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --url - чоп намоед тэг url: url.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2879,29 +2936,29 @@ msgstr ""
" --use-distrib - танзими urpmi дар ҳаркат аз дарахти distrib.\n"
" Ин интихоб пурсиши тақсимотро иҷозат медиҳад.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - чопкунии changelog.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - чопи ҷамъбасти тэг: ҷамъбаст.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - ҷустуҷӯи баръакс барои қуттии талабшуда.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, fuzzy, c-format
msgid ""
" --whatrequires-recursive\n"
" - extended reverse search (includes virtual packages).\n"
msgstr " -R - ҷустуҷӯи баръакс барои қуттии талабшуда.\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
@@ -2910,50 +2967,50 @@ msgstr ""
" -p - барои дастрас намудани барномаҳои коромода ҷустуҷӯ "
"намоед.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - ҳосилкунии пурра бо қуттӣ барои хориҷ шудан.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - дархости васеъ ба тобеиятҳои қуттӣ.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - чопи гурӯҳҳо ҳамчун бо ном.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - ахбороти фоиданокро дар намуди барои хондан қуллай чоп "
"кардан.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - барориш рӯйхати файлҳои баста.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - усули ором.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - чопи нашр ва нусха ҳамчун бо ном.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - қуттии оянда қуттии сарчашмавӣ аст (ҳамчун --src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2961,47 +3018,47 @@ msgid ""
msgstr ""
" -u - хориҷи қуттӣ агар нашри навтарин коргузошта бошад.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - ҷустуҷӯи норӯшан ниҳодан (ҳамчун --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - ба монанди -y, лекин маҷбуран ба ҳолати ғайри ҳассосият "
"мувофиқат мекунад.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
" номҳо ва ё файлҳои rpm дар сатри фармонӣ ишора шуда дархост мегарданд.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes танҳо истифода бурда мешавад бо --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"Эзоҳ: то даме, ки расонаи ҷустуҷӯшуда hdlists-ро истифода набарад, urpmf "
"ягон натиҷаро баргардонида наметавонад\n"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -3009,12 +3066,25 @@ msgstr ""
"Эзоҳ: то даме, ки расонаи ҷустуҷӯшуда hdlists-ро истифода набарад, urpmf "
"ягон натиҷаро баргардонида наметавонад\n"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Ягон номнависи тағиротҳо пайдо нагардид\n"
#, fuzzy
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Дар қуттиҳои зерин имзоҳои нодуруст оварда шудаанд:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Давом додан гирем?"
+
+#, fuzzy
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Барои истифодаи ин фармон шумо бояд root бошед ! \n"
diff --git a/po/th.po b/po/th.po
index b50b146b..c1adbf56 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+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"
@@ -19,7 +19,7 @@ msgstr ""
"X-Generator: KBabel 0.9.6\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, fuzzy, c-format
msgid "RPM installation"
msgstr "กำลังเตรียมการติดตั้ง"
@@ -29,7 +29,7 @@ msgstr "กำลังเตรียมการติดตั้ง"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -79,7 +79,7 @@ msgstr "_ติดตั้ง"
msgid "_Save"
msgstr "_บันทึก"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_ยกเลิก"
@@ -101,17 +101,17 @@ msgstr ""
msgid "No packages specified"
msgstr "ไม่มีการกำหนดคำสั่ง"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, fuzzy, c-format
msgid "Please wait..."
msgstr "กรุณารอ"
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, fuzzy, c-format
msgid "Must be root"
msgstr "พอร์ตของเม้าส์"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -119,42 +119,42 @@ msgid ""
"Continue installation anyway?"
msgstr "ไม่สามารถ install บางเพกเกจได้"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "คำเตือน"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "ตกลง"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr ""
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, fuzzy, c-format
msgid " (to install)"
msgstr "ออกจากการติดตั้ง"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "หนึ่งใน Packages ต่อไปนี้ต้องได้รับการติดตั้ง "
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, fuzzy, c-format
msgid "_Abort"
msgstr "เลิก"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -162,54 +162,62 @@ msgid ""
"Continue installation anyway?"
msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกลบ"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "เพื่อความถูกต้องของการเป็นอิสระระหว่างโปรแกรมแพ็คเกจบางตัวจะถูกลบทิ้ง(%d MB)"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "เพื่อความถูกต้องของการเป็นอิสระระหว่างโปรแกรมแพ็คเกจบางตัวจะถูกลบทิ้ง(%d MB)"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(แพ็คเก็จ %d ชุด, %d MB)"
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, fuzzy, c-format
msgid "Package installation..."
msgstr "การ install package"
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "ไม่สามารถเรียก source package,กำลังยกเลิก"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "กำลังเตรียม..."
+
+#: ../gurpmi2:246
+#, fuzzy, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr ""
+"กำลังติดตั้งแพ็คเก็จ %s\n"
+"%d%%"
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "กรุณาใส่อุปกรณ์ที่มีชื่อ \"%s\" ใน [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, fuzzy, c-format
msgid "Downloading package `%s'..."
msgstr "กำลังติดตั้งแพ็คเก็จ %s"
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr "แพ็คเกจต่อไปนี้มี signatures ที่ไม่ถูกต้อง"
+msgid "_Done"
+msgstr "ทำเรียบร้อยแล้ว"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -219,43 +227,27 @@ msgstr ""
"การติดตั้งล้มเหลวมีบางไฟล์ที่ขาดหายไป\n"
"ขอแนะนำให้ทำการอัพเดตฐานข้อมูล urpmi"
-#: ../gurpmi2:292 ../urpme:142
-#, fuzzy, c-format
-msgid "removing %s"
-msgstr "กำลังติดตั้ง %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "กำลังเตรียม..."
-
-#: ../gurpmi2:302
-#, fuzzy, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr ""
-"กำลังติดตั้งแพ็คเก็จ %s\n"
-"%d%%"
-
-#: ../gurpmi2:334
-#, fuzzy, c-format
-msgid "_Done"
-msgstr "ทำเรียบร้อยแล้ว"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "การติดตั้งไม่สำเร็จ"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "install เสร็จเรียบร้อย"
+#: ../gurpmi2:312 ../urpme:139
+#, fuzzy, c-format
+msgid "removing %s"
+msgstr "กำลังติดตั้ง %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -288,7 +280,7 @@ msgstr " -g - พิมพ์กลุ่มพร้อมชื
msgid " defaults to %s.\n"
msgstr " -a - เลือกมีเดียทั้งหมด\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "superuser เท่านั้นที่มีสิทธิติดตั้ง packages"
@@ -298,98 +290,98 @@ msgstr "superuser เท่านั้นที่มีสิทธิติ
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, fuzzy, c-format
msgid "unable to open rpmdb"
msgstr "ไม่สามารถเปิดแฟ้ม %s\n"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "ชื่อ rpm fileไม่ถูกต้อง [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, fuzzy, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "กำลังอ่านข้อมูลจากไฟล์ hdlists"
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "การอ่านข้อมูลเรียบร้อย"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "การอ่านข้อมูลล้มเหลว: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "ไม่สามารถใช้งาน rpm file [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "ไม่สามารถใช้งาน \"%s\" ใน file [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, fuzzy, c-format
msgid "unable to register rpm file"
msgstr "ไม่สามารถใช้งาน rpm file [%s]"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "ลงทะเบียน local package มีข้อผิดพลาด"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "การแจ้งพร็อกซี่ที่ไม่ดี\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq:ไม่สามารถอ่าน rpm file \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "สร้าง hdlist synthesis file สำหรับ อุปกรณ์ \"%s\""
@@ -576,7 +568,12 @@ msgstr "หา %s package ไม่พบ"
msgid "malformed URL: [%s]"
msgstr " inputไม่ถูกต้อง :[%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, fuzzy, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "ไม่สามารถอ่าน rpm file [%s] จาก \"%s\""
@@ -586,43 +583,48 @@ msgstr "ไม่สามารถอ่าน rpm file [%s] จาก \"%s\""
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, fuzzy, c-format
msgid "unable to create transaction"
msgstr "ไม่สามารถสร้างข้อมูลเฉพาะตัวของผู้ใช้สำหรับ ssh"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "ไม่สามารถที่จะลบแพ็คเกจ %s"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr ""
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "ไม่สามารถติดตั้งแพ็คเกจ %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "กำลังติดตั้งแพ็คเก็จ %s"
+
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing package %s"
msgstr "กำลังติดตั้งแพ็คเก็จ %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "กำลังติดตั้ง %s\n"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, fuzzy, c-format
msgid "More information on package %s"
msgstr "ข้อมูลเพื่มเติมบนแพกเกจ..."
@@ -652,11 +654,102 @@ msgstr "ไม่มีการกำหนดคำสั่ง"
msgid "Cannot connect to ldap uri:"
msgstr ""
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "ฐานข้อมูล urpmi ถูกล็อก"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "คำเตือน"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "ฐานข้อมูล urpmi ถูกล็อก"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "แพ็คเกจต่อไปนี้มี signatures ที่ไม่ถูกต้อง"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "แพ็คเกจต่อไปนี้มี signatures ที่ไม่ถูกต้อง"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "คุณยังต้องการจะติดตั้งอีกต่อไปหรือไม่ ?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "การติดตั้งไม่สำเร็จ"
+
+#: ../urpm/main_loop.pm:133
+#, fuzzy, c-format
+msgid "distributing %s"
+msgstr "กำลังติดตั้ง %s\n"
+
+#: ../urpm/main_loop.pm:148
+#, fuzzy, c-format
+msgid "installing %s from %s"
+msgstr "กำลังติดตั้ง %s\n"
+
+#: ../urpm/main_loop.pm:150
+#, fuzzy, c-format
+msgid "installing %s"
+msgstr "กำลังติดตั้ง %s\n"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "ต้องการทดลองติดตั้งโดยที่ไม่ต้องตรอจสอบความเข้ากันได้? (y/N)"
+
+#: ../urpm/main_loop.pm:205
+#, fuzzy, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "ต้องการทดลองบังคับติดตั้ง (--force)? (y/N)"
+
+#: ../urpm/main_loop.pm:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "การติดตั้งไม่สำเร็จ"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "การติดตั้งสามารถทำได้"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -704,7 +797,7 @@ msgstr "กำลังเลี่ยงการทำงานของอุ
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "สร้าง hdlist synthesis file สำหรับ อุปกรณ์ \"%s\""
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "ไม่สามารถใช้งาน hdlist file \"%s\", medium ignored"
@@ -791,7 +884,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr ""
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "ทำการผ่านครั้งที่สองเพื่อทดสอบ ความเป็นอิสระ\n"
@@ -856,144 +949,149 @@ msgstr "ไม่สามารถเปิดแฟ้ม %s\n"
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "ไม่สามารถที่จะเข้าถึงอุปกรณ์เพื่อการติดตั้งตัวแรก (ไม่พบไฟล์ hdlists)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, fuzzy, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "กำลังเลี่ยงการทำงานของอุปกรณ์ \"%s\""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "พยายามที่จะเลือกใช้มีเดียหลายๆตัว: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "กำลังทำการย้ายออกอุปกรณ์\"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "กำลังเขียน list file สำหรับอุปกรณ์\"%s\""
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "บัันทึกการตั้งค่าเมนูแล้ว"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "คอนฟิกเซอเวอร์"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "อุปกรณ์ \"%s\" ไม่ได้ถูกเลือก"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "กำลังตรวจสอบไฟล์ hdlist [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "กำลังตรวจสอบไฟล์ synthesis [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "สร้าง hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, fuzzy, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "มีปัญหาในการอ่านไฟล์ synthesis สำหรับอุปกรณ์\"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "กำลังเขียน list file สำหรับอุปกรณ์\"%s\""
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, fuzzy, c-format
msgid "...copying failed"
msgstr "การคัดลอกสมบูรณ์"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "กำลังคัดลอกคำอธิบายไฟล์ของ \"%s\"..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "การคัดลอกสมบูรณ์"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "การทำสำเนา [%s] ไม่สำเร็จ"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, fuzzy, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "กำลังคัดลอกโค้ด hdlist (หรือ synthesis) ของ \"%s\"..."
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, fuzzy, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "การทำสำเนา [%s] ไม่สำเร็จ"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, fuzzy, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "การดึงโค้ดจาก hdlist (หรือ synthesis)ล้มเหลว"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, fuzzy, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "การอ่านข้อมูลล้มเหลว: %s"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "ไม่พบ rpm files จาก [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "กำลังอ่านไฟล์ rpm จาก [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "ไม่สามารถอ่านไฟล์ rpm จาก [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1001,74 +1099,74 @@ msgid ""
"medium."
msgstr ""
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ไม่พบ hdlist file สำหรับอุปกรณ์\"%s\""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "กำลังดึงโค้ด hdlist (หรือ synthesis) ของ \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, fuzzy, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "กำลังคัดลอกโค้ด hdlist (หรือ synthesis) ของ \"%s\"..."
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "ไม่พบ hdlist file สำหรับอุปกรณ์\"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, fuzzy, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "กำลังคัดลอกคำอธิบายไฟล์ของ \"%s\"..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, fuzzy, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "ไม่สามารถเขียน list file ของ\"%s\""
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, fuzzy, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "ไม่สามารถเขียน list file ของ\"%s\""
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "กำลังเขียน list file สำหรับอุปกรณ์\"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "อุปกรณ์ที่ถูกเพิ่มเข้ามา %s"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "ไม่สามารถ parse hdlist file of \"%s\""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "มีปัญหาในการอ่านไฟล์ synthesis สำหรับอุปกรณ์\"%s\""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "กำลังทำการอ่าน headers จากอุปกรณ์\"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nnม"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "Yyช"
@@ -1128,47 +1226,52 @@ msgstr "อุปกรณ์ที่ไม่เชื่อมกัน \"%s\
msgid "unable to access medium \"%s\""
msgstr "ไม่สามารถใช้อุปกรณ์\"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "ไม่มี package ที่ชื่อ %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "packages ต่อไปนี้มี %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "ไม่มี kdesu "
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, fuzzy, c-format
msgid "due to unsatisfied %s"
msgstr "ไม่มี kdesu "
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, fuzzy, c-format
msgid "trying to promote %s"
msgstr "ไม่มีอะไรที่ต้องลบทิ้ง\n"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, fuzzy, c-format
msgid "in order to keep %s"
msgstr "Window border theme"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "ไม่สามารถติดตั้งแพ็คเกจ %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "%s ขัดแย้งกับ %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, fuzzy, c-format
msgid "unrequested"
msgstr "Konquest"
@@ -1188,6 +1291,16 @@ msgstr ""
msgid "Missing signature (%s)"
msgstr "ข้อมูลบางตัวยังไม่ได้ใส่ลงไป"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "ไม่สามารถเขียน config file [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "ล็อกอินล้มเหลว"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1204,8 +1317,8 @@ msgstr ""
"\n"
"วิธีใช้:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - พิมพ์ข้อความช่วย\n"
@@ -1220,18 +1333,18 @@ msgstr " --auto - ทำการเลือกแพ็คเกจ
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - ตรวจสอบว่าการติดตั้งสามารถทำได้ถูกต้องหรือไม่.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr " --force - บังคับ invocation ถึงแม้ว่าแพ็คเกจจะไม่มีอยู่\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - distributed urpmi across machines of alias.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --list - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
@@ -1241,8 +1354,8 @@ msgstr " --list - แสดงรายชื่อแพ็คเก
msgid " --root - use another root for rpm removal.\n"
msgstr " --wget - ใช้ wget เพื่อดึงไฟล์ที่อยู่ภายนอก\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --wget - ใช้ wget เพื่อดึงไฟล์ที่อยู่ภายนอก\n"
@@ -1259,17 +1372,17 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " -h - พยายามค้นหาและใช้ไฟล์ synthesis หรือ hdlist\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " -h - พยายามค้นหาและใช้ไฟล์ synthesis หรือ hdlist\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " -v - โหมดคำ\n"
@@ -1279,60 +1392,60 @@ msgstr " -v - โหมดคำ\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - เลือกทั้งหมดที่ตรงกับคำสั่ง\n"
-#: ../urpme:76
+#: ../urpme:73
#, fuzzy, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "superuser เท่านั้นที่มีสิทธิติดตั้ง packages"
-#: ../urpme:107
+#: ../urpme:104
#, fuzzy, c-format
msgid "unknown packages"
msgstr "แพ็คเก็จ %d ชุด"
-#: ../urpme:107
+#: ../urpme:104
#, fuzzy, c-format
msgid "unknown package"
msgstr "เกิดการผิดพลาดแบบไม่ทราบสาเหตุ"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, fuzzy, c-format
msgid "removing package %s will break your system"
msgstr "แพ็คเกจ %s ที่กำลังลบอยู่จะทำให้ระบบเสียหายได้\n"
-#: ../urpme:121
+#: ../urpme:118
#, fuzzy, c-format
msgid "Nothing to remove"
msgstr "ไม่มีแท็กที่จะลบ!"
-#: ../urpme:126
+#: ../urpme:123
#, fuzzy, c-format
msgid "Checking to remove the following packages"
msgstr "หนึ่งใน Packages ต่อไปนี้ต้องได้รับการติดตั้ง "
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, 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] "เพื่อความถูกต้องของการเป็นอิสระระหว่างโปรแกรมแพ็คเกจบางตัวจะถูกลบทิ้ง(%d MB)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "กำลังติดตั้งแพ็คเก็จ %s"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (y/N) "
-#: ../urpme:160
+#: ../urpme:157
#, fuzzy, c-format
msgid "Removal failed"
msgstr "ล็อกอินล้มเหลว"
@@ -1358,12 +1471,12 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --help - พิมพ์ข้อความช่วย\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr " --env - ใช้เอ็นไวลอนเม็นท์แบบเฉพาะ(โดยทั่วไปใช้กับการรายงาน บัก).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, fuzzy, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr " --media - เลือกใช้เฉพาะมีเดียที่ถูกขั้นด้วยเครื่องหมายลูกน้ำ\n"
@@ -1374,12 +1487,12 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, fuzzy, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --update - ใช้เพื่ออัพเดตมีเดีย\n"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, fuzzy, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1390,7 +1503,7 @@ msgstr " --media - เลือกใช้เฉพาะมีเด
msgid " --use-distrib - use the given path to access media\n"
msgstr " --synthesis - use the synthesis given instead of urpmi db.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, fuzzy, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - use the synthesis given instead of urpmi db.\n"
@@ -1400,7 +1513,7 @@ msgstr " --synthesis - use the synthesis given instead of urpmi db.\n"
msgid " --uniq - do not print identical lines twice.\n"
msgstr " -P - ไม่จำเป็นต้องค้นในส่วนแพ็คเกจที่ไว้สำหรับค้นเท่านั้น\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - ใช้เพื่ออัพเดตมีเดีย\n"
@@ -1532,87 +1645,97 @@ msgstr " --help - พิมพ์ข้อความช่วย\n"
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr " --list - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
#: ../urpmf:73
#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr " --list - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes -พิมพ์ tag ไม่ใช้แล้ว:ใช้ไม่ได้ทั้งหมด(หลายบรรทัด)."
-#: ../urpmf:74
+#: ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr " --list - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, fuzzy, c-format
msgid " --provides - provides tags\n"
msgstr " --provides -พิมพ์ tag provides: all provides (หลายบรรทัด). "
-#: ../urpmf:76
+#: ../urpmf:77
#, fuzzy, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - พิมพ์ tag ที่ต้องการ:ที่ต้องการทั้งหมด(หลายบรรทัด)."
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --help - พิมพ์ข้อความช่วย\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, fuzzy, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --group - พิมพ์ tag group: group."
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes -พิมพ์ tag ไม่ใช้แล้ว:ใช้ไม่ได้ทั้งหมด(หลายบรรทัด)."
+
+#: ../urpmf:81
#, fuzzy, c-format
msgid " --summary - summary\n"
msgstr " --summary - พิมพ์ tag summary: summary"
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr " --help - พิมพ์ข้อความช่วย\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr " -v - โหมดคำ\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr " --list - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - เวอร์ชั่นที่พิมพ์, รีลีสและ arch พร้อมชื่อ.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1628,60 +1751,60 @@ msgstr ""
"\n"
"วิธีใช้:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
msgstr " --media - เลือกใช้เฉพาะมีเดียที่ถูกขั้นด้วยเครื่องหมายลูกน้ำ\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr " --auto-select - เลือกแพ็คเกจที่ต้องการอัพเกรดอัตโนมัติ\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr " --auto-select - เลือกแพ็คเกจที่ต้องการอัพเกรดอัตโนมัติ\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr ""
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr ""
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
"installation.\n"
msgstr ""
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr ""
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
" packages that lead to removals.\n"
msgstr ""
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1689,37 +1812,43 @@ msgid ""
" default is %d.\n"
msgstr ""
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr ""
-#: ../urpmi:104
+#: ../urpmi:100
#, fuzzy, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy - ค้นหาแบบไม่เจาะจง(เช่นเดียวกับ -y).\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, fuzzy, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src - แพ็คเกจต่อไปเป็นส่วนของโค้ด (เช่นเดียวกับ -s).\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
-#: ../urpmi:107
+#: ../urpmi:103
#, fuzzy, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --noclean - เก็บ rpm ซึ่งไม่ถูกใช้ใน cache.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, fuzzy, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - เก็บ rpm ซึ่งไม่ถูกใช้ใน cache.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1728,7 +1857,7 @@ msgstr ""
" --allow-nodeps - ยอมให้ผู้ใช้ติดตั้งแพ็คเกจโดยไม่ต้อง\n"
" ตรวจสอบ ความเป็นอิสระ\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1737,59 +1866,59 @@ msgstr ""
" --allow-force - ยอมให้ผู้ใช้สามารถติดตั้งแพ็คเกจโดยไม่จำเป็นต้อง\n"
" มีการตรวจสอบความเป็นอิสระและความถูกต้อง\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, fuzzy, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --wget - ใช้ wget เพื่อดึงไฟล์ที่อยู่ภายนอก\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
" to install a chroot with --root option.\n"
msgstr ""
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - ใช้ wget เพื่อดึงไฟล์ที่อยู่ภายนอก\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - ใช้ curl เพื่อดึงไฟล์ซึ่งอยู่ภายนอก\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, fuzzy, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --curl - ใช้ curl เพื่อดึงไฟล์ซึ่งอยู่ภายนอก\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr ""
-#: ../urpmi:129
+#: ../urpmi:126
#, fuzzy, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1798,7 +1927,7 @@ msgstr ""
" --verify-rpm - ตรวจสอบความถูกต้องของ rpm signature ก่อนการติดตั้ง\n"
" (--no-verify-rpm disable it, default is enabled)\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1807,7 +1936,7 @@ msgstr ""
" --proxy - ใช้ในการกำหนดพร็อกซี่ HTTP หมายเลขพอร์ทสมมุติเป็น\n"
" 1080(รูปแบบคือ <proxyhost[:port]>)\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1816,7 +1945,7 @@ msgstr ""
" --proxy-user - กำหนดชื่อผู้ใช้และรหัสผ่านเพื่อใช้พร็อกซี่\n"
" ในการตรวจสอบ (รูปแบบเป็น <user:password>)\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1825,7 +1954,7 @@ msgstr ""
" --bug - output a bug report in directory indicated by\n"
" next arg.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, fuzzy, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1834,110 +1963,115 @@ msgstr ""
" --verify-rpm - ตรวจสอบความถูกต้องของ rpm signature ก่อนการติดตั้ง\n"
" (--no-verify-rpm disable it, default is enabled)\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, fuzzy, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr " --test - ตรวจสอบว่าการติดตั้งสามารถทำได้ถูกต้องหรือไม่.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, fuzzy, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --media - เลือกใช้เฉพาะมีเดียที่ถูกขั้นด้วยเครื่องหมายลูกน้ำ\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr ""
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --help - พิมพ์ข้อความช่วย\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - พิมพ์ tag รายละเอียด : รายละเอียด"
-#: ../urpmi:147
+#: ../urpmi:144
#, fuzzy, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --test - ตรวจสอบว่าการติดตั้งสามารถทำได้ถูกต้องหรือไม่.\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --test - ตรวจสอบว่าการติดตั้งสามารถทำได้ถูกต้องหรือไม่.\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:150
+#: ../urpmi:148
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - เก็บ rpm ซึ่งไม่ถูกใช้ใน cache.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - เลือกทั้งหมดที่ตรงกับคำสั่งที่พิมพ์\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - ย้อมให้มีการค้นหาแพ็คเกจจากที่ป้อนให้\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - ไม่จำเป็นต้องค้นในส่วนแพ็คเกจที่ไว้สำหรับค้นเท่านั้น\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - โหมดเงียบ\n"
-#: ../urpmi:157
+#: ../urpmi:155
#, fuzzy, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr "ชื่อของไฟล์หรือของ rpm ที่ให้จากคำสั่งที่พิมพ์กำลังถูกค้นหา\n"
-#: ../urpmi:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi:243
+#: ../urpmi:241
#, fuzzy, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr "ชื่อกลุ่มนี้มีอยู่แล้ว กรุณาเลือกชื่ออื่น"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "ไม่สามารถสร้างไดเร็คตอรี่ [%s] สำหรับรายงานบัก"
@@ -1947,53 +2081,55 @@ msgstr "ไม่สามารถสร้างไดเร็คตอรี
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, c-format
msgid "%s: %s (to upgrade)"
msgstr ""
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, c-format
msgid "%s (to upgrade)"
msgstr ""
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "ออกจากการติดตั้ง"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "ออกจากการติดตั้ง"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "เพื่อความถูกต้องของการเป็นอิสระระหว่างโปรแกรมแพ็คเกจบางตัวจะถูกลบทิ้ง(%d MB)"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "ต้องการเลือกอะไรครับ (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2001,7 +2137,7 @@ msgid ""
"%s"
msgstr "ไม่สามารถ install บางเพกเกจได้"
-#: ../urpmi:483
+#: ../urpmi:500
#, fuzzy, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2009,33 +2145,33 @@ msgid ""
"%s"
msgstr "ไม่สามารถ install บางเพกเกจได้"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "คุณยังต้องการจะติดตั้งอีกต่อไปหรือไม่ ?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (Y/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
"%s"
msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
-#: ../urpmi:504
+#: ../urpmi:521
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s"
msgstr "ไม่สามารถ install บางเพกเกจได้"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2046,7 +2182,7 @@ msgstr ""
"%s\n"
"คุณยอมให้ทำการลบทิ้งหรือไม่?"
-#: ../urpmi:537
+#: ../urpmi:554
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2057,26 +2193,31 @@ msgstr ""
"%s\n"
"คุณยอมให้ทำการลบทิ้งหรือไม่?"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกลบ"
-#: ../urpmi:545
+#: ../urpmi:562
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
"%s"
msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกลบ"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2085,109 +2226,28 @@ msgstr ""
"คุณจะต้องเป็นรูทในการติดตั้ง ความเป็นอิสระ :\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
-#: ../urpmi:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "กรุณากด enter เมื่อพร้อม"
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "ยกเลิก"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "แพ็คเกจต่อไปนี้มี signatures ที่ไม่ถูกต้อง"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "แพ็คเกจต่อไปนี้มี signatures ที่ไม่ถูกต้อง"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "คุณยังต้องการจะติดตั้งอีกต่อไปหรือไม่ ?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "การติดตั้งไม่สำเร็จ"
-
-#: ../urpmi:711
-#, fuzzy, c-format
-msgid "distributing %s"
-msgstr "กำลังติดตั้ง %s\n"
-
-#: ../urpmi:726
-#, fuzzy, c-format
-msgid "installing %s from %s"
-msgstr "กำลังติดตั้ง %s\n"
-
-#: ../urpmi:728
-#, fuzzy, c-format
-msgid "installing %s"
-msgstr "กำลังติดตั้ง %s\n"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "ต้องการทดลองติดตั้งโดยที่ไม่ต้องตรอจสอบความเข้ากันได้? (y/N)"
-
-#: ../urpmi:776
-#, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "ต้องการทดลองบังคับติดตั้ง (--force)? (y/N)"
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "การติดตั้งไม่สำเร็จ"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "การติดตั้งสามารถทำได้"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, fuzzy, c-format
msgid "restarting urpmi"
msgstr "กำลังติดตั้ง $rpm\n"
@@ -2301,49 +2361,49 @@ msgstr " -v - โหมดคำ\n"
msgid "unable to update medium \"%s\"\n"
msgstr "ไม่สามารถแก้ไขอุปกรณ์\"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, fuzzy, c-format
msgid "Only superuser is allowed to add media"
msgstr "superuser เท่านั้นที่มีสิทธิติดตั้ง packages"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "เขียน config file[%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, fuzzy, c-format
msgid "Can't create config file [%s]"
msgstr "เขียน config file[%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "ไม่จำเป็นจะต้องให้ <relative path ของ hdlist>กับ -distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "ไม่พบ<ลู่ทางที่เกี่ยวข้องของhdlist>\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "ไม่สามารถสร้างอุปกรณ์ \"%s\"\n"
@@ -2502,17 +2562,17 @@ msgstr " -a - เลือกมีเดียทั้งหม
msgid " -y - fuzzy match on media names.\n"
msgstr " -a - เลือกทั้งหมดที่ตรงกับคำสั่งที่พิมพ์\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, fuzzy, c-format
msgid "Only superuser is allowed to remove media"
msgstr "superuser เท่านั้นที่มีสิทธิติดตั้ง packages"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "ไม่มีอะไรที่จะเอาออก(ใช้ urpmi.addmedia เพื่อเพิ่มอุปกรณ์)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2566,39 +2626,39 @@ msgstr " -a - เลือกมีเดียที่ไม่
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - บังคับการสร้างไฟล์ hdlist\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, fuzzy, c-format
msgid "Only superuser is allowed to update media"
msgstr "superuser เท่านั้นที่มีสิทธิติดตั้ง packages"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "ไม่มีการแก้ไข(use urpmi.addmedia เพื่อเพิ่มอุปกรณ์)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
"(one of %s)\n"
msgstr "ขาดข้อมูลที่จะนำไป update(หนึ่งใน %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "ignoring media %s"
msgstr "กำลังทำการย้ายออกอุปกรณ์\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "enabling media %s"
msgstr "กำลังทำการย้ายออกอุปกรณ์\"%s\""
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2614,142 +2674,142 @@ msgstr ""
"\n"
"วิธีใช้:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
"packages.\n"
msgstr " --media - เลือกใช้เฉพาะมีเดียที่ถูกขั้นด้วยเครื่องหมายลูกน้ำ\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - ค้นหาแบบไม่เจาะจง(เช่นเดียวกับ -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - แสดงรายชื่ออุปกรณ์ที่มีอยู่\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, fuzzy, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-media - แสดงรายชื่ออุปกรณ์ที่มีอยู่\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr " --list-node - แสดงรายชื่อnodesที่มีอยู่ขณะใช้--parallel \n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - แสดงรายชื่อ parallel aliases.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr " --src - แพ็คเกจต่อไปเป็นส่วนของโค้ด (เช่นเดียวกับ -s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr " --sources - ให้โค้ดของแพ็คเกจก่อนดาวน์โหลด (เฉพาะรูทเท่านั้น).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --help - พิมพ์ข้อความช่วย\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
" This permit to querying a distro.\n"
msgstr ""
-#: ../urpmq:84
+#: ../urpmq:81
#, fuzzy, c-format
msgid " --changelog - print changelog.\n"
msgstr " --help - พิมพ์ข้อความช่วย\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - พิมพ์ tag summary: summary"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - reverse search to what requires package.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, fuzzy, c-format
msgid ""
" --whatrequires-recursive\n"
" - extended reverse search (includes virtual packages).\n"
msgstr " -R - reverse search to what requires package.\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -p - ย้อมให้มีการค้นหาแพ็คเกจจากที่ป้อนให้\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, fuzzy, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -d - ขยายการค้นหาให้รวมถึงความเป็นอิสระของโปรแกรม\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - ขยายการค้นหาให้รวมถึงความเป็นอิสระของโปรแกรม\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - พิมพ์กลุ่มพร้อมชื่อ\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, fuzzy, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -g - พิมพ์กลุ่มพร้อมชื่อ\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, fuzzy, c-format
msgid " -l - list files in package.\n"
msgstr " --list - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - โหมดเงียบ\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - พิมพ์เวอร์ชั่นกับรีลีสพร้อมชื่อ\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - แพ็คเกจต่อไปเป็นแพ็คเกจโค้ด (เช่นเดียวกับ --src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2757,53 +2817,61 @@ msgid ""
msgstr ""
" -u - ทำการลบแพ็คเกจทิ้งถ้าเวอร์ชั่นล่าสุดได้รับการติดตั้งลงในเครื่องแล้ว\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - ใช้การค้นหาแบบไม่เจาะจง(เช่นเดียวกับการใช้ --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, fuzzy, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -a - เลือกทั้งหมดที่ตรงกับคำสั่งที่พิมพ์\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr "ชื่อของไฟล์หรือของ rpm ที่ให้จากคำสั่งที่พิมพ์กำลังถูกค้นหา\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes can only be used with --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:425
#, fuzzy, c-format
msgid "No changelog found\n"
msgstr "ไม่พบรุปภาพ"
#, fuzzy
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr "แพ็คเกจต่อไปนี้มี signatures ที่ไม่ถูกต้อง"
+
+#, fuzzy
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "คุณต้องมีอำนาจจึงจะสั่งใช้ร่วมแฟ้มต่างๆได้"
@@ -3034,9 +3102,5 @@ msgstr "ไม่พบรุปภาพ"
#~ msgstr "ต่อไป"
#, fuzzy
-#~ msgid "unable to write file [%s]"
-#~ msgstr "ไม่สามารถเขียน config file [%s]"
-
-#, fuzzy
#~ msgid "retrieving mirrors at %s ..."
#~ msgstr "กำลังอ่านข้อมูลจากไฟล์ hdlists"
diff --git a/po/tl.po b/po/tl.po
index c86c39ae..0a83d2da 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+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"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Previous-Translator: Arys P. Deloso <arys@deloso.org>\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, fuzzy, c-format
msgid "RPM installation"
msgstr "Pag-install ng RPM"
@@ -27,7 +27,7 @@ msgstr "Pag-install ng RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -96,7 +96,7 @@ msgstr "I-install"
msgid "_Save"
msgstr "Save"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Cancel"
@@ -118,17 +118,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Walang command na nabanggit"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, fuzzy, c-format
msgid "Please wait..."
msgstr "Pakihintay."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, fuzzy, c-format
msgid "Must be root"
msgstr "Kailangan na kayo ay root"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -138,42 +138,42 @@ msgstr ""
"Ilang package na hiniling ay hindi ma-install:\n"
"%s"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Babala"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Ayos"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr " (i-upgrade)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, fuzzy, c-format
msgid " (to install)"
msgstr " (i-install)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Isa sa mga sumusunod na package ay kailangan:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, fuzzy, c-format
msgid "_Abort"
msgstr "_Abort"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -184,7 +184,7 @@ msgstr ""
"%s\n"
"Magpatuloy?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
@@ -192,7 +192,7 @@ msgstr ""
"Para ma-satisfy ang dependency/pagkaka-asa-asa, ang mga sumusunod na %d "
"package ay ii-install (%d MB)"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -200,48 +200,49 @@ msgstr ""
"Para ma-satisfy ang dependency/pagkaka-asa-asa, ang mga sumusunod na %d "
"package ay ii-install (%d MB)"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Pag-i-install ng package..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "hindi makuha ang mga source package, hindi tumutuloy"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Naghahanda..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Ini-install ang package na `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Pakisuksok ang medium na may pangalang \"%s\" sa device na [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Dina-download ang package na `%s'..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Ang mga sumusunod na package ay may masamang signature:\n"
-"\n"
-"%s\n"
-"\n"
-"Gusto mong ituloy ang pag-i-install?"
+msgid "_Done"
+msgstr "Tapos"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -252,41 +253,27 @@ msgstr ""
"%s\n"
"Baka gusto mong i-update ang iyong urpmi database"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "inaalis ang %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Naghahanda..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Ini-install ang package na `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, fuzzy, c-format
-msgid "_Done"
-msgstr "Tapos"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Pag-i-install ay nabigo"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Lahat ay naka-install na"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Natapos na ang pag-install"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "inaalis ang %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -323,7 +310,7 @@ msgstr " -g - i-print ang mga grupo na may pangalan din.\n"
msgid " defaults to %s.\n"
msgstr " defaults ay %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Superuser lamang ang pinapayagang mag-install ng mga package"
@@ -333,98 +320,98 @@ msgstr "Superuser lamang ang pinapayagang mag-install ng mga package"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "hindi mabuksan ang rpmdb"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "inbalidong pangalan ng rpm file [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "kinukuha muli ang rpm file [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...pagkukuha muli natapos"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...pagkukuha muli nabigo: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "hindi ma-access ang rpm file [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "hindi ma-parse ang \"%s\" sa file [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "hindi mairehistro ang rpm file"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "error sa pagrerehistro ng mga local package"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "masamang pagdeklara ng proxy sa command line\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: hindi mabasa ang rpm file na \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "nakabuo ng hdlist synthesis file para sa medium na \"%s\""
@@ -615,7 +602,12 @@ msgstr "package na %s ay hindi nahanap."
msgid "malformed URL: [%s]"
msgstr "sirang anyo ng input: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "kinukuha muli ang mga rpm file mula sa medium na \"%s\"..."
@@ -625,7 +617,7 @@ msgstr "kinukuha muli ang mga rpm file mula sa medium na \"%s\"..."
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -633,37 +625,42 @@ msgstr ""
"gumawa ng transaksyon para sa pag-i-install sa %s (alisin=%d, i-install=%d, "
"i-upgrade=%d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "hindi magawa ang transaksyon"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "hindi maalis ang package na %s"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "idinadagdag ang package na %s (id=%d, eid=%d, update=%d, file=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "hindi ma-install ang package na %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "inaalis ang package na %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "inaalis ang package na %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "ini-install ang %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, fuzzy, c-format
msgid "More information on package %s"
msgstr "Mas maraming inpormasyon sa package..."
@@ -693,11 +690,103 @@ msgstr "Walang command na nabanggit"
msgid "Cannot connect to ldap uri:"
msgstr ""
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "urpmi database ay naka-lock"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Babala"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "urpmi database ay naka-lock"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "Ang mga sumusunod na package ay may masamang signature"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Ang mga sumusunod na package ay may masamang signature"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Gusto mong ituloy ang pag-i-install ?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Pag-i-install ay nabigo"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "dini-distribute ang %s"
+
+#: ../urpm/main_loop.pm:148
+#, fuzzy, c-format
+msgid "installing %s from %s"
+msgstr "ini-install ang %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "ini-install ang %s"
+
+#: ../urpm/main_loop.pm:187
+#, 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:205
+#, 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:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d transaksyong pag-i-install ay nabigo"
+msgstr[1] "%d transaksyong pag-i-install ay nabigo"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Pag-i-install ay maaari"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "Lahat ay naka-install na"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Lahat ay naka-install na"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "Lahat ay naka-install na"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Lahat ay naka-install na"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -748,7 +837,7 @@ msgstr "sinusubukang piliin ang di-mayroong medium na \"%s\""
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "nakabuo ng hdlist synthesis file para sa medium na \"%s\""
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "hindi ma-access ang hdlist file ng \"%s\", medium di-pinansin"
@@ -841,7 +930,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Hanapin ang mga naka-install na font"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "nagsasagawa ng pangalawang pagdaan para i-compute ang mga dependency\n"
@@ -906,67 +995,72 @@ msgstr "hindi mabuksan ang rpmdb"
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:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "sinusubukang piliin ang di-mayroong medium na \"%s\""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "pumipili ng maramihang media: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "inaalis ang medium na \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "kinukuha muli ang mga rpm file mula sa medium na \"%s\"..."
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "Configuration file"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "Pagsasaayos ng Server"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "medium na \"%s\" ay hindi nakapili"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "sinusuri ang hdlist file [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "sinusuri ang synthesis file [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "binubuo ang hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, fuzzy, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -975,77 +1069,77 @@ msgstr ""
"Hindi makabuo ng talaksang synthesis para sa medium na \"%s\". Maaaring sira "
"ang inyong talaksang hdlist."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problema sa pagbabasa ng hdlist o synthesis file ng medium na \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "isinusulat ang list file para sa medium na \"%s\""
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...pagkokopya nabigo"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kinokopya ang paglalarawan na file ng \"%s\"..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...pagkokopya natapos"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "pagkopya ng [%s] nabigo (file ay kahina-hinalang maliit)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "kino-compute ang md5sum ng nakopyang source hdlist (o synthesis)"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "pagkopya ng [%s] nabigo (md5sum di-tugma)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "kino-compute ang md5sum ng nakuhang source hdlist (o synthesis)"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...pagkukuha muli nabigo: md5sum di-tugma"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "walang nahanap na rpm file mula sa [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "binabasa ang mga rpm file mula sa [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "hindi mabasa ang mga rpm file mula sa [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, fuzzy, c-format
msgid "no rpms read"
msgstr "walang nabasang rpm"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1056,74 +1150,74 @@ msgstr ""
"ito ay mangyayari kung mano-mano mong in-mount ang directory noong ginagawa "
"ang medium."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, 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:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "kinukuha muli ang source hdlist (o synthesis) ng \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "nahanap ang sinuring hdlist (o synthesis) bilang %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "walang nahanap na hdlist file para sa medium na \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "sinusuri ang pubkey file ng \"%s\"..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, 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:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "hindi ma-import ang pubkey file ng \"%s\""
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "isinusulat ang list file para sa medium na \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "idinagdag ang medium na %s"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "hindi ma-parse ang hdlist file ng \"%s\""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problema sa pagbabasa ng synthesis file ng medium na \"%s\""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "binabasa ang mga header mula sa medium na \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "HhNn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "OoYy"
@@ -1183,47 +1277,52 @@ msgstr "incoherent na medium na \"%s\" may markang naaalis pero hindi naman"
msgid "unable to access medium \"%s\""
msgstr "hindi ma-access ang medium na \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Walang package na may pangalang %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Ang mga sumusunod na package ay naglalaman ng %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "dahil sa nawawalang %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Lahat ay naka-install na"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "dahil sa hindi na-satisfy na %s"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "sinusubukang i-promote ang %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "para maitago ang %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "para ma-install ang %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "dahil sa pagkakasalungat sa %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "hindi hiniling"
@@ -1243,6 +1342,16 @@ msgstr "Inbalidong Key ID (%s)"
msgid "Missing signature (%s)"
msgstr "Nawawalang signature (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "hindi maisulat ang config file [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Pagkokopya nabigo"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1260,8 +1369,8 @@ msgstr ""
"\n"
"paggamit:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1277,7 +1386,7 @@ msgstr ""
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - subukan kung makakamit ng tama ang pag-i-install.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
@@ -1285,14 +1394,14 @@ msgstr ""
" --force - pilitin ang imbokasyon kahit na wala ang ilang mga "
"package.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
" --parallel - distributed/nakapamahagi na urpmi sa mga makina ng "
"alias.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - i-print ang tag packager: taga-package.\n"
@@ -1303,8 +1412,8 @@ msgid " --root - use another root for rpm removal.\n"
msgstr ""
" --root - gumamit ng ibang root para sa pag-i-install ng rpm.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
@@ -1326,18 +1435,18 @@ msgstr ""
" tree, magagamit para sa mag-(un)install ng chroot na may\n"
" option na --root.\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr ""
" --probe-synthesis - subukang hanapin at gamitin ang synthesis file.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - subukang hanapin at gamitin ang hdlist file.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - masalita na paraan.\n"
@@ -1348,37 +1457,37 @@ msgid " -a - select all packages matching expression.\n"
msgstr ""
" -a - piliin lahat ng package na tumutugma sa expression.\n"
-#: ../urpme:76
+#: ../urpme:73
#, fuzzy, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Superuser lamang ang pinapayagang mag-install ng mga package"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "hindi kilalang mga package"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "hindi kilalang package"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "ang pag-aalis ng package na %s ay sisira ng sistema mo"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Walang maaalis"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Nagsusuri para alisin ang mga sumusunod na package"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1388,24 +1497,24 @@ msgstr[0] ""
msgstr[1] ""
"Para ma-satisfy ang dependency, ang sumusunod na package ay aalisin (%d MB)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "inaalis ang package na %s"
msgstr[1] "inaalis ang package na %s"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (o/H) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Pag-aalis nabigo"
@@ -1432,14 +1541,14 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --help - i-print itong tulong na mensahe.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - gumamit ng specific na environment o kapaligiran\n"
" (karaniwan ay isang ulat sa bug).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1451,14 +1560,14 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../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"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1473,7 +1582,7 @@ msgstr ""
" --synthesis - gamitin ang binigay na synthesis imbis na urpmi "
"database.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1485,7 +1594,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - huwag i-print ang mga magkatulad na linya.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - gamitin lang ang update media.\n"
@@ -1627,60 +1736,70 @@ msgstr " --group - i-print ang tag group: grupo.\n"
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr " --all - i-print lahat ng mga tag.\n"
#: ../urpmf:73
#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr " --all - i-print lahat ng mga tag.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - i-print ang tag obsoletes: lahat ng pinapalaos.\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr " --packager - i-print ang tag packager: taga-package.\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, fuzzy, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - i-print ang tag provides: lahat ng binibigay.\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, fuzzy, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - i-print ang tag requires: lahat ng kinakailangan.\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --size - i-print ang tag size: laki.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, fuzzy, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - i-print ang tag sourcerpm: source rpm.\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - i-print ang tag obsoletes: lahat ng pinapalaos.\n"
+
+#: ../urpmf:81
#, fuzzy, c-format
msgid " --summary - summary\n"
msgstr " --summary - i-print ang tag summary: kabuuan.\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr " --url - i-print ang tag url: url.\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr " --verbose - masalita na paraan.\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -l - ilista ang mga file sa package.\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
@@ -1688,17 +1807,17 @@ msgstr ""
"arkitektura\n"
" kasama ang pangalan.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "ginagamit ang specific environment sa %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1707,13 +1826,13 @@ msgstr ""
"Tandaan: dahil wala sa mga hinanapang media ay gumagamit ng mga hdlist, ang "
"urpmf ay hindi makapagbalik ng kahit anong resulta\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, fuzzy, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
"Maaari niyong gamitin ang --name upang maghanap ng pangalan ng mga pakete.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1730,7 +1849,7 @@ msgstr ""
"\n"
"paggamit:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1738,14 +1857,14 @@ msgstr ""
" --media - gamitin lang ang binigay na media, hiniwilay ng comma/"
"kuwit.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
@@ -1753,24 +1872,24 @@ msgstr ""
" --auto-select - piliin kaagad ang mga package para i-upgrade ang "
"sistema.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
" --auto-select - piliin kaagad ang mga package para i-upgrade ang "
"sistema.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, fuzzy, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - i-disable ang MD5SUM na pagsusuri ng file.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, fuzzy, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - pilitin ang pag-update ng gpg key.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1778,13 +1897,13 @@ msgid ""
msgstr ""
" --no-uninstall - huwag itanong kung alisin ang package, huwag magpatuloy.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, fuzzy, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr ""
" --install-src - i-install ang source package lamang (walang mga binary).\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1793,7 +1912,7 @@ msgstr ""
" --keep - ingatan ang mga package na mayroon na, tanggihan\n"
" ang mga hiniling na package kung magkakaroon ng aalisin.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1805,39 +1924,45 @@ msgstr ""
" na mga package ay ii-install o ia-upgrade,\n"
" default ay %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - haba ng maliit na transaksyon, default ay %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, fuzzy, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy - igiit ang fuzzy na paghahanap (pareho ng -y).\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, fuzzy, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr ""
" --src - ang kasunod na package ay source package (pareho ng -s).\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
" --install-src - i-install ang source package lamang (walang mga binary).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - alisin ang rpm sa cache bago pa ang kung ano.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, fuzzy, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - ingatan ang rpm na hindi ginagamit sa cache.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1847,7 +1972,7 @@ msgstr ""
"package\n"
" na hindi sinusuri ang mga dependency.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1857,13 +1982,13 @@ msgstr ""
"package\n"
" na hindi sinusuri ang mga dependency at integridad.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr ""
" --root - gumamit ng ibang root para sa pag-i-install ng rpm.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1874,50 +1999,50 @@ msgstr ""
" tree, magagamit para sa mag-install ng chroot na may\n"
" option na --root.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr ""
" --wget - gamitin ang wget para kunin ang mga malayong file.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr ""
" --curl - gamitin ang curl para kunin ang mga malayong file.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, fuzzy, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr ""
" --curl - gamitin ang curl para kunin ang mga malayong file.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - limitahan ang tulin ng pagda-download.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1928,7 +2053,7 @@ msgstr ""
" (--no-resume ay dini-disable ito, default ay naka-"
"disable).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1939,7 +2064,7 @@ msgstr ""
" ipinagpalagay na 1080 bilang default\n"
" (format ay <proxyhost[:port]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1949,7 +2074,7 @@ msgstr ""
"proxy\n"
" authentication (format ay <user:password>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1958,7 +2083,7 @@ msgstr ""
" --bug - maglabas ng ulat ng bug sa directory na binanggit ng\n"
" kasunod na argument.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, fuzzy, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1968,45 +2093,50 @@ msgstr ""
" (--no-verify-rpm ay idi-disable ito, default ay "
"gumagana).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, fuzzy, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr " --test - subukan kung makakamit ng tama ang pag-i-install.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - huwag isama ang path na hiniwalay ng comma/kuwit.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - huwag isama ang mga docs file.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, fuzzy, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --no-uninstall - huwag itanong kung alisin ang package, huwag magpatuloy.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --url - i-print ang tag url: url.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - i-print ang tag description: paglalarawan.\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, 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:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --test - subukan kung makakamit ng tama ang pag-i-install.\n"
+
+#: ../urpmi:146
#, fuzzy, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2016,64 +2146,64 @@ msgstr ""
"maraming\n"
" papagpilian kaysa sa default.\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - ingatan ang rpm na hindi ginagamit sa cache.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, 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:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - piliin lahat ng katugma sa command line.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
" -p - payagang maghanap sa provides para hanapin ang package.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
" -P - huwag maghanap sa provides para hanapin ang package.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - tahimik na paraan.\n"
-#: ../urpmi:157
+#: ../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:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, 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:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2082,7 +2212,7 @@ msgstr ""
"Directory na [%s] ay meron na, gumamit ng ibang directory para sa ulat ng "
"bug o alisin ito"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Hindi magawa ang directory na [%s] para sa ulat ng bug"
@@ -2092,7 +2222,7 @@ msgstr "Hindi magawa ang directory na [%s] para sa ulat ng bug"
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, fuzzy, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2101,34 +2231,36 @@ msgstr ""
"Error: mukhang ang %s ay nakalapat na read-only.\n"
"Gamitin ang --allow-force upang pilitin ang operasyon."
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (i-upgrade)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (i-upgrade)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (i-install)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (i-install)"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2136,12 +2268,12 @@ msgid ""
msgstr ""
"Para ma-satisfy ang dependency, ang sumusunod na package ay aalisin (%d MB)"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Ano ang pili mo? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2152,7 +2284,7 @@ msgstr ""
"pakete na mas-luma sa nakaluklok:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, fuzzy, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2163,19 +2295,19 @@ msgstr ""
"pakete na mas-luma sa nakaluklok:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Magpatuloy kahit paano?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (O/h) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2184,7 +2316,7 @@ msgstr ""
"Ilang package na hiniling ay hindi ma-install:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2193,7 +2325,7 @@ msgstr ""
"Ilang package na hiniling ay hindi ma-install:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2204,7 +2336,7 @@ msgstr ""
"package ay dapat alisin para ma-upgrade ang iba:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2215,7 +2347,7 @@ msgstr ""
"package ay dapat alisin para ma-upgrade ang iba:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2224,7 +2356,7 @@ msgstr ""
"Ang mga sumusunod na package ay dapat alisin para ma-upgrade ang iba:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2233,12 +2365,17 @@ msgstr ""
"Ang mga sumusunod na package ay dapat alisin para ma-upgrade ang iba:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2247,111 +2384,29 @@ msgstr ""
"Kailangan mong maging root para i-install ang mga sumusunod na dependency:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, 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:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Pindutin ang Enter kung handa na..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "I-cancel"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "Ang mga sumusunod na package ay may masamang signature"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Ang mga sumusunod na package ay may masamang signature"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Gusto mong ituloy ang pag-i-install ?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Pag-i-install ay nabigo"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "dini-distribute ang %s"
-
-#: ../urpmi:726
-#, fuzzy, c-format
-msgid "installing %s from %s"
-msgstr "ini-install ang %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "ini-install ang %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Subukan ang pag-i-install na hindi sinusuri ang mga dependency? (o/H) "
-
-#: ../urpmi:776
-#, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Subukan ang pag-i-install nang mas malakas (--force)? (o/H) "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d transaksyong pag-i-install ay nabigo"
-msgstr[1] "%d transaksyong pag-i-install ay nabigo"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Pag-i-install ay maaari"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Lahat ay naka-install na"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Lahat ay naka-install na"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "Lahat ay naka-install na"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "Lahat ay naka-install na"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "sinisimulan muli ang urpmi"
@@ -2484,50 +2539,50 @@ msgstr " -v - masalita na paraan.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "hindi ma-update ang medium na \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, fuzzy, c-format
msgid "Only superuser is allowed to add media"
msgstr "Superuser lamang ang pinapayagang mag-install ng mga package"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "isulat ang config file [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, fuzzy, c-format
msgid "Can't create config file [%s]"
msgstr "isulat ang config file [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr ""
"hindi kailangang ibigay ang <relative path ng hdlist> kasama ang --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<relative path ng hdlist> ay nawawala\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "hindi magawa ang medium na \"%s\"\n"
@@ -2690,17 +2745,17 @@ msgstr " -a - piliin lahat ng media.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -a - piliin lahat ng katugma sa command line.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, fuzzy, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Superuser lamang ang pinapayagang mag-install ng mga package"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "walang aalisin (gamitin ang urpmi.addmedia para magdagdag ng media)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2756,18 +2811,18 @@ msgstr ""
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - pilitin ang paggawa ng mga hdlist file.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, fuzzy, c-format
msgid "Only superuser is allowed to update media"
msgstr "Superuser lamang ang pinapayagang mag-install ng mga package"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
"walang ia-update (gamitin ang urpmi.addmedia para magdagdag ng media)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2776,22 +2831,22 @@ msgstr ""
"ang entry na ia-update ay nawawala\n"
"(isa sa mga %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "ignoring media %s"
msgstr "Ini-edit ang medium na \"%s\":"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "enabling media %s"
msgstr "inaalis ang medium na \"%s\""
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2808,7 +2863,7 @@ msgstr ""
"\n"
"paggamit:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2817,53 +2872,53 @@ msgstr ""
" --media - gamitin lang ang binigay na media, hiniwilay ng comma/"
"kuwit.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - igiit ang fuzzy na paghahanap (pareho ng -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - ilista ang mga available na package.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - ilista ang mga available na media.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr ""
" --list-url - ilista ang mga available na media at kanilang URL.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
" --list-nodes - ilista ang mga available node kung ginagamit ang --"
"parallel.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - ilista ang mga available na parallel alias.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
" --dump-config - i-dump ang config sa anyo na argument ng urpmi.addmedia.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr ""
" --src - ang kasunod na package ay source package (pareho ng -s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
@@ -2871,12 +2926,12 @@ msgstr ""
" --sources - ibigay lahat ng source package bago i-download (root "
"lang).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --url - i-print ang tag url: url.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2886,17 +2941,17 @@ msgstr ""
"distrib\n"
" tree. Ito ay magpapahintulot na tanungin ang distro.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - i-print ang changelog.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - i-print ang tag summary: kabuuan.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr ""
@@ -2904,7 +2959,7 @@ msgstr ""
"ng\n"
" package.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, fuzzy, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2914,7 +2969,7 @@ msgstr ""
"ng\n"
" package.\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
@@ -2922,52 +2977,52 @@ msgid ""
msgstr ""
" -p - payagang maghanap sa provides para hanapin ang package.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - kompletong output kasama ang package na aalisin.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - ipaabot ang tanong sa package dependencies.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - i-print ang mga grupo na may pangalan din.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - mag-print ng kapakipakinabang na inpormasyon sa anyong\n"
" nababasa ng tao.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - ilista ang mga file sa package.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - tahimik na paraan.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr ""
" -r - i-print ang version at release na may pangalan din.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - ang kasunod na package ay source package (pareho ng --"
"src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2976,46 +3031,46 @@ msgstr ""
" -u - alisin ang package kung may mas bagong version na\n"
" naka-install.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
" -y - igiit ang fuzzy na paghahanap (pareho ng --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, fuzzy, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -a - piliin lahat ng katugma sa command line.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
" ang mga pangalan o rpm file na binigay sa command line ay tatanungin.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes ay magagamit lang kasama ang --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"Tandaan: dahil wala sa mga hinanapang media ay gumagamit ng mga hdlist, ang "
"urpmf ay hindi makapagbalik ng kahit anong resulta\n"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -3023,12 +3078,25 @@ msgstr ""
"Tandaan: dahil wala sa mga hinanapang media ay gumagamit ng mga hdlist, ang "
"urpmf ay hindi makapagbalik ng kahit anong resulta\n"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Walang nahanap na changelog\n"
#, fuzzy
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Ang mga sumusunod na package ay may masamang signature:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Gusto mong ituloy ang pag-i-install?"
+
+#, fuzzy
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Kailangan mong maging root para magamit itong command ! \n"
@@ -3392,10 +3460,6 @@ msgstr "Walang nahanap na changelog\n"
#~ " ang mga hiniling na package kung magkakaroon ng "
#~ "aalisin.\n"
-#, fuzzy
-#~ msgid "unable to write file [%s]"
-#~ msgstr "hindi maisulat ang config file [%s]"
-
#~ msgid ""
#~ " --distrib-XXX - automatically create a medium for XXX part of a\n"
#~ " distribution, XXX may be main, contrib, updates or\n"
diff --git a/po/tr.po b/po/tr.po
index 92c7ad7c..9bf1a437 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-tr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2004-01-26 05:48+0200\n"
"Last-Translator: Ömer Fadıl USTA <omer_fad@hotmail.com>\n"
"Language-Team: Turkish <mandrakei18n@yahoogroups.com>\n"
@@ -27,7 +27,7 @@ msgstr ""
"X-Generator: KBabel 1.0.2\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, fuzzy, c-format
msgid "RPM installation"
msgstr "Sistem Kurulumu"
@@ -37,7 +37,7 @@ msgstr "Sistem Kurulumu"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Tamam"
@@ -87,7 +87,7 @@ msgstr "_Kur"
msgid "_Save"
msgstr "_Kaydet"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "İp_tal"
@@ -109,17 +109,17 @@ msgstr ""
msgid "No packages specified"
msgstr "Komut belirtmemişsiniz"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Lütfen bekleyiniz..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, fuzzy, c-format
msgid "Must be root"
msgstr "Fare Portu"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -127,42 +127,42 @@ msgid ""
"Continue installation anyway?"
msgstr "Bazı paketler kurulamadı"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Uyarı"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Tamam"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "Güncelle"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, fuzzy, c-format
msgid " (to install)"
msgstr "Kurulumdan Çık"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Aşağıdaki paketlerden birine ihtiyaç var:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "D_urdur"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -173,7 +173,7 @@ msgstr ""
"gerekiyor:\n"
"%s"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
@@ -181,7 +181,7 @@ msgstr ""
"Bağımlılık sorununu aşabilmek için, aşağıdaki paketlerin kaldırılması "
"gerekiyor (%d Mb)"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -189,47 +189,48 @@ msgstr ""
"Bağımlılık sorununu aşabilmek için, aşağıdaki paketlerin kaldırılması "
"gerekiyor (%d Mb)"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d paket, %d MB)"
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Paket kurulumu..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "kaynak paketleri alınamadı, çıkılıyor"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Hazırlanıyor..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "'%s' paketi kuruluyor ( %s/%s )..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Lütfen \"%s\" isimli ortamı [%s] aygıtına yerleştirin"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "'%s' paketi indiriliyor..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, fuzzy, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Aşağıdaki dosyalar yanlış imzalar içeriyorlar:\n"
-"\n"
-"%s\n"
-"\n"
-"Yüklemeye devam etmek istiyor musunuz?"
+msgid "_Done"
+msgstr "Bitti"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -240,41 +241,27 @@ msgstr ""
"%s\n"
"Urpmi veritabanınızı güncellemek isteyebilirsiniz"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "%s kaldırılıyor"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Hazırlanıyor..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "'%s' paketi kuruluyor ( %s/%s )..."
-
-#: ../gurpmi2:334
-#, fuzzy, c-format
-msgid "_Done"
-msgstr "Bitti"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Kurulum başarısız oldu"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "herşey zaten kurulu"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Kurulum tamamlandı"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "%s kaldırılıyor"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -312,7 +299,7 @@ msgstr ""
"\n"
" DrakBackup Raporu \n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Paketleri kurmak için sadece sistem yöneticisi yetkilidir"
@@ -322,98 +309,98 @@ msgstr "Paketleri kurmak için sadece sistem yöneticisi yetkilidir"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "rpmdb açılamıyor"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "rpm dosya ismi [%s] geçersiz"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "Rpm dosyası [%s] getiriliyor..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...ele alma tamamlandı"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...getirme başarısız: [%s]"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "rpm dosyasına [%s] erişilemiyor"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "\"%2$s\" dosyasındaki \"%1$s\" ayrıştırılamıyor"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "rpm dosyası kayıt edilemiyor"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "yerel paketlerin sicil kaydı yapılırken hata"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "komut satırından kötü vekil sunucu bildirimi\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: \"%s\" rpm dosyası okunamıyor\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "\"%s\" için sabit disk listesi sentezleme dosyası oluşturuldu."
@@ -600,7 +587,12 @@ msgstr "%s paketi bulunamadı."
msgid "malformed URL: [%s]"
msgstr "bozuk girdi: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "rpm dosyaları ortamdan alınıyor \"%s\"..."
@@ -610,43 +602,48 @@ msgstr "rpm dosyaları ortamdan alınıyor \"%s\"..."
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, fuzzy, c-format
msgid "unable to create transaction"
msgstr "Ssh kimliği oluşturulamıyor"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "paket kalırılamıyor: %s"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr ""
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "%s paketi yüklenemiyor"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "%s paketi kaldırılıyor"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "%s paketi kaldırılıyor"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "%s kuruluyor"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, fuzzy, c-format
msgid "More information on package %s"
msgstr "Paket hakkında daha fazla bilgi..."
@@ -676,11 +673,102 @@ msgstr "Komut belirtmemişsiniz"
msgid "Cannot connect to ldap uri:"
msgstr ""
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "urpmi veri tabanı kilitlendi"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Uyarı"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "urpmi veri tabanı kilitlendi"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "Sonraki paketler hatalı imza içeriyor"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Sonraki paketler hatalı imza içeriyor"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Yüklemeye devam etmek istiyor musunuz ?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Kurulum başarısız oldu"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "%s dağıtılıyor"
+
+#: ../urpm/main_loop.pm:148
+#, fuzzy, c-format
+msgid "installing %s from %s"
+msgstr "%s kuruluyor"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "%s kuruluyor"
+
+#: ../urpm/main_loop.pm:187
+#, 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:205
+#, fuzzy, 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:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "kurulum yönergeleri"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Kurulum Başarılı"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "herşey zaten kurulu"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "herşey zaten kurulu"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "herşey zaten kurulu"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "herşey zaten kurulu"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -729,7 +817,7 @@ msgstr "varolan \"%s\" ortamı atlanmaya çalışılırken engelleniyor"
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "\"%s\" için sabit disk listesi sentezleme dosyası oluşturuldu."
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "\"%s\" ortamının hdlist dosyasına erişilemiyor, yoksayıldı"
@@ -817,7 +905,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Yüklü yazıtiplerini ara"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "bağımlılıkların hesaplanması için ikinci geçiş yapılıyor\n"
@@ -882,144 +970,149 @@ msgstr "rpmdb açılamıyor"
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "İlk kurulum ortamına erişilemiyor ( hdlists dosyası bulunamadı)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, fuzzy, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "varolan \"%s\" ortamı atlanmaya çalışılırken engelleniyor"
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "Çoklu medya seçiliyor: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "aygıt kaldırılıyor \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "rpm dosyaları ortamdan alınıyor \"%s\"..."
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "Yapılandırma dosyası"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "Sunucu Ayarları"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "\"%s\" seçilmedi"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "sabit disk listesi(hdlist) dosyası [%s] okunuyor"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "sentez dosyası [%s] inceleniyor"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "sabit disk listesi [%s] oluşturuluyor"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, fuzzy, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "\"%s\" için sabit disk listesi sentezleme dosyasının okunmasında hata"
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "\"%s\" için listesi dosyası yazılıyor"
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...kopyalama başarısız"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "\"%s\"in açıklama dosyası kopyalanıyor..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...kopyalama tamamlandı"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "[%s] kopyalaması başarısız"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, fuzzy, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "\"%s\" in kaynak hdlisti (ya da sentezi) kopyalanıyor..."
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, fuzzy, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "[%s] kopyalaması başarısız"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, fuzzy, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "kaynak sabit disk listesi (ya da sentez) dosyası alımı başarısız oldu"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, fuzzy, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...getirme başarısız: [%s]"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "[%s] de rpm dosyaları yok"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "rpm dosyaları [%s]'den okunuyor"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "[%s]'den rpm dosyaları okunamadı: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1027,74 +1120,74 @@ msgid ""
"medium."
msgstr ""
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "\"%s\" için sabit disk listesi dosyası bulunamadı"
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "\"%s\" in kaynak hdlisti (ya da sentezi) getiriliyor..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "incelenmiş hdlist (yada sentez) %s olarak bulundu"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "\"%s\" için sabit disk listesi dosyası bulunamadı"
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, fuzzy, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "'%s' medyasının dosyayı sınanıyor..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, fuzzy, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "\"%s\" liste dosyası yazılamıyor"
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, fuzzy, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "\"%s\" liste dosyası yazılamıyor"
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "\"%s\" için listesi dosyası yazılıyor"
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "%s ortamı eklendi"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "\"%s\" sabit disk listesi dosyası ayrıştırılamıyor"
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "\"%s\" için sabit disk listesi sentezleme dosyasının okunmasında hata"
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "\"%s\" ortamından başlıklar okunuyor"
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "HhNn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "EeYy"
@@ -1155,47 +1248,52 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "\"%s\" ortamına erişilemiyor"
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, fuzzy, c-format
msgid "No package named %s"
msgstr "%s adında bir paket yok"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Bu paketler %s içeriyor: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "%s paketinin kayıplığından"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "herşey zaten kurulu"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "%s' den dolayı yetersiz"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, fuzzy, c-format
msgid "trying to promote %s"
msgstr "Kaldırılacak bir şey yok"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, fuzzy, c-format
msgid "in order to keep %s"
msgstr "sıradaki kurulum %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "sıradaki kurulum %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "%s paketi ile çelişkisinden"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "talep edilmemiş"
@@ -1215,6 +1313,16 @@ msgstr "Geçersiz Anahtar ID'si (%s)"
msgid "Missing signature (%s)"
msgstr "Geçersiz imza (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "yapılandırma dosyasına [%s] yazılamıyor"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Kopyalama başarısız"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1232,8 +1340,8 @@ msgstr ""
"\n"
"kullanımı:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1248,7 +1356,7 @@ msgstr " --auto - Otomatik seçenekler arasından paketleri seç.\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - kurulumun başarılı olup olmayacağını doğrula.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
@@ -1256,12 +1364,12 @@ msgstr ""
" --force - bazı paketlerin bulunamama durumda bile işlemin\n"
" devamına zorla.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - dağıtık urpmi (accross machines of alias).\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --group - grup etiketini yaz: grup.\n"
@@ -1271,8 +1379,8 @@ msgstr " --group - grup etiketini yaz: grup.\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --wget - uzaktaki dosyaları almak için wget kullan.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --wget - uzaktaki dosyaları almak için wget kullan.\n"
@@ -1289,18 +1397,18 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr ""
" --synthesis - urpmi veri tabanı yerine belirtilen sentezi kullan.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr ""
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - kalabalık kipi.\n"
@@ -1310,37 +1418,37 @@ msgstr " --verbose - kalabalık kipi.\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - ifadeye uyan tüm paketleri seçer. \n"
-#: ../urpme:76
+#: ../urpme:73
#, fuzzy, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Paketleri kurmak için sadece sistem yöneticisi yetkilidir"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "bilinmeyen paketler "
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "bilinmeyen paket"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "%s paketinin kaldırılması sisteminizi göçertir"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Kaldırılacak bir şey yok"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Kaldırılmak için sıradaki paketler sınanıyor"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1349,23 +1457,23 @@ msgstr[0] ""
"Bağımlılık sorununu aşabilmek için, aşağıdaki paketlerin kaldırılması "
"gerekiyor (%d Mb)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "%s paketi kaldırılıyor"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " ( y, e / H , N ) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Kaldırma başarısız"
@@ -1392,13 +1500,13 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --help - bu yardım mesajını görüntüler.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../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"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, fuzzy, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1410,13 +1518,13 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../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"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, fuzzy, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1429,7 +1537,7 @@ msgid " --use-distrib - use the given path to access media\n"
msgstr ""
" --synthesis - urpmi veri tabanı yerine belirtilen sentezi kullan.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1440,7 +1548,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --size - boyut etiketini yaz: boyut.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - sadece güncelleme ortamını kullan.\n"
@@ -1578,87 +1686,97 @@ msgstr " --group - grup etiketini yaz: grup.\n"
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr " --all - tüm etiketler yazır.\n"
#: ../urpmf:73
#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr " --all - tüm etiketler yazır.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --size - boyut etiketini yaz: boyut.\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr " --group - grup etiketini yaz: grup.\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, fuzzy, c-format
msgid " --provides - provides tags\n"
msgstr " --size - boyut etiketini yaz: boyut.\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, fuzzy, c-format
msgid " --requires - requires tags\n"
msgstr " --size - boyut etiketini yaz: boyut.\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --size - boyut etiketini yaz: boyut.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, fuzzy, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --group - grup etiketini yaz: grup.\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --size - boyut etiketini yaz: boyut.\n"
+
+#: ../urpmf:81
#, fuzzy, c-format
msgid " --summary - summary\n"
msgstr " --summary - özet etiketini yaz: özet..\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr " --all - tüm etiketler yazır.\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr " --verbose - kalabalık kipi.\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr " --list - tüm paketleri göster\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - isminin yanında sürüm ve kurnazlığını yazar.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "%s' de belirtilen ortam kullanılıyor\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1675,62 +1793,62 @@ msgstr ""
"\n"
"kullanımı:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
" --media - sadece belirtilen ortamları kullan (virgülle ayırın).\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr " --auto-select - Sistemi güncellemek için paketleri otomatik seç.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr " --auto-select - Sistemi güncellemek için paketleri otomatik seç.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr ""
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr ""
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
"installation.\n"
msgstr ""
-#: ../urpmi:97
+#: ../urpmi:93
#, fuzzy, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr ""
" --install-src - sadece kaynak kodu paketlerini kur (binaryleri değil).\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
" packages that lead to removals.\n"
msgstr ""
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1738,39 +1856,45 @@ msgid ""
" default is %d.\n"
msgstr ""
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr ""
-#: ../urpmi:104
+#: ../urpmi:100
#, fuzzy, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy - hatalı aramaya zorla (-y ile aynı)\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, fuzzy, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr ""
" --src - ardından gelen paket bir kaynak paketi ( -s ile aynı).\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
" --install-src - sadece kaynak kodu paketlerini kur (binaryleri değil).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - herhangi birşeyden önce rpm'yi önbellekten sil.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, fuzzy, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - rpm'yi ön bellekte kullanılmadan sakla\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1779,7 +1903,7 @@ msgstr ""
" --allow-nodeps - kullanıcıya bağımlılıkları sormadan kuruluma\n"
" izin verir.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1788,59 +1912,59 @@ msgstr ""
" --allow-force - kullanıcıya bağımlılıkları ve diğer olumsuzlukları\n"
" sormadan kuruluma izin verir.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, fuzzy, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --wget - uzaktaki dosyaları almak için wget kullan.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
" to install a chroot with --root option.\n"
msgstr ""
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - uzaktaki dosyaları almak için wget kullan.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - uzak dosyaları almak için curl kullan.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, fuzzy, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --curl - uzak dosyaları almak için curl kullan.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - indirme hızını kısıtlama.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, fuzzy, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1849,7 +1973,7 @@ msgstr ""
" --verify-rpm - kurulumdan önce rpm imzasını doğrula\n"
" (--no-verify-rpm bunu iptal eder, öntanımlı etkindir).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1859,7 +1983,7 @@ msgstr ""
" varsayılan olan 1080 kabul edilecek (biçim <vekilsunucu[:"
"port]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1868,7 +1992,7 @@ msgstr ""
" --proxy-user - vekil sunucu kimlik denetimi için kullanıcı adı\n"
" ve parola belirtin (biçim <kullanıcıadı:parola>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1877,7 +2001,7 @@ msgstr ""
" --bug - sonraki argüman tarafından belirtilen dizini bir\n"
" hata raporu oluştur.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, fuzzy, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1886,114 +2010,119 @@ msgstr ""
" --verify-rpm - kurulumdan önce rpm imzasını doğrula\n"
" (--no-verify-rpm bunu iptal eder, öntanımlı etkindir).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, fuzzy, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr " --test - kurulumun başarılı olup olmayacağını doğrula.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - virgül ile ayrılmış yolları dahil etme.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr ""
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --all - tüm etiketler yazır.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - açıklama etiketini yaz: açıklama.\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, fuzzy, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --test - kurulumun başarılı olup olmayacağını doğrula.\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --test - kurulumun başarılı olup olmayacağını doğrula.\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:150
+#: ../urpmi:148
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - rpm'yi ön bellekte kullanılmadan sakla\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, 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:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - paketi bulmak için aramaya izin ver.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
" -P - sağlanan paketlerin arasında paketi bulmak için arama "
"yapma.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - Sessiz kipi.\n"
-#: ../urpmi:157
+#: ../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"
-#: ../urpmi:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
"--install-src özelliği binary rpm dosyaları kullanılırken neyi halleder"
-#: ../urpmi:243
+#: ../urpmi:241
#, fuzzy, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr "Grup zaten mevut, lütfen bir başka Grup ismi seçin"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "%s dizini hata raporu için oluşturulamıyor"
@@ -2003,41 +2132,43 @@ msgstr "%s dizini hata raporu için oluşturulamıyor"
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "Güncelle"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "Güncelle"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "Kurulumdan Çık"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "Kurulumdan Çık"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2046,12 +2177,12 @@ msgstr ""
"Bağımlılık sorununu aşabilmek için, aşağıdaki paketlerin kaldırılması "
"gerekiyor (%d Mb)"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Seçiminiz? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2059,7 +2190,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2067,33 +2198,33 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Yine de devam edilsin mi?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (E/h) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
"%s"
msgstr "Bazı paketler kurulamadı"
-#: ../urpmi:504
+#: ../urpmi:521
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s"
msgstr "Bazı paketler kurulamadı"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2104,7 +2235,7 @@ msgstr ""
"için aşağıdaki paketlerin kaldırılması gerekiyor:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2115,7 +2246,7 @@ msgstr ""
"için aşağıdaki paketlerin kaldırılması gerekiyor:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2125,7 +2256,7 @@ msgstr ""
"gerekiyor:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2135,12 +2266,17 @@ msgstr ""
"gerekiyor:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2149,109 +2285,28 @@ msgstr ""
"Aşağıdaki bağımlılıkların yüklenebilmesi için root olmalısınız:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
-#: ../urpmi:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Hazır olduğunuzda Enter'a basın..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "İptal"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "Sonraki paketler hatalı imza içeriyor"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Sonraki paketler hatalı imza içeriyor"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Yüklemeye devam etmek istiyor musunuz ?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Kurulum başarısız oldu"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "%s dağıtılıyor"
-
-#: ../urpmi:726
-#, fuzzy, c-format
-msgid "installing %s from %s"
-msgstr "%s kuruluyor"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "%s kuruluyor"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Paket bağımlılıklarını denetlemeksizin kurulum denensin mi (e/H) "
-
-#: ../urpmi:776
-#, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Belki daha zorlayıcı bir seçenek gerekebilir (--force)? (e/H) "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "kurulum yönergeleri"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Kurulum Başarılı"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "herşey zaten kurulu"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "herşey zaten kurulu"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "herşey zaten kurulu"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "herşey zaten kurulu"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, fuzzy, c-format
msgid "restarting urpmi"
msgstr "slurpd başlatılıyor: "
@@ -2380,49 +2435,49 @@ msgstr " -v - kalabalık kipi.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "\"%s\" güncellenemiyor\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, fuzzy, c-format
msgid "Only superuser is allowed to add media"
msgstr "Paketleri kurmak için sadece sistem yöneticisi yetkilidir"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "yapılandırma dosyası [%s] yazılıyor"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, fuzzy, c-format
msgid "Can't create config file [%s]"
msgstr "yapılandırma dosyası [%s] yazılıyor"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "<hdlist'in göreceli konumu> --distrib ile gerekli değil "
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<hdlist'in göreli dosyaismi> eksik\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "\"%s\" oluşturulamıyor\n"
@@ -2582,19 +2637,19 @@ msgstr " -a - tüm ortamları seçer.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -a - komut satırındakilere uyanların tümünü seçer. \n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, fuzzy, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Paketleri kurmak için sadece sistem yöneticisi yetkilidir"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr ""
"Kaldırılacak bir şey yok\n"
"(yeni bir ortam eklemek için \"urpmi.addmedia\" kullanın)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2648,19 +2703,19 @@ msgstr " -a - tüm kaldırılamaz medyaları seçer.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - hdlist dosyalarını oluşum için zorla.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, fuzzy, c-format
msgid "Only superuser is allowed to update media"
msgstr "Paketleri kurmak için sadece sistem yöneticisi yetkilidir"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
"Güncellenecek hiç birşey yok\n"
"(yeni ortam eklemek için \"urpmi.addmedia\" kullanın)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2669,22 +2724,22 @@ msgstr ""
"Güncelleme için girdi eksik\n"
"(bunlardan biri %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "ignoring media %s"
msgstr "\"%s\" meydası düzenleniyor:"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, fuzzy, c-format
msgid "enabling media %s"
msgstr "aygıt kaldırılıyor \"%s\""
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2701,7 +2756,7 @@ msgstr ""
"\n"
"kullanımı:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2709,50 +2764,50 @@ msgid ""
msgstr ""
" --media - sadece belirtilen ortamları kullan (virgülle ayırın).\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - hatalı aramaya zorla (-y ile aynı)\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - tüm paketleri göster\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - mevcut medyaları göster\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, fuzzy, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-media - mevcut medyaları göster\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
" --list-nodes - --parallel kullanırken erişilebilir düğümleri listele.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - mevcut parelel alias'lari listele.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
-#: ../urpmq:65
+#: ../urpmq:62
#, 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"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
@@ -2760,143 +2815,156 @@ msgstr ""
" --sources - İndirmeye başlamadan önce tüm kaynak paketleri yolla.\n"
" (Sadece root için geçerlidir).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --all - tüm etiketler yazır.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
" This permit to querying a distro.\n"
msgstr ""
-#: ../urpmq:84
+#: ../urpmq:81
#, fuzzy, c-format
msgid " --changelog - print changelog.\n"
msgstr " --all - tüm etiketler yazır.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - özet etiketini yaz: özet..\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - gerekli paketler için ters arama.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, fuzzy, c-format
msgid ""
" --whatrequires-recursive\n"
" - extended reverse search (includes virtual packages).\n"
msgstr " -R - gerekli paketler için ters arama.\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -p - paketi bulmak için aramaya izin ver.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - kaldırılacak paketlerin toplu çıktısı.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - paket bağımlılıkları için sorguyu genişlet.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - isminin yanında grupları da yazar.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, fuzzy, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -g - isminin yanında grupları da yazar.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, fuzzy, c-format
msgid " -l - list files in package.\n"
msgstr " --list - tüm paketleri göster\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - Sessiz kipi.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - isminin yanıda sürüm numarasını da yazar.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - bir sonraki paket bir kaynak paketi(--src ile aynı).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
msgstr " -u - daha güncel bir sürümü yüklü ise paketi kaldır.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - hatalı aramayı uygulamaya koy ( --fuzzy ile aynı)\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, fuzzy, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -a - komut satırındakilere uyanların tümünü seçer. \n"
-#: ../urpmq:105
+#: ../urpmq:102
#, 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"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes sadece --parallel ile kullanılabilir"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:425
#, fuzzy, c-format
msgid "No changelog found\n"
msgstr "Görüntü (imaj) bulunamadı!"
#, fuzzy
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Aşağıdaki dosyalar yanlış imzalar içeriyorlar:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Yüklemeye devam etmek istiyor musunuz?"
+
+#, fuzzy
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Bu komutu çalıştırmak için \"root\" yetkisine sahip olmalısınız !\n"
@@ -3153,10 +3221,6 @@ msgstr "Görüntü (imaj) bulunamadı!"
#~ "Continue?"
#~ msgstr "Devam"
-#, fuzzy
-#~ msgid "unable to write file [%s]"
-#~ msgstr "yapılandırma dosyasına [%s] yazılamıyor"
-
#~ msgid ""
#~ " --distrib-XXX - automatically create a medium for XXX part of a\n"
#~ " distribution, XXX may be main, contrib, updates or\n"
diff --git a/po/uk.po b/po/uk.po
index 6aa5f7fa..aeeee25e 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-uk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2006-01-25 11:16+0200\n"
"Last-Translator: Taras Boychuk <btr1@mail.ru>\n"
"Language-Team: ukrainian <translation@linux.org.ua>\n"
@@ -21,7 +21,7 @@ msgstr ""
"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:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "Встановлення RPM"
@@ -31,7 +31,7 @@ msgstr "Встановлення RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Помилка: неможливо знайти файл %s, дію припинено"
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_O Гаразд"
@@ -97,7 +97,7 @@ msgstr "_Встановити"
msgid "_Save"
msgstr "З_берегти"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_C Скасувати"
@@ -117,17 +117,17 @@ msgstr "Невідомий параметр %s"
msgid "No packages specified"
msgstr "Не вибрано пакунків"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Будь ласка, зачекайте..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "Потрібно бути root"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -138,42 +138,42 @@ msgstr ""
"%s\n"
"Продовжувати встановлення?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Попередження"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Гаразд"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (поновити)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (встановити)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "Вибір пакунків"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Потрібен один із наступних пакунків:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Перервати"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -184,19 +184,19 @@ msgstr ""
"%s\n"
"Продовжувати встановлення?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Наступні пакунки буде встановлено для задоволення залежностей (%d Мб)"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Наступні пакунки буде встановлено для задоволення залежностей (%d Мб)"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
@@ -204,40 +204,42 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Встановлюється пакунок..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "неможливо одержати початкові пакунки, завершується"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Підготовка..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Встановлюється пакунок `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Вставте, будь ласка, носія %s у пристрій %s"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Звантажується пакунок %s"
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Наступні пакунки мають неправильні підписи:\n"
-"%s\n"
-"\n"
-"Ви хочете продовжити встановлення?"
+msgid "_Done"
+msgstr "Виконано"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -248,41 +250,27 @@ msgstr ""
"%s\n"
"Можливо, Вам потрібно поновити вашу базу даних urpmi"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "вилучається %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Підготовка..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Встановлюється пакунок `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "Виконано"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Встановлення неуспішне"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Все вже встановлено"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Встановлення завершено"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "вилучається %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -317,7 +305,7 @@ msgstr " -g - також виводити групи з назва
msgid " defaults to %s.\n"
msgstr " типово %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Тільки користувачу root дозволяється встановлювати пакунки"
@@ -327,98 +315,98 @@ msgstr "Тільки користувачу root дозволяється вст
msgid "Running urpmi in restricted mode..."
msgstr "Запускається urpmi в обмеженому режимі..."
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "неможливо відкрити rpmdb"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "неправильна назва rpm-файла [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "відновлення rpm-файла [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...відновлення завершено"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...відновлення невдале: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "немає доступу до rpm-файла [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "неможливо проаналізувати файл %s [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "неможливо зареєструвати rpm-файл"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "помилка реєстрації пакунків"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Цю дію заборонено до виконання в обмеженому режимі"
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "неправильне оголошення проксі в командному рядку\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: неможливо прочитати rpm-файл \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "побудовано hdlist synthesis файл для носія \"%s\""
@@ -607,7 +595,12 @@ msgstr "пакунку %s не знайдено."
msgid "malformed URL: [%s]"
msgstr "неправильно сформована адреса: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "відновлення rpm-файлів з носія \"%s\"..."
@@ -617,7 +610,7 @@ msgstr "відновлення rpm-файлів з носія \"%s\"..."
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -625,37 +618,42 @@ msgstr ""
"створено транзакцію для встановлення на %s (вилучити=%d, встановити=%d, "
"поновити=%d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "неможливо створити транзакцію"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "неможливо видалити rpm з delta-rpm-пакунка %s"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "додається пакунок %s (id=%d, eid=%d, update=%d, file=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "неможливо встановити пакунок %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "вилучається пакунок %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "вилучається пакунок %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "встановлюється %s з %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Додаткова інформація про пакунок %s"
@@ -685,11 +683,104 @@ msgstr "Не вибрано пакунків"
msgid "Cannot connect to ldap uri:"
msgstr ""
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "базу даних urpmi блоковано "
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Попередження"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "базу даних urpmi блоковано "
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "Наступні пакунки мають неправильні підписи"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Наступні пакунки мають неправильні підписи"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Ви хочете продовжувати встановлення?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Встановлення неуспішне"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "встановлюється %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "встановлюється %s з %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "встановлюється %s"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Спробувати встановлення без перевірки залежностей? (y/N) (т/Н) "
+
+#: ../urpm/main_loop.pm:205
+#, fuzzy, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "Спробувати примусове встановлення (--force)? (y/N) (т/Н) "
+
+#: ../urpm/main_loop.pm:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d запит на встановлення завершився неуспішно"
+msgstr[1] "%d запит на встановлення завершився неуспішно"
+msgstr[2] "%d запит на встановлення завершився неуспішно"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Встановлення можливе"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "Все вже встановлено"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Все вже встановлено"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "Все вже встановлено"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Все вже встановлено"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -741,7 +832,7 @@ msgstr "спроба вибрати неіснуючого носія \"%s\""
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "побудовано hdlist synthesis файл для носія \"%s\""
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "неможливо доступитися до файла hdlist \"%s\", носія проігноровано"
@@ -836,7 +927,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Початок пошуку: %s, кінець: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "здійснюється другий прохід обрахунку залежностей\n"
@@ -901,68 +992,73 @@ msgstr "неможливо відкрити rpmdb"
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "немає доступу до першого носія встановлення (немає файла hdlists)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "спроба вибрати неіснуючого носія \"%s\""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "вибір багатьох носіїв: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "видаляється носій \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "переконфігурація urpmi з носія \"%s\""
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...переконфігурація невдала"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "переконфігурацію виконано"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Помилка при створенні файла назв: залежність %d не знайдено"
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
"Помилка при створенні файла назв: Неможливо здійснити запис у файл (%s)"
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "носія \"%s\" не вибрано"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "перевіряється файл hdlist [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "перевіряється файл synthesis [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "створюється hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -971,80 +1067,80 @@ msgstr ""
"Неможливо згенерувати файл synthesis для носія \"%s\". Можливо, файл hdlist "
"пошкоджено."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "проблема читання файла hdlist або synthesis для носія \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "записується файл списку для носія \"%s\""
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...копіювання невдале"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "копіюється файл опису \"%s\"..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...копіювання завершено"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "копіювання [%s] завершилось невдало (файл є підозріло малим)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr ""
"розраховується md5sum для hdlist (або synthesis) для джерела, з якого йде "
"копіювання"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "копіювання [%s] невдале (не співпадає md5sum)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr ""
"розраховується md5sum для hdlist (або synthesis) джерела, що поновлюється"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...відновлення невдале: неправильна md5sum"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "не знайдено rpm-файла для [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "читаються rpm-файли з [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "неможливо прочитати rpm-файли для [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "rpms не прочитано"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1054,74 +1150,74 @@ msgstr ""
"неможливо отримати доступ до носія \"%s\",\n"
"це може статися, якщо Ви змонтували теку вручну під час створення носія."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "немає файла hdlist для носія \"%s\""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "відновлюється джерело hdlist (або synthesis) \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "знайдено випробуваний hdlist (або synthesis) як %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "немає файла hdlist для носія \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "перевіряється файл ключів з \"%s\"..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...імпортовано ключ %s з файла ключів \"%s\""
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "неможливо імпортувати файл ключів з \"%s\""
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "записується файл списку для носія \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "додано носія %s"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "неможливо проаналізувати файл hdlist для \"%s\""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "проблема читання файла synthesis для носія \"%s\""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "читаються заголовки з носія \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "НнNn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "ТтYy"
@@ -1181,47 +1277,52 @@ msgstr "невідомого носія \"%s\" позначено як змін
msgid "unable to access medium \"%s\""
msgstr "немає доступу до носія \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Немає пакунку з назвою %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Наступні пакунки містять %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "через відсутність %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Все вже встановлено"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "через незадоволеність %s"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "намагаюсь активізувати %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "для того, щоб зберегти %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "для того, щоб встановити %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "через конфлікти з %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "не замовлено"
@@ -1241,6 +1342,16 @@ msgstr "Неправильний ідентифікатор ключа (%s)"
msgid "Missing signature (%s)"
msgstr "Немає підпису (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Неможливо створити конфігураційний файл [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Копіювання невдале"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1257,8 +1368,8 @@ msgstr ""
"\n"
"використання:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - виводити цю довідку.\n"
@@ -1274,7 +1385,7 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - перевірити, чи є коректний доступ до змінного пристрою.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
@@ -1282,12 +1393,12 @@ msgstr ""
" --force - примусово виконати, навіть якщо деяких пакунків не "
"існує.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - розподілений urpmi поміж машин псевдоніма.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - виводити параметр packager: пакувальник.\n"
@@ -1298,8 +1409,8 @@ msgid " --root - use another root for rpm removal.\n"
msgstr ""
" --root - використовувати інший root для rpm на змінному пристрої.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - використовувати інший root для встановлення rpm.\n"
@@ -1319,18 +1430,18 @@ msgstr ""
"використовується\n"
" для встановлення (вилучення) chroot з параметром --root.\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr ""
" --probe-synthesis - намагатися знайти і використати файл synthesis.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - намагатися знайти і використати файл hdlist.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - детальний режим.\n"
@@ -1340,37 +1451,37 @@ msgstr " --verbose - детальний режим.\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - вибрати всі пакунки відповідно до розширення.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Тільки користувачу root дозволяється видаляти пакунки"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "невідомі пакунки"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "невідомий пакунок"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "вилучення пакунка %s пошкодить систему"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Нічого вилучати"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Перевіряється можливість вилучення наступних пакунків"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1382,12 +1493,12 @@ msgstr[1] ""
msgstr[2] ""
"Щоб задовольнити залежності, наступні %d пакунків буде вилучено (%d Мб)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
@@ -1395,12 +1506,12 @@ msgstr[0] "вилучається пакунок %s"
msgstr[1] "вилучається пакунок %s"
msgstr[2] "вилучається пакунок %s"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (Т/н) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Видалення невдале"
@@ -1426,14 +1537,14 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --help - виводити цю довідку.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - використовувати специфічне оточення (звичайно звіт\n"
" про помилку).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1445,13 +1556,13 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - використовувати тільки задані носії, відокремлені комою.\n"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1466,7 +1577,7 @@ msgstr ""
" --synthesis - використовувати вказаний файл synthesis замість бази "
"даних urpmi.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1478,7 +1589,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - не виводити однакові рядки.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - використовування тільки носії з поновленнями.\n"
@@ -1612,75 +1723,85 @@ msgstr " --group - виводити параметр group: група.\
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr " --name - виводити тільки назви пакунків.\n"
#: ../urpmf:73
#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr " --name - виводити тільки назви пакунків.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - виводити параметр obsoletes: всі застарілі файли.\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr " --packager - виводити параметр packager: пакувальник.\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, fuzzy, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - виводити параметр provides: всі використання.\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, fuzzy, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - виводити параметр requires: всі вимоги.\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --size - виводити параметр size: розмір.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, fuzzy, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - виводити параметр sourcerpm: джерельний rpm.\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - виводити параметр obsoletes: всі застарілі файли.\n"
+
+#: ../urpmf:81
#, fuzzy, c-format
msgid " --summary - summary\n"
msgstr " --summary, -S - виводити короткий звіт.\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr " --url - виводити параметр url: адреса.\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr " --verbose - детальний режим.\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -l - вивести список файлів у пакунку.\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - вивести версію, випуск і архів з назвою.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "використовується особливе оточення на %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1689,12 +1810,12 @@ msgstr ""
"Примітка: оскільки жодне з вибраних джерел на використовує hdlists, urpmf не "
"може повернути якогось результату\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Ви можете використовувати --name для пошуку назв пакунків.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1710,7 +1831,7 @@ msgstr ""
"\n"
"використання:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1718,37 +1839,37 @@ msgstr ""
" --searchmedia - використовувати тільки задані носії для пошуку запитаних "
"(або поновлюваних) пакунків.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr ""
" --auto-select - автоматично вибрати пакунки для поновлення системи.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
" --auto-select - автоматично вибрати пакунки для поновлення системи.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, fuzzy, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - вимкнути перевірку файлів на MD5SUM.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, fuzzy, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - виконати поновлення ключа gpg.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1757,12 +1878,12 @@ msgstr ""
" --no-uninstall - ніколи не запитувати про вилучення пакунка, припиняти "
"встановлення.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - не встановлювати пакунки (тільки звантаження)\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1772,7 +1893,7 @@ msgstr ""
"замовлені\n"
" пакунки, які мають вилучатися.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1783,41 +1904,47 @@ msgstr ""
" або поновлюватися більше, ніж задані пакунки,\n"
" типове значення %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-level - транзакції малої довжини, типова довжина %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, fuzzy, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy - встановити нечіткий пошук (те саме, що -y).\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, fuzzy, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr ""
" --src - наступний пакунок - це пакунок з вихідними текстами (так "
"само, як -s).\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
" --install-src - встановити тільки пакунок з вихідними текстами (без "
"двійкових файлів).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - спочатку видалити rpm з кешу.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - не стирати rpm з кешу.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1826,7 +1953,7 @@ msgstr ""
" --allow-nodeps - дозволити користувачеві встановлювати пакунки без "
"перевірки залежностей.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1835,12 +1962,12 @@ msgstr ""
" --allow-force - дозволити користувачеві встановлювати пакунки без "
"перевірки залежностей і цілісності.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - використовувати інший root для встановлення rpm.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1850,50 +1977,50 @@ msgstr ""
"використовується\n"
" для встановлення chroot з параметром --root.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr ""
" --wget - використовувати wget для доступу до віддалених файлів.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr ""
" --curl - використовувати curl для доступу до віддалених файлів.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, fuzzy, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr ""
" --curl - використовувати curl для доступу до віддалених файлів.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - обмежити швидкість завантаження.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1902,7 +2029,7 @@ msgstr ""
" --resume - відновити переміщення частково звантажених файлів\n"
" (--no-resume вимикає його, типово вимкнено).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1911,7 +2038,7 @@ msgstr ""
" --proxy - використовувати вказаний HTTP проксі, типово порт 1080 "
"(формат - <proxyhost[:port]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1920,7 +2047,7 @@ msgstr ""
" --proxy-user - задати користувача і пароль, щоб використовувати\n"
"для ідентифікації через проксі (формат - <user:password>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1929,7 +2056,7 @@ msgstr ""
" --bug - вивести звіт про помилку в теку, вказану наступним "
"аргументом.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, fuzzy, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1939,46 +2066,51 @@ msgstr ""
" (--no-verify-rpm вимикає це і встановлює типове "
"значення).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, fuzzy, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr " --test - перевірити, чи дане встановлення можливе.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - виключити шлях, відокремлений комою.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - не включати файли документації.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, fuzzy, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --no-uninstall - ніколи не запитувати про вилучення пакунка, припиняти "
"встановлення.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --url - виводити параметр url: адреса.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - виводити параметр description: опис.\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - пакунки, які при встановленні будуть пропущені.\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - пакунки, які при встановленні будуть пропущені.\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1987,61 +2119,61 @@ msgstr ""
" --more-choices - якщо знайдено кілька пакунків, пропонує ширший вибір, \n"
" ніж типово\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - не стирати rpm з кешу.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
" --strict-arch - поновити тільки пакунки з такою самою архітектурою.\n"
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - вибрати всі відповідності в командному рядку.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - дозволити пошук в provides, щоб знайти пакунок.\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - не шукати в provides, щоб знайти пакунок.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - режим мовчання.\n"
-#: ../urpmi:157
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " назви або rpm-файли, задані в командному рядку, буде встановлено.\n"
-#: ../urpmi:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, fuzzy, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
"Що може бути зроблено з двійковими файлами rpm при використанні --install-src"
-#: ../urpmi:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2050,7 +2182,7 @@ msgstr ""
"Тека [%s] вже існує, використайте іншу теку на звіт про помилку, або знищіть "
"його"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Неможливо створити теку [%s] для звіту про помилку"
@@ -2060,7 +2192,7 @@ msgstr "Неможливо створити теку [%s] для звіту пр
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2069,34 +2201,36 @@ msgstr ""
"Помилка: схоже, %s змонтовано в режимі тільки читання.\n"
"Використовуйте --allow-force, щоб виконати цю дію."
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (поновити)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (поновити)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (встановити)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (встановити)"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2104,12 +2238,12 @@ msgid ""
msgstr ""
"Щоб задовольнити залежності, наступні %d пакунків буде вилучено (%d Мб)"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Ваш вибір? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2120,7 +2254,7 @@ msgstr ""
"від пакунків, які є старішими від встановлених:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2131,19 +2265,19 @@ msgstr ""
"від пакунків, які є старішими від встановлених:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Все-таки продовжувати?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (Y/n) (Т/н) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2152,7 +2286,7 @@ msgstr ""
"Деякі із замовлених пакунків неможливо встановити:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2161,7 +2295,7 @@ msgstr ""
"Деякі із замовлених пакунків неможливо встановити:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2172,7 +2306,7 @@ msgstr ""
"бути вилучені для того, щоб поновити інші:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2183,7 +2317,7 @@ msgstr ""
"бути вилучені для того, щоб поновити інші:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2192,7 +2326,7 @@ msgstr ""
"Наступні пакунки будуть вилучені для того, щоб поновити інші:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2201,12 +2335,17 @@ msgstr ""
"Наступні пакунки будуть вилучені для того, щоб поновити інші:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2215,12 +2354,12 @@ msgstr ""
"Вам необхідно мати права root, щоб встановити наступні залежності:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
@@ -2228,100 +2367,17 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../urpmi:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Натисніть Enter, коли будете готові..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Скасувати"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "Наступні пакунки мають неправильні підписи"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Наступні пакунки мають неправильні підписи"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Ви хочете продовжувати встановлення?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Встановлення неуспішне"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "встановлюється %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "встановлюється %s з %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "встановлюється %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Спробувати встановлення без перевірки залежностей? (y/N) (т/Н) "
-
-#: ../urpmi:776
-#, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Спробувати примусове встановлення (--force)? (y/N) (т/Н) "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d запит на встановлення завершився неуспішно"
-msgstr[1] "%d запит на встановлення завершився неуспішно"
-msgstr[2] "%d запит на встановлення завершився неуспішно"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Встановлення можливе"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Все вже встановлено"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Все вже встановлено"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "Все вже встановлено"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "Все вже встановлено"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "перезапуск urpmi"
@@ -2453,49 +2509,49 @@ msgstr " -v - детальний режим.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "неможливо поновити носія\"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Тільки користувачу root дозволяється додавати носії"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "Створить конфігураційний файл [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "Неможливо створити конфігураційний файл [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "немає потреби задавати <відносний шлях hdlist> з --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "немає <відносного шляху hdlist>\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "неможливо створити носія\"%s\"\n"
@@ -2656,17 +2712,17 @@ msgstr " -a - вибрати всі носії.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - на назвах носіїв позначати як чорновий.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Тільки користувачу root дозволяється видаляти носії"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "нічого вилучати (використовуйте urpmi.addmedia, щоб додати носія)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2722,17 +2778,17 @@ msgstr " -a - вибрати всі незнімні носії.\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - змушувати генерувати hdlist файли.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Тільки користувачу root дозволяється поновлювати носії"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "нічого поновлювати (використовуйте urpmi.addmedia, щоб додати носія)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2741,22 +2797,22 @@ msgstr ""
"об'єкта для поновлення немає\n"
"(один з %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "ігнорується джерело %s"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "джерело робиться доступним %s"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2772,7 +2828,7 @@ msgstr ""
"\n"
"використання:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2781,53 +2837,53 @@ msgstr ""
" --searchmedia - використовувати тільки задані носії для пошуку запитаних "
"(або поновлюваних) пакунків.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - встановити нечіткий пошук (те саме, що -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - вивести список доступних пакунків.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - вивести список доступних носіїв.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - вивести наявні носії і їхні адреси.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
" --list-nodes - вивести список доступних вузлів при використанні --"
"parallel.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - вивести список доступних паралельних псевдонімів.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
" --dump-config - вивести конфігурацію у формі аргументу urpmi.addmedia.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr ""
" --src - наступний пакунок - це пакунок з вихідними текстами (так "
"само, як -s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
@@ -2835,14 +2891,14 @@ msgstr ""
" --sources - вивести всі вихідні пакунки перед завантаженням (тільки "
"root).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr ""
" --ignorearch - дозволити запити на пакунки rpm для незазначених "
"архітектур.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2851,22 +2907,22 @@ msgstr ""
" --use-distrib - сконфігурувати urpmi на льоту з дерева дистрибутиву.\n"
" Це дозволяє виконувати запити до дистрибутиву.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - друкувати changelog.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - виводити короткий звіт.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - зворотний пошук пакунків.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2876,58 +2932,58 @@ msgstr ""
" - розширений зворотний пошук пакунків (включає віртуальні "
"пакунки).\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -p - шукати в provides, щоб знайти пакунок.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - повний вивід даних про пакунок для вилучення.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - розширений запит до залежностей пакунка.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - також виводити групи з назвами.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - виводити корисну інформацію в придатному для читання "
"вигляді.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - вивести список файлів у пакунку.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - режим мовчання.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - також виводити версію і випуск з назвою.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - наступний пакунок є пакунком з джерельними текстами (те "
"саме, що --src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2935,44 +2991,44 @@ msgid ""
msgstr ""
" -u - пропустити пакунок, якщо новіша версія вже встановлена.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - задати невизначений пошук (так само як --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -Y - подібно до -y, але нечутливо до регістру.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " назви або rpm-файли, задані в командному рядку, необхідні.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes може використовуватися тільки з --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"Примітка: оскільки жодне з вибраних джерел на використовує hdlists, urpmf не "
"може повернути якогось результату\n"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2980,11 +3036,22 @@ msgstr ""
"Примітка: оскільки жодне з вибраних джерел на використовує hdlists, urpmf не "
"може повернути якогось результату\n"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Не знайдено журналу змін\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Наступні пакунки мають неправильні підписи:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Ви хочете продовжити встановлення?"
+
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Ви повинні мати права root, щоб використовувати --use-distrib"
diff --git a/po/urpmi.pot b/po/urpmi.pot
index 8774b863..f57578a8 100644
--- a/po/urpmi.pot
+++ b/po/urpmi.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+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"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr ""
@@ -24,7 +24,7 @@ msgstr ""
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr ""
@@ -72,7 +72,7 @@ msgstr ""
msgid "_Save"
msgstr ""
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr ""
@@ -92,17 +92,17 @@ msgstr ""
msgid "No packages specified"
msgstr ""
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr ""
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr ""
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -110,42 +110,42 @@ msgid ""
"Continue installation anyway?"
msgstr ""
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr ""
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr ""
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr ""
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr ""
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr ""
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr ""
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -153,97 +153,89 @@ msgid ""
"Continue installation anyway?"
msgstr ""
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr ""
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr ""
-#: ../gurpmi2:239 ../urpmi:622
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr ""
-
-#: ../gurpmi2:264
-#, c-format
-msgid "Downloading package `%s'..."
-msgstr ""
-
-#: ../gurpmi2:279
+#: ../gurpmi2:242 ../urpm/install.pm:70
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
+msgid "Preparing..."
msgstr ""
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:246
#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+msgid "Installing package `%s' (%s/%s)..."
msgstr ""
-#: ../gurpmi2:292 ../urpme:142
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
-msgid "removing %s"
+msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr ""
-#: ../gurpmi2:298 ../urpm/install.pm:70
+#: ../gurpmi2:273
#, c-format
-msgid "Preparing..."
+msgid "Downloading package `%s'..."
msgstr ""
-#: ../gurpmi2:302
+#: ../gurpmi2:291
#, c-format
-msgid "Installing package `%s' (%s/%s)..."
+msgid "_Done"
msgstr ""
-#: ../gurpmi2:334
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
-msgid "_Done"
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
msgstr ""
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, c-format
msgid "Installation failed:"
msgstr ""
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr ""
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr ""
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr ""
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -276,7 +268,7 @@ msgstr ""
msgid " defaults to %s.\n"
msgstr ""
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr ""
@@ -286,98 +278,98 @@ msgstr ""
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr ""
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr ""
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr ""
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr ""
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr ""
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr ""
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr ""
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr ""
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr ""
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr ""
-#: ../urpm/args.pm:135
+#: ../urpm/args.pm:263
#, c-format
-msgid "chroot directory doesn't exist"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr ""
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:407
#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:424
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr ""
@@ -564,7 +556,12 @@ msgstr ""
msgid "malformed URL: [%s]"
msgstr ""
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr ""
@@ -574,43 +571,48 @@ msgstr ""
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr ""
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr ""
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr ""
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr ""
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, c-format
+msgid "Removing package %s"
+msgstr ""
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr ""
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr ""
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr ""
@@ -640,11 +642,103 @@ msgstr ""
msgid "Cannot connect to ldap uri:"
msgstr ""
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, c-format
+msgid "%s database locked. waiting..."
+msgstr ""
+
+#: ../urpm/lock.pm:63
+#, c-format
+msgid "aborting"
+msgstr ""
+
+#: ../urpm/lock.pm:65
#, c-format
msgid "%s database locked"
msgstr ""
+#: ../urpm/main_loop.pm:99
+#, c-format
+msgid "The following package has bad signature"
+msgstr ""
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr ""
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr ""
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr ""
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr ""
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr ""
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr ""
+
+#: ../urpm/main_loop.pm:205
+#, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr ""
+
+#: ../urpm/main_loop.pm:247
+#, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr ""
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, c-format
+msgid "Package %s is already installed"
+msgstr ""
+
+#: ../urpm/main_loop.pm:272
+#, c-format
+msgid "Packages %s are already installed"
+msgstr ""
+
+#: ../urpm/main_loop.pm:275
+#, c-format
+msgid "Package %s can not be installed"
+msgstr ""
+
+#: ../urpm/main_loop.pm:276
+#, c-format
+msgid "Packages %s can not be installed"
+msgstr ""
+
#: ../urpm/md5sum.pm:23
#, c-format
msgid "examining %s file"
@@ -692,7 +786,7 @@ msgstr ""
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr ""
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr ""
@@ -779,7 +873,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr ""
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr ""
@@ -844,144 +938,149 @@ msgstr ""
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr ""
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr ""
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr ""
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr ""
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr ""
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr ""
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr ""
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr ""
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr ""
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr ""
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr ""
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr ""
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr ""
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr ""
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr ""
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr ""
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr ""
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr ""
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr ""
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr ""
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -989,74 +1088,74 @@ msgid ""
"medium."
msgstr ""
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr ""
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr ""
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr ""
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr ""
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr ""
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, c-format
msgid "updated medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr ""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr ""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr ""
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr ""
@@ -1116,47 +1215,52 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr ""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr ""
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr ""
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr ""
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, c-format
+msgid "due to already installed %s"
+msgstr ""
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr ""
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr ""
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr ""
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr ""
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr ""
@@ -1176,6 +1280,16 @@ msgstr ""
msgid "Missing signature (%s)"
msgstr ""
+#: ../urpm/sys.pm:216
+#, c-format
+msgid "Can't write file"
+msgstr ""
+
+#: ../urpm/sys.pm:216
+#, c-format
+msgid "Can't open file"
+msgstr ""
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1187,8 +1301,8 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr ""
@@ -1203,18 +1317,18 @@ msgstr ""
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr ""
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr ""
@@ -1224,8 +1338,8 @@ msgstr ""
msgid " --root - use another root for rpm removal.\n"
msgstr ""
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
@@ -1242,17 +1356,17 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr ""
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr ""
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr ""
@@ -1262,37 +1376,37 @@ msgstr ""
msgid " -a - select all packages matching expression.\n"
msgstr ""
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr ""
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr ""
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr ""
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr ""
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr ""
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr ""
-#: ../urpme:134
+#: ../urpme:131
#, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1300,24 +1414,24 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr ""
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr ""
@@ -1338,12 +1452,12 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr ""
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1354,12 +1468,12 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1370,7 +1484,7 @@ msgstr ""
msgid " --use-distrib - use the given path to access media\n"
msgstr ""
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1380,7 +1494,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr ""
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr ""
@@ -1512,87 +1626,97 @@ msgstr ""
#: ../urpmf:72
#, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr ""
#: ../urpmf:73
#, c-format
-msgid " --obsoletes - obsoletes tags\n"
+msgid " --name - package name\n"
msgstr ""
#: ../urpmf:74
#, c-format
-msgid " --packager - packager\n"
+msgid " --obsoletes - obsoletes tags\n"
msgstr ""
#: ../urpmf:75
#, c-format
-msgid " --provides - provides tags\n"
+msgid " --packager - packager\n"
msgstr ""
#: ../urpmf:76
#, c-format
-msgid " --requires - requires tags\n"
+msgid " --provides - provides tags\n"
msgstr ""
#: ../urpmf:77
#, c-format
-msgid " --size - installed size\n"
+msgid " --requires - requires tags\n"
msgstr ""
#: ../urpmf:78
#, c-format
-msgid " --sourcerpm - source rpm name\n"
+msgid " --size - installed size\n"
msgstr ""
#: ../urpmf:79
#, c-format
-msgid " --summary - summary\n"
+msgid " --sourcerpm - source rpm name\n"
msgstr ""
#: ../urpmf:80
#, c-format
-msgid " --url - url\n"
+msgid " --suggests - suggests tags\n"
msgstr ""
#: ../urpmf:81
#, c-format
-msgid " --vendor - vendor\n"
+msgid " --summary - summary\n"
msgstr ""
#: ../urpmf:82
#, c-format
+msgid " --url - url\n"
+msgstr ""
+
+#: ../urpmf:83
+#, c-format
+msgid " --vendor - vendor\n"
+msgstr ""
+
+#: ../urpmf:84
+#, c-format
msgid " -m - the media in which the package was found\n"
msgstr ""
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1603,60 +1727,60 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpmi:88
+#: ../urpmi:84
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr ""
-#: ../urpmi:93
+#: ../urpmi:89
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr ""
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr ""
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
"installation.\n"
msgstr ""
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr ""
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
" packages that lead to removals.\n"
msgstr ""
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1664,241 +1788,252 @@ msgid ""
" default is %d.\n"
msgstr ""
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr ""
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr ""
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr ""
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr ""
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr ""
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
" dependencies checking.\n"
msgstr ""
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
" dependencies checking and integrity.\n"
msgstr ""
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr ""
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
" to install a chroot with --root option.\n"
msgstr ""
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr ""
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr ""
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr ""
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr ""
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
" (--no-resume disables it, default is disabled).\n"
msgstr ""
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../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 ""
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
" authentication (format is <user:password>).\n"
msgstr ""
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
" next arg.\n"
msgstr ""
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
" (--no-verify-rpm disables it, default is enabled).\n"
msgstr ""
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr ""
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr ""
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr ""
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
-#: ../urpmi:144
+#: ../urpmi:141
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr ""
-#: ../urpmi:145
+#: ../urpmi:142
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr ""
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
-#: ../urpmi:148
+#: ../urpmi:145
+#, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr ""
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:150
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr ""
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
-#: ../urpmi:155
+#: ../urpmi:153
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr ""
-#: ../urpmi:157
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
-#: ../urpmi:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr ""
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr ""
@@ -1908,53 +2043,55 @@ msgstr ""
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, c-format
msgid "%s: %s (to upgrade)"
msgstr ""
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, c-format
msgid "%s (to upgrade)"
msgstr ""
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, c-format
msgid "%s: %s (to install)"
msgstr ""
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, c-format
msgid "%s (to install)"
msgstr ""
-#: ../urpmi:447
+#: ../urpmi:454
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr ""
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr ""
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -1962,7 +2099,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -1970,33 +2107,33 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr ""
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr ""
-#: ../urpmi:503
+#: ../urpmi:520
#, c-format
msgid ""
"A requested package cannot be installed:\n"
"%s"
msgstr ""
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s"
msgstr ""
-#: ../urpmi:535
+#: ../urpmi:552
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2004,7 +2141,7 @@ msgid ""
"%s\n"
msgstr ""
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2012,137 +2149,60 @@ msgid ""
"%s\n"
msgstr ""
-#: ../urpmi:544
+#: ../urpmi:561
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
msgstr ""
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
"%s"
msgstr ""
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
"%s\n"
msgstr ""
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, 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:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr ""
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr ""
-#: ../urpmi:671
-#, c-format
-msgid "The following package has bad signature"
-msgstr ""
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr ""
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr ""
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr ""
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr ""
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr ""
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr ""
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr ""
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr ""
-
-#: ../urpmi:815
-#, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr ""
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, c-format
-msgid "Package %s is already installed"
-msgstr ""
-
-#: ../urpmi:839
-#, c-format
-msgid "Packages %s are already installed"
-msgstr ""
-
-#: ../urpmi:842
-#, c-format
-msgid "Package %s can not be installed"
-msgstr ""
-
-#: ../urpmi:843
-#, c-format
-msgid "Packages %s can not be installed"
-msgstr ""
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr ""
@@ -2254,49 +2314,49 @@ msgstr ""
msgid "unable to update medium \"%s\"\n"
msgstr ""
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr ""
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, c-format
msgid "creating config file [%s]"
msgstr ""
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr ""
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr ""
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr ""
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr ""
@@ -2449,17 +2509,17 @@ msgstr ""
msgid " -y - fuzzy match on media names.\n"
msgstr ""
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr ""
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr ""
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2509,39 +2569,39 @@ msgstr ""
msgid " -f - force updating synthesis/hdlist\n"
msgstr ""
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr ""
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
"(one of %s)\n"
msgstr ""
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr ""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr ""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr ""
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2552,190 +2612,190 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
"packages.\n"
msgstr ""
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr ""
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr ""
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr ""
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr ""
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr ""
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr ""
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr ""
-#: ../urpmq:68
+#: ../urpmq:65
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr ""
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
" This permit to querying a distro.\n"
msgstr ""
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr ""
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr ""
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr ""
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
" - extended reverse search (includes virtual packages).\n"
msgstr ""
-#: ../urpmq:90
+#: ../urpmq:87
#, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr ""
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr ""
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr ""
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr ""
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr ""
-#: ../urpmq:99
+#: ../urpmq:96
#, c-format
msgid " -m - equivalent to -du\n"
msgstr ""
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr ""
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
msgstr ""
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr ""
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr ""
diff --git a/po/uz.po b/po/uz.po
index f52c703e..21f6d7ee 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-uz\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2007-02-26 22:17+0100\n"
"Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
"Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -18,7 +18,7 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "RPM ўрнатиш"
@@ -28,7 +28,7 @@ msgstr "RPM ўрнатиш"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Хато: %s файли топилмади, амал бекор қилинади"
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Ок"
@@ -86,7 +86,7 @@ msgstr "Ўр_натиш"
msgid "_Save"
msgstr "_Сақлаш"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Бекор қилиш"
@@ -106,17 +106,17 @@ msgstr "Номаълум параметр \"%s\""
msgid "No packages specified"
msgstr "Ҳеч қандай пакет кўрсатилмаган"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Илтимос кутиб туринг..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "root бўлиш керак"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -127,42 +127,42 @@ msgstr ""
"%s\n"
"Бунга қарамасдан ўрнатишни давом эттиришни истайсизми?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Диққат"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Ок"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (янгилаш)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (ўрнатиш)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "Пакет танлови"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Қуйидаги пакетлардан бири керак:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "Тў_хтатиш"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -173,58 +173,60 @@ msgstr ""
"%s\n"
"Ўрнатишни давом эттиришни истайсизми?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "Боғлиқликларни таъминлаш учун қуйидаги пакет ҳам ўрнатилади:"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Боғлиқликларни таъминлаш учун қуйидаги пакетлар ҳам ўрнатилади:"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d-та пакет, %d Мб)"
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Пакетни ўрнатиш..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr ""
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Тайёрланмоқда..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "\"%s\" (%s/%s) пакети ўрнатилмоқда..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Илтимос \"%s\" номли тўпламни [%s] ускунасига қўйинг"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "\"%s\" пакети олинмоқда..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Қуйидаги пакетларнинг имзолари нотўғри:\n"
-"%s\n"
-"\n"
-"Ўрнатишни давом эттиришни истайсизми?"
+msgid "_Done"
+msgstr "_Тайёр"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -235,41 +237,27 @@ msgstr ""
"%s\n"
"Балки urpmi маълумот базасини янгилашингиз керак."
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "%s ўчирилмоқда"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Тайёрланмоқда..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "\"%s\" (%s/%s) пакети ўрнатилмоқда..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Тайёр"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, c-format
msgid "Installation failed:"
msgstr "Ўрнатиш муваффақиятсиз тугади:"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Ҳамма нарса аллақачон ўрнатилган"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Ўрнатиш тугади"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "%s ўчирилмоқда"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -306,7 +294,7 @@ msgstr " -f - RPM-файлининг тўлиқ номини кў
msgid " defaults to %s.\n"
msgstr " %s - андоза.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Фақат бошқарувчи пакетларни ўрнатиши мумкин"
@@ -316,98 +304,98 @@ msgstr "Фақат бошқарувчи пакетларни ўрнатиши м
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "rpmdb'ни очиб бўлмади"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr "%d-та RPM-хедер топилди, %d-та эски хедер ўчирилади"
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "RPM-файлининг номи (%s) нотўғри"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "RPM-файли (%s) олинмоқда..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...олиш тугади"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...олиш муваффақиятсиз тугади: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "RPM-файлига (%s) мурожаат қилиб бўлмади"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr ""
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "RPM-файлини рўйхатдан ўтказиб бўлмади"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr ""
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr ""
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr "chroot директорияси мавжуд эмас"
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: RPM-файлини (%s) ўқиб бўлмади\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
+#, c-format
+msgid "chroot directory doesn't exist"
+msgstr "chroot директорияси мавжуд эмас"
+
+#: ../urpm/args.pm:424
#, c-format
msgid "Can't use %s without %s"
msgstr "%s амалидан %s амалисиз фойдаланиб бўлмайди"
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
#, c-format
msgid "Can't use %s with %s"
msgstr "%s амалидан %s амали билан бирга фойдаланиб бўлмайди"
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "тўплам учун hdlist synthesis файли яратилди: \"%s\""
@@ -597,7 +585,12 @@ msgstr "%s пакети топилмади."
msgid "malformed URL: [%s]"
msgstr "хато URL: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "RPM-файллари \"%s\" тўпламидан олинмоқда..."
@@ -607,43 +600,48 @@ msgstr "RPM-файллари \"%s\" тўпламидан олинмоқда..."
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr ""
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "delta-rpm пакетидан RPM-файлини ажратиб бўлмади: %s"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "%s пакети қўшилмоқда (id=%d, eid=%d, янгилаш=%d, файл=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "%s пакетини ўрнатиб бўлмади"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "%s пакети олиб ташланмоқда"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "%s пакети олиб ташланмоқда"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr ""
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "%s пакети ҳақида кўпроқ маълумот"
@@ -673,11 +671,102 @@ msgstr ""
msgid "Cannot connect to ldap uri:"
msgstr ""
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "%s маълумот базаси қулфланган"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Диққат"
+
+#: ../urpm/lock.pm:65
#, c-format
msgid "%s database locked"
msgstr "%s маълумот базаси қулфланган"
+#: ../urpm/main_loop.pm:99
+#, c-format
+msgid "The following package has bad signature"
+msgstr "Қуйидаги пакетнинг имзоси хато"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Қуйидаги пакетларнинг имзолари нотўғри"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Ўрнатишни давом этишни истайсизми?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Ўрнатиш муваффақиятсиз тугади"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr ""
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "ўрнатилмоқда: %s, қаердан: %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "%s ўрнатилмоқда"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Боғлиқликларни текширмасдан ўрнатиб кўрайми? (ҳ/Й) "
+
+#: ../urpm/main_loop.pm:205
+#, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr ""
+
+#: ../urpm/main_loop.pm:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "Ўрнатиш муваффақиятсиз тугади"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Ўрнатиш мумкин"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr "Пакетларни янгилаш муҳтожи йўқ"
+
+#: ../urpm/main_loop.pm:271
+#, c-format
+msgid "Package %s is already installed"
+msgstr "%s пакети аллақачон ўрнатилган"
+
+#: ../urpm/main_loop.pm:272
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "%s пакетлари аллақачон ўрнатилган"
+
+#: ../urpm/main_loop.pm:275
+#, c-format
+msgid "Package %s can not be installed"
+msgstr "%s пакетини ўрнатиб бўлмайди"
+
+#: ../urpm/main_loop.pm:276
+#, c-format
+msgid "Packages %s can not be installed"
+msgstr "%s пакетларини ўрнатиб бўлмайди"
+
#: ../urpm/md5sum.pm:23
#, c-format
msgid "examining %s file"
@@ -725,7 +814,7 @@ msgstr ""
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr ""
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr ""
@@ -815,7 +904,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Қидириш боши: %s охири: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "боғликларни аниқлаш учун иккинчи босқич бажарилмоқда\n"
@@ -880,147 +969,152 @@ msgstr ""
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr ""
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "тўплам олиб ташланмоқда: \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "тўплам учун urpmi қайтадан мосланмоқда: \"%s\""
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...қайтадан мослаш муваффақиятсиз тугади"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "...қайтадан мослаш тугади"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "тўпламни янгилаш ҳожати йўқ: \"%s\""
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "hdlist файли (%s) текширилмоқда"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "synthesis файли (%s) текширилмоқда"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "[%s] hdlist файли яратилмоқда"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr ""
"тўпламининг hdlist ёки synthesis файлини ўқишда муаммо рўй берди: \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr ""
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...нусха кўчириш муваффақиятсиз тугади"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr ""
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...нусха кўчириш бажарилди"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr ""
"'%s' файлидан нусха кўчириш муваффақиятсиз тугади (унинг ҳажми жуда кичик)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr ""
"тўпламнинг олинган hdlist (ёки synthesis) файлининг md5sum'и ҳисобланмоқда"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "%s'дан нусха кўчириш муваффақиятсиз тугади (md5sum нотўғри)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "олинган hdlist (ёки synthesis) файли учун md5sum сони ҳисобланмоқда..."
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...олиш муваффақиятсиз тугади: md5sum мос келмади"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "%s'дан RPM-файллар топилмади"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "RPM-файллари %s'дан ўқилмоқда"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "[%s]: %s'дан RPM-файлларни ўқиб бўлмади"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1028,74 +1122,74 @@ msgid ""
"medium."
msgstr ""
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "тўпламнинг hdlist файли %s хато: %s"
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "'%s' учун hdlist (ёки synthesis) файли ёзиб олинмоқда..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "қидирилган hdlist (ёки synthesis) файли топилди: %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "тўплам учун ҳеч қандай hdlist файли топилмади: \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "'%s' учун pubkey файли текширилмоқда..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr ""
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "'%s' учун pubkey файлини импорт қилиб бўлмади"
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "тўплам учун рўйхат файли ёзилмоқда: \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, c-format
msgid "updated medium \"%s\""
msgstr "тўплам янгиланди: \"%s\""
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr ""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "тўпламининг synthesis файлини ўқишда муаммо рўй берди: \"%s\""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "тўпламидан хедерлар ўқилмоқда: \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "ЖжJjNn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "ҲҳHhYy"
@@ -1155,47 +1249,52 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "тўпламга мурожаат қилиб бўлмади: \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "%s номли пакет мавжуд эмас"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Қуйидаги пакетларда %s бор: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "%s етишмаганига кўра"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "%s пакети аллақачон ўрнатилган"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr ""
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "%s'ни қолдириш учун"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "%s'ни ўрнатиш учун"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr ""
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr ""
@@ -1215,6 +1314,16 @@ msgstr ""
msgid "Missing signature (%s)"
msgstr "Имзо етишмайди (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Мослама файлини (%s) яратиб бўлмади"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Нусха кўчириш муваффақиятсиз тугади"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1231,8 +1340,8 @@ msgstr ""
"\n"
"Фойдаланиш:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - шу ёрдам хабарини кўрсатиш.\n"
@@ -1247,18 +1356,18 @@ msgstr ""
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - олиб ташлашни тўғри бажариш имкониятини текшириш.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr ""
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr ""
@@ -1268,8 +1377,8 @@ msgstr ""
msgid " --root - use another root for rpm removal.\n"
msgstr ""
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
@@ -1286,17 +1395,17 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - synthesis файлидан фойдаланиш.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - hdlist файлидан фойдаланиш.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - ортиқча хабарлар билан.\n"
@@ -1306,60 +1415,60 @@ msgstr " --verbose, -v - ортиқча хабарлар билан.\n"
msgid " -a - select all packages matching expression.\n"
msgstr ""
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Пакетларни фақат root олиб ташлаши мумкин"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "Номаълум пакетлар"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "номаълум пакет"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "пакетни (%s) олиб ташлаш тизимни ишдан чиқаради"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Ўчириш учун ҳеч нарса йўқ"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Қуйидаги пакетларни олиб ташлаш учун текшириш бажарилмоқда"
-#: ../urpme:134
+#: ../urpme:131
#, 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] "Боғлиқликларни таъминлаш учун қуйидаги %d-та пакет олиб ташланади"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr " (%d Мб)"
-#: ../urpme:138
+#: ../urpme:135
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "%d-та пакетни олиб ташлашни истайсизми?"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (ҳ/Й) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Ўчириш муваффақиятсиз тугади"
@@ -1385,12 +1494,12 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr ""
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1403,14 +1512,14 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
" --media - фақат кўрсатилган, вергул билан ажратилган, тўпламлардан "
"фойдаланиш.\n"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1421,7 +1530,7 @@ msgstr ""
msgid " --use-distrib - use the given path to access media\n"
msgstr " --synthesis - кўрсатилган synthesis файлидан фойдаланиш.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - кўрсатилган synthesis файлидан фойдаланиш.\n"
@@ -1431,7 +1540,7 @@ msgstr " --synthesis - кўрсатилган synthesis файлидан ф
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - бир хил қаторлар кўрсатилмасин.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - фақат янгилаш тўпламидан фойдаланиш.\n"
@@ -1562,88 +1671,98 @@ msgid " --group - group\n"
msgstr " --group - гуруҳ\n"
#: ../urpmf:72
+#, fuzzy, c-format
+msgid " --license - license\n"
+msgstr " --name - пакетнинг номи\n"
+
+#: ../urpmf:73
#, c-format
msgid " --name - package name\n"
msgstr " --name - пакетнинг номи\n"
-#: ../urpmf:73
+#: ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr ""
-#: ../urpmf:74
+#: ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr ""
-#: ../urpmf:75
+#: ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr ""
-#: ../urpmf:76
+#: ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr ""
-#: ../urpmf:77
+#: ../urpmf:78
#, c-format
msgid " --size - installed size\n"
msgstr ""
-#: ../urpmf:78
+#: ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr ""
-#: ../urpmf:79
+#: ../urpmf:80
+#, c-format
+msgid " --suggests - suggests tags\n"
+msgstr ""
+
+#: ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr ""
-#: ../urpmf:80
+#: ../urpmf:82
#, c-format
msgid " --url - url\n"
msgstr ""
-#: ../urpmf:81
+#: ../urpmf:83
#, c-format
msgid " --vendor - vendor\n"
msgstr ""
-#: ../urpmf:82
+#: ../urpmf:84
#, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -m - пакет қайси тўпламда топилганини кўрсатиш\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1659,60 +1778,60 @@ msgstr ""
"\n"
"Фойдаланиш:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr " --auto-select - тизимни янгилаш учун пакетларни авто-танлаш.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr ""
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr ""
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
"installation.\n"
msgstr ""
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr ""
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
" packages that lead to removals.\n"
msgstr ""
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1720,135 +1839,141 @@ msgid ""
" default is %d.\n"
msgstr ""
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr ""
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr ""
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr ""
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - аввало пакетларни кэшдан олиб ташлаш.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - пакетлар кэшдан олиб ташланмасин.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
" dependencies checking.\n"
msgstr ""
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
" dependencies checking and integrity.\n"
msgstr ""
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr ""
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
" to install a chroot with --root option.\n"
msgstr ""
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr ""
" --wget - масофадаги файлларни олиш учун wget дастурини ишлатиш.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr ""
" --curl - масофадаги файлларни олиш учун curl дастурини ишлатиш.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr ""
" --prozilla - масофадаги файлларни олиш учун prozilla дастурини "
"ишлатиш.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - пакетларни олиш тезлигини чеклаш.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
" (--no-resume disables it, default is disabled).\n"
msgstr ""
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../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 ""
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
" authentication (format is <user:password>).\n"
msgstr ""
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
" next arg.\n"
msgstr ""
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1858,114 +1983,119 @@ msgstr ""
" (--no-verify-rpm ушбу амалнинг тескариси, андоза бўйича "
"пакетнинг электрон имзоси текширилади).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr " --test - ўрнатишни тўғри бажариш имкониятини текшириш.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr ""
" --excludepath - кўрсатилган, вергул билан ажратилган, йўллардан "
"фойдаланилмасин.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - қўлланма файлларсиз.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --ignoresize - ўрнатишдан аввал дискда етарли бўш жой борлиги "
"текширилмасин.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr ""
-#: ../urpmi:145
+#: ../urpmi:142
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr ""
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
-#: ../urpmi:148
+#: ../urpmi:145
+#, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr ""
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:150
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr ""
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
-#: ../urpmi:155
+#: ../urpmi:153
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr ""
-#: ../urpmi:157
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
-#: ../urpmi:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr ""
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr ""
@@ -1975,53 +2105,55 @@ msgstr ""
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr "Тўплам янгиланмоқда...\n"
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (янгилаш)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (янгилаш)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (ўрнатиш)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, c-format
msgid "%s (to install)"
msgstr "%s (ўрнатиш)"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "Боғлиқликларни таъминлаш учун қуйидаги %d-та пакет олиб ташланади"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Нимани танлайсиз? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2032,7 +2164,7 @@ msgstr ""
"пакетлардан кўра эскироқ пакетларга боғлиқ:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2043,7 +2175,7 @@ msgstr ""
"пакетлардан кўра эскироқ пакетларга боғлиқ:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, c-format
msgid ""
"\n"
@@ -2052,12 +2184,12 @@ msgstr ""
"\n"
"Бунга қарамасдан давом этишни истайсизми?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (Ҳ/й) "
-#: ../urpmi:503
+#: ../urpmi:520
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2066,7 +2198,7 @@ msgstr ""
"Талаб қилинган пакетни ўрнатиб бўлмайди:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2075,7 +2207,7 @@ msgstr ""
"Талаб қилинган баъзи бир пакетларни ўрнатиб бўлмайди:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2086,7 +2218,7 @@ msgstr ""
"учун қуйидаги пакетни олиб ташлаш керак:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2097,7 +2229,7 @@ msgstr ""
"учун қуйидаги пакетларни олиб ташлаш керак:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2106,7 +2238,7 @@ msgstr ""
"Бошқа пакетларни янгилаш учун қуйидаги пакетни олиб ташлаш керак:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2115,12 +2247,17 @@ msgstr ""
"Бошқа пакетларни янгилаш учун қуйидаги пакетларни олиб ташлаш керак:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(синов усули, ҳеч нарса олиб ташланмайди)"
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2129,109 +2266,28 @@ msgstr ""
"Қуйидаги боғлиқликларни ўрнатиш учун сиз root бўлишингиз керак:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(синов усули, ҳеч нарса ўрнатилмайди)"
-#: ../urpmi:597
+#: ../urpmi:617
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "%d-та пакетни ўрнатиш билан давом этишни истайсизми?"
-#: ../urpmi:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Тайёр бўлганда ENTER тугмасини босинг..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Бекор қилиш"
-#: ../urpmi:671
-#, c-format
-msgid "The following package has bad signature"
-msgstr "Қуйидаги пакетнинг имзоси хато"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Қуйидаги пакетларнинг имзолари нотўғри"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Ўрнатишни давом этишни истайсизми?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Ўрнатиш муваффақиятсиз тугади"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr ""
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "ўрнатилмоқда: %s, қаердан: %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "%s ўрнатилмоқда"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Боғлиқликларни текширмасдан ўрнатиб кўрайми? (ҳ/Й) "
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr ""
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "Ўрнатиш муваффақиятсиз тугади"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Ўрнатиш мумкин"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr "Пакетларни янгилаш муҳтожи йўқ"
-
-#: ../urpmi:838
-#, c-format
-msgid "Package %s is already installed"
-msgstr "%s пакети аллақачон ўрнатилган"
-
-#: ../urpmi:839
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "%s пакетлари аллақачон ўрнатилган"
-
-#: ../urpmi:842
-#, c-format
-msgid "Package %s can not be installed"
-msgstr "%s пакетини ўрнатиб бўлмайди"
-
-#: ../urpmi:843
-#, c-format
-msgid "Packages %s can not be installed"
-msgstr "%s пакетларини ўрнатиб бўлмайди"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "urpmi қайтадан ишга тушмоқда"
@@ -2352,32 +2408,32 @@ msgstr " -v - ортиқча хабарлар билан.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "тўпламни янгилаб бўлмади: \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Пакетлар тўпламини фақат root қўшиши мумкин"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, c-format
msgid "creating config file [%s]"
msgstr "мослама файли (%s) яратилмоқда"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "Мослама файлини (%s) яратиб бўлмади"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr ""
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
@@ -2386,17 +2442,17 @@ msgstr ""
"\n"
"\"%s\" тўпламини қўшишни истайсизми?"
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "synthesis/hdlist файлига нисбий йўл кўрсатилмаган\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr "Масофадаги тўплам учун %s амалидан фойдаланиб бўлмайди"
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "тўпламни яратиб бўлмади: \"%s\"\n"
@@ -2555,19 +2611,19 @@ msgstr " -a - ҳамма тўпламларни танлаш.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr ""
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Тўпламни фақат root олиб ташлаши мумкин"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr ""
"олиб ташлаш учун ҳеч нарса йўқ (тўпламни қўшиш\n"
"учун urpmi.addmedia буйруғидан фойдаланинг)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2621,19 +2677,19 @@ msgstr ""
msgid " -f - force updating synthesis/hdlist\n"
msgstr ""
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Фақат бошқарувчи (root ) тўплами янгилаши мумкин"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
"янгилаш учун ҳеч нарса йўқ (тўпламни қўшиш учун\n"
"urpmi.addmedia буйруғидан фойдаланинг)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2642,22 +2698,22 @@ msgstr ""
"янгилаш параметри етишмаяпти\n"
"(қуйидагилардан биттаси: %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "тўпламга эътибор берилмайди: \"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr ""
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2673,194 +2729,205 @@ msgstr ""
"\n"
"Фойдаланиш:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
"packages.\n"
msgstr ""
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr ""
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - мавжуд бўлган пакетлар рўйхатини кўрсатиш.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - мавжуд бўлган тўпламлар рўйхатини кўрсатиш.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - мавжуд бўлган тўплам ва унинг URL'ни кўрсатиш.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr ""
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr ""
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr ""
-#: ../urpmq:68
+#: ../urpmq:65
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr ""
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
" This permit to querying a distro.\n"
msgstr ""
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr ""
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr ""
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr ""
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
" - extended reverse search (includes virtual packages).\n"
msgstr ""
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -l - пакетдаги файлларни кўрсатиш.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr ""
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr ""
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr ""
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - пакетдаги файлларни кўрсатиш.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, c-format
msgid " -m - equivalent to -du\n"
msgstr ""
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr ""
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
msgstr ""
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes'дан фақат --parallel билан бирга фойдаланиб бўлади"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Changelog файли топилмади\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Қуйидаги пакетларнинг имзолари нотўғри:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Ўрнатишни давом эттиришни истайсизми?"
+
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "--use-distrib амалидан фойдаланиш учун root бўлиш шарт"
diff --git a/po/uz@Latn.po b/po/uz@Latn.po
index ff5b7936..20e384f9 100644
--- a/po/uz@Latn.po
+++ b/po/uz@Latn.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-uz\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2007-02-26 22:17+0100\n"
"Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
"Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -18,7 +18,7 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "RPM o'rnatish"
@@ -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:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -86,7 +86,7 @@ msgstr "O'r_natish"
msgid "_Save"
msgstr "_Saqlash"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Bekor qilish"
@@ -106,17 +106,17 @@ msgstr "Noma'lum parametr \"%s\""
msgid "No packages specified"
msgstr "Hech qanday paket ko'rsatilmagan"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Iltimos kutib turing..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "root bo'lish kerak"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -127,42 +127,42 @@ msgstr ""
"%s\n"
"Bunga qaramasdan o'rnatishni davom ettirishni istaysizmi?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Diqqat"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (yangilash)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (o'rnatish)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "Paket tanlovi"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "Quyidagi paketlardan biri kerak:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "To'_xtatish"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -173,58 +173,60 @@ msgstr ""
"%s\n"
"O'rnatishni davom ettirishni istaysizmi?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, 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:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, 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:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d-ta paket, %d Mb)"
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Paketni o'rnatish..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr ""
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Tayyorlanmoqda..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "\"%s\" (%s/%s) paketi o'rnatilmoqda..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Iltimos \"%s\" nomli to'plamni [%s] uskunasiga qo'ying"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "\"%s\" paketi olinmoqda..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Quyidagi paketlarning imzolari noto'g'ri:\n"
-"%s\n"
-"\n"
-"O'rnatishni davom ettirishni istaysizmi?"
+msgid "_Done"
+msgstr "_Tayyor"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -235,41 +237,27 @@ msgstr ""
"%s\n"
"Balki urpmi ma'lumot bazasini yangilashingiz kerak."
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "%s o'chirilmoqda"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Tayyorlanmoqda..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "\"%s\" (%s/%s) paketi o'rnatilmoqda..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Tayyor"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, c-format
msgid "Installation failed:"
msgstr "O'rnatish muvaffaqiyatsiz tugadi:"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Hamma narsa allaqachon o'rnatilgan"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "O'rnatish tugadi"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "%s o'chirilmoqda"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -306,7 +294,7 @@ msgstr " -f - RPM-faylining to'liq nomini ko'rsatish (NVRA)\n"
msgid " defaults to %s.\n"
msgstr " %s - andoza.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Faqat boshqaruvchi paketlarni o'rnatishi mumkin"
@@ -316,98 +304,98 @@ msgstr "Faqat boshqaruvchi paketlarni o'rnatishi mumkin"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "rpmdb'ni ochib bo'lmadi"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr "%d-ta RPM-xeder topildi, %d-ta eski xeder o'chiriladi"
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "RPM-faylining nomi (%s) noto'g'ri"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "RPM-fayli (%s) olinmoqda..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...olish tugadi"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...olish muvaffaqiyatsiz tugadi: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "RPM-fayliga (%s) murojaat qilib bo'lmadi"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr ""
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "RPM-faylini ro'yxatdan o'tkazib bo'lmadi"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr ""
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr ""
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr "chroot direktoriyasi mavjud emas"
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: RPM-faylini (%s) o'qib bo'lmadi\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
+#, c-format
+msgid "chroot directory doesn't exist"
+msgstr "chroot direktoriyasi mavjud emas"
+
+#: ../urpm/args.pm:424
#, c-format
msgid "Can't use %s without %s"
msgstr "%s amalidan %s amalisiz foydalanib bo'lmaydi"
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
#, c-format
msgid "Can't use %s with %s"
msgstr "%s amalidan %s amali bilan birga foydalanib bo'lmaydi"
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "to'plam uchun hdlist synthesis fayli yaratildi: \"%s\""
@@ -598,7 +586,12 @@ msgstr "%s paketi topilmadi."
msgid "malformed URL: [%s]"
msgstr "xato URL: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "RPM-fayllari \"%s\" to'plamidan olinmoqda..."
@@ -608,43 +601,48 @@ msgstr "RPM-fayllari \"%s\" to'plamidan olinmoqda..."
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr ""
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, 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:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "%s paketi qo'shilmoqda (id=%d, eid=%d, yangilash=%d, fayl=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "%s paketini o'rnatib bo'lmadi"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "%s paketi olib tashlanmoqda"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "%s paketi olib tashlanmoqda"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr ""
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "%s paketi haqida ko'proq ma'lumot"
@@ -674,11 +672,102 @@ msgstr ""
msgid "Cannot connect to ldap uri:"
msgstr ""
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "%s ma'lumot bazasi qulflangan"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Diqqat"
+
+#: ../urpm/lock.pm:65
#, c-format
msgid "%s database locked"
msgstr "%s ma'lumot bazasi qulflangan"
+#: ../urpm/main_loop.pm:99
+#, c-format
+msgid "The following package has bad signature"
+msgstr "Quyidagi paketning imzosi xato"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Quyidagi paketlarning imzolari noto'g'ri"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "O'rnatishni davom etishni istaysizmi?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "O'rnatish muvaffaqiyatsiz tugadi"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr ""
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "o'rnatilmoqda: %s, qaerdan: %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "%s o'rnatilmoqda"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Bog'liqliklarni tekshirmasdan o'rnatib ko'raymi? (h/Y) "
+
+#: ../urpm/main_loop.pm:205
+#, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr ""
+
+#: ../urpm/main_loop.pm:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "O'rnatish muvaffaqiyatsiz tugadi"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "O'rnatish mumkin"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr "Paketlarni yangilash muhtoji yo'q"
+
+#: ../urpm/main_loop.pm:271
+#, c-format
+msgid "Package %s is already installed"
+msgstr "%s paketi allaqachon o'rnatilgan"
+
+#: ../urpm/main_loop.pm:272
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "%s paketlari allaqachon o'rnatilgan"
+
+#: ../urpm/main_loop.pm:275
+#, c-format
+msgid "Package %s can not be installed"
+msgstr "%s paketini o'rnatib bo'lmaydi"
+
+#: ../urpm/main_loop.pm:276
+#, c-format
+msgid "Packages %s can not be installed"
+msgstr "%s paketlarini o'rnatib bo'lmaydi"
+
#: ../urpm/md5sum.pm:23
#, c-format
msgid "examining %s file"
@@ -726,7 +815,7 @@ msgstr ""
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr ""
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr ""
@@ -817,7 +906,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Qidirish boshi: %s oxiri: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "bog'liklarni aniqlash uchun ikkinchi bosqich bajarilmoqda\n"
@@ -882,149 +971,154 @@ msgstr ""
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr ""
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "to'plam olib tashlanmoqda: \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "to'plam uchun urpmi qaytadan moslanmoqda: \"%s\""
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...qaytadan moslash muvaffaqiyatsiz tugadi"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "...qaytadan moslash tugadi"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "to'plamni yangilash hojati yo'q: \"%s\""
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "hdlist fayli (%s) tekshirilmoqda"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "synthesis fayli (%s) tekshirilmoqda"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "[%s] hdlist fayli yaratilmoqda"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr ""
"to'plamining hdlist yoki synthesis faylini o'qishda muammo ro'y berdi: \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr ""
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...nusxa ko'chirish muvaffaqiyatsiz tugadi"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr ""
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...nusxa ko'chirish bajarildi"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, 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:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr ""
"to'plamning olingan hdlist (yoki synthesis) faylining md5sum'i hisoblanmoqda"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "%s'dan nusxa ko'chirish muvaffaqiyatsiz tugadi (md5sum noto'g'ri)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr ""
"olingan hdlist (yoki synthesis) fayli uchun md5sum soni hisoblanmoqda..."
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...olish muvaffaqiyatsiz tugadi: md5sum mos kelmadi"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "%s'dan RPM-fayllar topilmadi"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "RPM-fayllari %s'dan o'qilmoqda"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "[%s]: %s'dan RPM-fayllarni o'qib bo'lmadi"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1032,74 +1126,74 @@ msgid ""
"medium."
msgstr ""
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "to'plamning hdlist fayli %s xato: %s"
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "'%s' uchun hdlist (yoki synthesis) fayli yozib olinmoqda..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "qidirilgan hdlist (yoki synthesis) fayli topildi: %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "to'plam uchun hech qanday hdlist fayli topilmadi: \"%s\""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "'%s' uchun pubkey fayli tekshirilmoqda..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr ""
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "'%s' uchun pubkey faylini import qilib bo'lmadi"
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "to'plam uchun ro'yxat fayli yozilmoqda: \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, c-format
msgid "updated medium \"%s\""
msgstr "to'plam yangilandi: \"%s\""
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr ""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, 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:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "to'plamidan xederlar o'qilmoqda: \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "JjJjNn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "HhHhYy"
@@ -1159,47 +1253,52 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "to'plamga murojaat qilib bo'lmadi: \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "%s nomli paket mavjud emas"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Quyidagi paketlarda %s bor: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "%s yetishmaganiga ko'ra"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "%s paketi allaqachon o'rnatilgan"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr ""
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "%s'ni qoldirish uchun"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "%s'ni o'rnatish uchun"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr ""
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr ""
@@ -1219,6 +1318,16 @@ msgstr ""
msgid "Missing signature (%s)"
msgstr "Imzo yetishmaydi (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Moslama faylini (%s) yaratib bo'lmadi"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Nusxa ko'chirish muvaffaqiyatsiz tugadi"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1235,8 +1344,8 @@ msgstr ""
"\n"
"Foydalanish:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1253,18 +1362,18 @@ msgstr ""
" --test - olib tashlashni to'g'ri bajarish imkoniyatini "
"tekshirish.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr ""
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr ""
@@ -1274,8 +1383,8 @@ msgstr ""
msgid " --root - use another root for rpm removal.\n"
msgstr ""
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
@@ -1292,17 +1401,17 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - synthesis faylidan foydalanish.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - hdlist faylidan foydalanish.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - ortiqcha xabarlar bilan.\n"
@@ -1312,37 +1421,37 @@ msgstr " --verbose, -v - ortiqcha xabarlar bilan.\n"
msgid " -a - select all packages matching expression.\n"
msgstr ""
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Paketlarni faqat root olib tashlashi mumkin"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "Noma'lum paketlar"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "noma'lum paket"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "paketni (%s) olib tashlash tizimni ishdan chiqaradi"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "O'chirish uchun hech narsa yo'q"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Quyidagi paketlarni olib tashlash uchun tekshirish bajarilmoqda"
-#: ../urpme:134
+#: ../urpme:131
#, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1350,23 +1459,23 @@ msgid_plural ""
msgstr[0] ""
"Bog'liqliklarni ta'minlash uchun quyidagi %d-ta paket olib tashlanadi"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr " (%d Mb)"
-#: ../urpme:138
+#: ../urpme:135
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "%d-ta paketni olib tashlashni istaysizmi?"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (h/Y) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "O'chirish muvaffaqiyatsiz tugadi"
@@ -1392,12 +1501,12 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr ""
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1410,14 +1519,14 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../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"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1428,7 +1537,7 @@ msgstr ""
msgid " --use-distrib - use the given path to access media\n"
msgstr " --synthesis - ko'rsatilgan synthesis faylidan foydalanish.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - ko'rsatilgan synthesis faylidan foydalanish.\n"
@@ -1438,7 +1547,7 @@ msgstr " --synthesis - ko'rsatilgan synthesis faylidan foydalanish.\n"
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - bir xil qatorlar ko'rsatilmasin.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - faqat yangilash to'plamidan foydalanish.\n"
@@ -1569,88 +1678,98 @@ msgid " --group - group\n"
msgstr " --group - guruh\n"
#: ../urpmf:72
+#, fuzzy, c-format
+msgid " --license - license\n"
+msgstr " --name - paketning nomi\n"
+
+#: ../urpmf:73
#, c-format
msgid " --name - package name\n"
msgstr " --name - paketning nomi\n"
-#: ../urpmf:73
+#: ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr ""
-#: ../urpmf:74
+#: ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr ""
-#: ../urpmf:75
+#: ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr ""
-#: ../urpmf:76
+#: ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr ""
-#: ../urpmf:77
+#: ../urpmf:78
#, c-format
msgid " --size - installed size\n"
msgstr ""
-#: ../urpmf:78
+#: ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr ""
-#: ../urpmf:79
+#: ../urpmf:80
+#, c-format
+msgid " --suggests - suggests tags\n"
+msgstr ""
+
+#: ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr ""
-#: ../urpmf:80
+#: ../urpmf:82
#, c-format
msgid " --url - url\n"
msgstr ""
-#: ../urpmf:81
+#: ../urpmf:83
#, c-format
msgid " --vendor - vendor\n"
msgstr ""
-#: ../urpmf:82
+#: ../urpmf:84
#, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -m - paket qaysi to'plamda topilganini ko'rsatish\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1666,60 +1785,60 @@ msgstr ""
"\n"
"Foydalanish:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr " --auto-select - tizimni yangilash uchun paketlarni avto-tanlash.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr ""
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr ""
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
"installation.\n"
msgstr ""
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr ""
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
" packages that lead to removals.\n"
msgstr ""
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1727,137 +1846,143 @@ msgid ""
" default is %d.\n"
msgstr ""
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr ""
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr ""
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr ""
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - avvalo paketlarni keshdan olib tashlash.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - paketlar keshdan olib tashlanmasin.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
" dependencies checking.\n"
msgstr ""
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
" dependencies checking and integrity.\n"
msgstr ""
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr ""
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
" to install a chroot with --root option.\n"
msgstr ""
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr ""
" --wget - masofadagi fayllarni olish uchun wget dasturini "
"ishlatish.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr ""
" --curl - masofadagi fayllarni olish uchun curl dasturini "
"ishlatish.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr ""
" --prozilla - masofadagi fayllarni olish uchun prozilla dasturini "
"ishlatish.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - paketlarni olish tezligini cheklash.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
" (--no-resume disables it, default is disabled).\n"
msgstr ""
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../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 ""
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
" authentication (format is <user:password>).\n"
msgstr ""
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
" next arg.\n"
msgstr ""
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1868,7 +1993,7 @@ msgstr ""
" (--no-verify-rpm ushbu amalning teskarisi, andoza "
"bo'yicha paketning elektron imzosi tekshiriladi).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
@@ -1876,107 +2001,112 @@ msgid ""
msgstr ""
" --test - o'rnatishni to'g'ri bajarish imkoniyatini tekshirish.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr ""
" --excludepath - ko'rsatilgan, vergul bilan ajratilgan, yo'llardan "
"foydalanilmasin.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - qo'llanma fayllarsiz.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --ignoresize - o'rnatishdan avval diskda yetarli bo'sh joy borligi "
"tekshirilmasin.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr ""
-#: ../urpmi:145
+#: ../urpmi:142
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr ""
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
-#: ../urpmi:148
+#: ../urpmi:145
+#, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr ""
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:150
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr ""
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
-#: ../urpmi:155
+#: ../urpmi:153
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr ""
-#: ../urpmi:157
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
-#: ../urpmi:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr ""
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr ""
@@ -1986,53 +2116,55 @@ msgstr ""
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr "To'plam yangilanmoqda...\n"
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (yangilash)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (yangilash)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (o'rnatish)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, c-format
msgid "%s (to install)"
msgstr "%s (o'rnatish)"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "Bog'liqliklarni ta'minlash uchun quyidagi %d-ta paket olib tashlanadi"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Nimani tanlaysiz? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2043,7 +2175,7 @@ msgstr ""
"paketlardan ko'ra eskiroq paketlarga bog'liq:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2054,7 +2186,7 @@ msgstr ""
"paketlardan ko'ra eskiroq paketlarga bog'liq:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, c-format
msgid ""
"\n"
@@ -2063,12 +2195,12 @@ msgstr ""
"\n"
"Bunga qaramasdan davom etishni istaysizmi?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (H/y) "
-#: ../urpmi:503
+#: ../urpmi:520
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2077,7 +2209,7 @@ msgstr ""
"Talab qilingan paketni o'rnatib bo'lmaydi:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2086,7 +2218,7 @@ msgstr ""
"Talab qilingan ba'zi bir paketlarni o'rnatib bo'lmaydi:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2097,7 +2229,7 @@ msgstr ""
"uchun quyidagi paketni olib tashlash kerak:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2108,7 +2240,7 @@ msgstr ""
"uchun quyidagi paketlarni olib tashlash kerak:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2117,7 +2249,7 @@ msgstr ""
"Boshqa paketlarni yangilash uchun quyidagi paketni olib tashlash kerak:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2126,12 +2258,17 @@ msgstr ""
"Boshqa paketlarni yangilash uchun quyidagi paketlarni olib tashlash kerak:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(sinov usuli, hech narsa olib tashlanmaydi)"
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2140,109 +2277,28 @@ msgstr ""
"Quyidagi bog'liqliklarni o'rnatish uchun siz root bo'lishingiz kerak:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(sinov usuli, hech narsa o'rnatilmaydi)"
-#: ../urpmi:597
+#: ../urpmi:617
#, 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:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Tayyor bo'lganda ENTER tugmasini bosing..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Bekor qilish"
-#: ../urpmi:671
-#, c-format
-msgid "The following package has bad signature"
-msgstr "Quyidagi paketning imzosi xato"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Quyidagi paketlarning imzolari noto'g'ri"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "O'rnatishni davom etishni istaysizmi?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "O'rnatish muvaffaqiyatsiz tugadi"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr ""
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "o'rnatilmoqda: %s, qaerdan: %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "%s o'rnatilmoqda"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Bog'liqliklarni tekshirmasdan o'rnatib ko'raymi? (h/Y) "
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr ""
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "O'rnatish muvaffaqiyatsiz tugadi"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "O'rnatish mumkin"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr "Paketlarni yangilash muhtoji yo'q"
-
-#: ../urpmi:838
-#, c-format
-msgid "Package %s is already installed"
-msgstr "%s paketi allaqachon o'rnatilgan"
-
-#: ../urpmi:839
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "%s paketlari allaqachon o'rnatilgan"
-
-#: ../urpmi:842
-#, c-format
-msgid "Package %s can not be installed"
-msgstr "%s paketini o'rnatib bo'lmaydi"
-
-#: ../urpmi:843
-#, c-format
-msgid "Packages %s can not be installed"
-msgstr "%s paketlarini o'rnatib bo'lmaydi"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "urpmi qaytadan ishga tushmoqda"
@@ -2363,32 +2419,32 @@ msgstr " -v - ortiqcha xabarlar bilan.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "to'plamni yangilab bo'lmadi: \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Paketlar to'plamini faqat root qo'shishi mumkin"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, c-format
msgid "creating config file [%s]"
msgstr "moslama fayli (%s) yaratilmoqda"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "Moslama faylini (%s) yaratib bo'lmadi"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr ""
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
@@ -2397,17 +2453,17 @@ msgstr ""
"\n"
"\"%s\" to'plamini qo'shishni istaysizmi?"
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "synthesis/hdlist fayliga nisbiy yo'l ko'rsatilmagan\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr "Masofadagi to'plam uchun %s amalidan foydalanib bo'lmaydi"
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "to'plamni yaratib bo'lmadi: \"%s\"\n"
@@ -2566,19 +2622,19 @@ msgstr " -a - hamma to'plamlarni tanlash.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr ""
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "To'plamni faqat root olib tashlashi mumkin"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr ""
"olib tashlash uchun hech narsa yo'q (to'plamni qo'shish\n"
"uchun urpmi.addmedia buyrug'idan foydalaning)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2632,19 +2688,19 @@ msgstr ""
msgid " -f - force updating synthesis/hdlist\n"
msgstr ""
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Faqat boshqaruvchi (root ) to'plami yangilashi mumkin"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
"yangilash uchun hech narsa yo'q (to'plamni qo'shish uchun\n"
"urpmi.addmedia buyrug'idan foydalaning)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2653,22 +2709,22 @@ msgstr ""
"yangilash parametri yetishmayapti\n"
"(quyidagilardan bittasi: %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "to'plamga e'tibor berilmaydi: \"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr ""
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2684,195 +2740,206 @@ msgstr ""
"\n"
"Foydalanish:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
"packages.\n"
msgstr ""
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr ""
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - mavjud bo'lgan paketlar ro'yxatini ko'rsatish.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - mavjud bo'lgan to'plamlar ro'yxatini ko'rsatish.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr ""
" --list-url - mavjud bo'lgan to'plam va uning URL'ni ko'rsatish.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr ""
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr ""
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr ""
-#: ../urpmq:68
+#: ../urpmq:65
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr ""
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
" This permit to querying a distro.\n"
msgstr ""
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr ""
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr ""
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr ""
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
" - extended reverse search (includes virtual packages).\n"
msgstr ""
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -l - paketdagi fayllarni ko'rsatish.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr ""
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr ""
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr ""
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - paketdagi fayllarni ko'rsatish.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, c-format
msgid " -m - equivalent to -du\n"
msgstr ""
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr ""
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
msgstr ""
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes'dan faqat --parallel bilan birga foydalanib bo'ladi"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Changelog fayli topilmadi\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Quyidagi paketlarning imzolari noto'g'ri:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "O'rnatishni davom ettirishni istaysizmi?"
+
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "--use-distrib amalidan foydalanish uchun root bo'lish shart"
diff --git a/po/vi.po b/po/vi.po
index 310e358b..ea5d322d 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+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"
@@ -15,7 +15,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "Cài đặt RPM"
@@ -25,7 +25,7 @@ msgstr "Cài đặt RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "_OK"
@@ -91,7 +91,7 @@ msgstr "_Cài đặt"
msgid "_Save"
msgstr "_Lưu"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "Bỏ _qua"
@@ -113,17 +113,17 @@ msgstr ""
msgid "No packages specified"
msgstr "không có gói tin với tên %s"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Hãy chờ..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "Phải là root"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -134,42 +134,42 @@ msgstr ""
"%s\n"
"Tiếp tục?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Cảnh báo"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "OK"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr "(để nâng cấp)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr "(để cài đặt)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, 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:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "Hủy _bỏ"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -180,58 +180,60 @@ msgstr ""
"%s\n"
"Tiếp tục?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, 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:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, 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:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d các gói, %d MB)"
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Cài đặt gói..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, 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:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Đang chuẩn bị..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Đang cài đặt gói `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Hãy nạp phương tiện có tên \"%s\" trên thiết bị [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Đang tải về gói `%s'..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Các gói sau đây có chữ ký sai:\n"
-"%s\n"
-"\n"
-"Bạn muốn tiếp tục cài đặt không?"
+msgid "_Done"
+msgstr "H_oàn thành"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -242,41 +244,27 @@ msgstr ""
"%s\n"
"Có thể bạn nên cập nhật cơ sở dữ liệu của urpmi."
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "gỡ bỏ %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Đang chuẩn bị..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Đang cài đặt gói `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "H_oàn thành"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Cài đặt không được"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "Mọi thứ đã được cài đặt rồi"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "Kết thúc cài đặt"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "gỡ bỏ %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -311,7 +299,7 @@ msgstr " -g - in ra các nhóm với tên.\n"
msgid " defaults to %s.\n"
msgstr " mặc định là %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, 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"
@@ -321,98 +309,98 @@ 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:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "không thể mở rpmdb"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "tên tập tin rpm [%s] không hợp lệ"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "đang thu thập tập tin rpm [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...hoàn thành việc thu thập"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...không thu thập được: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "không thể truy cập tập tin rpm [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, 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:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "không thể đăng ký tập tin rpm"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "lỗi đăng ký các gói tin cục bộ"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, 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:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr ""
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, 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:421
+#: ../urpm/args.pm:407
#, c-format
-msgid "Can't use %s without %s"
+msgid "chroot directory doesn't exist"
msgstr ""
#: ../urpm/args.pm:424
#, c-format
+msgid "Can't use %s without %s"
+msgstr ""
+
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "build tập tin tổng hợp hdlist cho phương tiện \"%s\""
@@ -601,7 +589,12 @@ msgstr "Không tìm thấy gói tin %s."
msgid "malformed URL: [%s]"
msgstr "input bất thường: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "đang thu thập các tập tin rpm từ phương tiện \"%s\"..."
@@ -611,7 +604,7 @@ msgstr "đang thu thập các tập tin rpm từ phương tiện \"%s\"..."
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -619,37 +612,42 @@ 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:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "không thể tạo phiên giao dịch"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, 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:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "thêm gói %s (id=%d, eid=%d, cập nhật=%d, tập tin=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "không thể cài đặt gói %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "gỡ bỏ gói %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "gỡ bỏ gói %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "cài đặt %s từ %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Thêm thông tin cho gói %s"
@@ -679,11 +677,102 @@ msgstr "không có gói tin với tên %s"
msgid "Cannot connect to ldap uri:"
msgstr ""
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "cơ sở dữ liệu urpmi bị khóa"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Cảnh báo"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "cơ sở dữ liệu urpmi bị khóa"
+#: ../urpm/main_loop.pm:99
+#, 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:100
+#, 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:101
+#, 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:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Cài đặt không được"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "phân phối %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "cài đặt %s từ %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "đang cài đặt %s"
+
+#: ../urpm/main_loop.pm:187
+#, 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:205
+#, 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:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d phiên giao dịch cài đặt lỗi"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Có khả năng cài đặt"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "Mọi thứ đã được cài đặt rồi"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Mọi thứ đã được cài đặt rồi"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "Mọi thứ đã được cài đặt rồi"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Mọi thứ đã được cài đặt rồi"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -733,7 +822,7 @@ msgstr "đang thử chọn phương tiện không tồn tại \"%s\""
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "build tập tin tổng hợp hdlist cho phương tiện \"%s\""
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "không thể truy cập tập tin hdlist của \"%s\", phương tiện bị bỏ qua"
@@ -826,7 +915,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Tìm kiếm bắt đầu: %s kết thúc: %s "
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "thực hiện pass thứ hai để tính toán các phụ thuộc\n"
@@ -892,67 +981,72 @@ 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:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, 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:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "đang chọn đa phương tiện: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "gỡ bỏ phương tiện \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, 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:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...không cấu hình lại được"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "hoàn thành việc cấu hình lại"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "phương tiện \"%s\" không được chọn"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "đang kiểm tra tập tin hdlist [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "đang kiểm tra tập tin tổng hợp [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "building hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -961,77 +1055,77 @@ msgstr ""
"Không thể build tập tin synthesis cho phương tiện \"%s\". Tập tin hdlist có "
"thể bị hỏng."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "trục trặc khi đọc tập tin synthesis hay hdlist của phương tiện \"%s\""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, 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:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...sao chép không được"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "đang sao chép tập tin mô tả của \"%s\"..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...sao chép hoàn thành"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, 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:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "tính toán md5sum của hdlist (hoặc synthesis) nguồn được sao chép"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "Lỗi bản sao của [%s] (md5sum không so khớp)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "tính toán md5sum của hdlist (hoặc synthesis) nguồn thu thập được"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...không thu thập được: md5sum không khớp"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "không tìm thấy các tập tin rpm từ [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "đang đọc các tập tin rpm từ [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "không thể đọc các tập tin rpm từ [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "không có đọc rpms"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1041,67 +1135,67 @@ msgstr ""
"không thể truy cập phương tiện \"%s\",\n"
"Truy cập được nếu bạn tự gắn kết thư mục khi tạo phương tiện."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, 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:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "đang thu thập hdlist (hoặc synthesis) nguồn của \"%s\"..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "đã tìm thấy hdlist (hoặc synthesis) nguồn được dò là %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist 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:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "đang kiểm tra tập tin pubkey của \"%s\"..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, 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:1553
+#: ../urpm/media.pm:1560
#, 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:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "đang ghi tập tin danh sách cho phương tiện \"%s\""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "đã thêm phương tiện %s"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "không thể phân tích tập tin hdlist của \"%s\""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, 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:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "đang đọc các header từ phương tiện \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "NnKk"
@@ -1111,8 +1205,8 @@ 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:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "YyVvDdCc"
@@ -1174,47 +1268,52 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "không thể truy cập phương tiện \"%s\""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Không có gói tin với tên %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Các gói tin sau đây chứa %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "do thiếu %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Mọi thứ đã được cài đặt rồi"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "vì không thỏa mãn %s"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "thử xúc tiến %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "để giữ %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "để cài đặt %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "vì xung đột với %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "thôi yêu cầu"
@@ -1234,6 +1333,16 @@ msgstr "Key ID không hợp lệ (%s)"
msgid "Missing signature (%s)"
msgstr "Thiếu chữ ký (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "không thể ghi tập tin [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Sao chép không được"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1251,8 +1360,8 @@ msgstr ""
"\n"
"Cách dùng:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1268,7 +1377,7 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - xác minh nếu việc gỡ bỏ có thể được lưu trữ chính xác.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
@@ -1276,12 +1385,12 @@ msgstr ""
" --force - ép buộc cầu viện ngay cả khi một số gói tin không tồn "
"tại.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
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:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --packager - in ra tag packager: packager.\n"
@@ -1291,8 +1400,8 @@ msgstr " --packager - in ra tag packager: packager.\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - dùng root khác để thực hiện gỡ bỏ rpm.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - dùng root khác để thực hiện cài đặt rpm.\n"
@@ -1311,17 +1420,17 @@ 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:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - thử tìm và sử dụng tập tin synthesis.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - thử tìm và sử dụng tập tin hdlist.\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - phương thức verbose.\n"
@@ -1331,60 +1440,60 @@ msgstr " --verbose - phương thức verbose.\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - chọn toàn bộ các gói tin khớp với sự diễn đạt.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Chỉ có superuser mới được phép gỡ bỏ các gói"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "các gói tin không xác định "
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "gói tin không xác định"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, 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"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Không có gì để gỡ bỏ"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Đang kiểm tra để gỡ bỏ các gói tin sau đây"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, 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] "Để thỏa mãn các phụ thuộc, %d gói sau đây sẽ được gỡ bỏ (%d MB)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "gỡ bỏ gói %s"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (Có/Không) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Gỡ bỏ không được"
@@ -1411,12 +1520,12 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --help - in thông tin trợ giúp này.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr " --env - dùng môi trường riêng (điển hình là báo cáo lỗi).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1429,13 +1538,13 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../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"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1448,7 +1557,7 @@ msgstr ""
msgid " --use-distrib - use the given path to access media\n"
msgstr " --synthesis - dùng synthesis nhận được thay cho urpmi db.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - dùng synthesis nhận được thay cho urpmi db.\n"
@@ -1458,7 +1567,7 @@ msgstr " --synthesis - dùng synthesis nhận được thay cho urpmi db.\n"
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - không in ra các dòng giống nhau.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - chỉ dùng phương tiện cập nhật.\n"
@@ -1594,75 +1703,85 @@ msgstr " --group - in ra nhóm tag: nhóm.\n"
#: ../urpmf:72
#, fuzzy, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr " --name - chỉ in ra tên gói.\n"
#: ../urpmf:73
#, fuzzy, c-format
+msgid " --name - package name\n"
+msgstr " --name - chỉ in ra tên gói.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - in ra các dòng tag: toàn bộ dòng.\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, fuzzy, c-format
msgid " --packager - packager\n"
msgstr " --packager - in ra tag packager: packager.\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, fuzzy, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - in ra cung cấp tag: toàn bộ các cung cấp.\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, fuzzy, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - in ra yêu cầu tag: toàn bộ các yêu cầu.\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, fuzzy, c-format
msgid " --size - installed size\n"
msgstr " --size - in ra kích thước tag: kích thước.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, fuzzy, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - in ra tag sourcerpm: source rpm.\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - in ra các dòng tag: toàn bộ dòng.\n"
+
+#: ../urpmf:81
#, fuzzy, c-format
msgid " --summary - summary\n"
msgstr " --summary - in ra tóm tắt tag: tóm tắt.\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, fuzzy, c-format
msgid " --url - url\n"
msgstr " --url - in ra tag url: url.\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, fuzzy, c-format
msgid " --vendor - vendor\n"
msgstr " --verbose - phương thức verbose.\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, fuzzy, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -l - liệt kê các tập tin trong gói tin.\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - in phiên bản, phát hành và arch với tên.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "đang dùng môi trường đặc hiệu trên %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1671,12 +1790,12 @@ msgstr ""
"Lưu ý: vì không có phương tiện được tìm kiếm dùng hdlists, urpmf không thể "
"trả lại kết quả\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Bạn có thể muốn dùng --name để tìm tên gói tin.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1693,7 +1812,7 @@ msgstr ""
"\n"
"Cách dùng:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, fuzzy, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1701,35 +1820,35 @@ msgstr ""
" --searchmedia - chỉ dùng phương tiện được cho để tìm kiếm hay nâng cấp "
"các gói.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr " --auto-select - tự động chọn các gói tin để nâng cấp hệ thống.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr " --auto-select - tự động chọn các gói tin để nâng cấp hệ thống.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, fuzzy, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - không thực hiện kiểm tra tập tin MD5SUM.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, fuzzy, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - ép buộc cập nhật cho gpg key.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1738,12 +1857,12 @@ msgstr ""
" --no-uninstall - không bao giờ đề nghị gỡ cài đặt một gói, huỷ bỏ việc cài "
"đặt.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - không cài đặt, chỉ tải về các gói\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1752,7 +1871,7 @@ msgstr ""
" --keep - giữ gói đang tồn tại nếu có thể, bỏ các gói yêu cầu\n"
" dẫn đến việc gỡ bỏ.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1764,37 +1883,43 @@ msgstr ""
" có sẽ được cài đặt hay nâng cấp,\n"
" mặc định là %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - độ dài phiên giao dịch nhỏ, mặc định là %d.\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, fuzzy, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy - tác động tìm kiếm fuzzy (giống như -y).\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, fuzzy, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src - gói tin tiếp theo là gói nguồn (giống như -s).\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr " --install-src - chỉ cài đặt gói nguồn (không cài gói nhị phân).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - gỡ bỏ rpm khỏi cache trước tiên.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - không xóa rpms khỏi cache.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1803,7 +1928,7 @@ msgstr ""
" --allow-nodeps - cho phép hỏi người dùng cài đặt các gói tin\n"
" mà không kiểm tra các phụ thuộc.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1812,12 +1937,12 @@ msgstr ""
" --allow-force - cho phép hỏi người dùng cài đặt các gói tin mà\n"
" không kiểm tra các phụ thuộc và tính toàn vẹn.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - dùng root khác để thực hiện cài đặt rpm.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1826,47 +1951,47 @@ msgstr ""
" --use-distrib - cấu hình nhanh chóng urpmi từ một distrib tree, giúp\n"
" cài đặt chroot bằng tùy chọn --root.\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - dùng wget để thu thập các tập tin ở xa.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - dùng curl để thu thập các tập tin ở xa.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, fuzzy, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --curl - dùng curl để thu thập các tập tin ở xa.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - giới hạn tốc độ tải xuống.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1875,7 +2000,7 @@ msgstr ""
" --resume - tiếp tục truyền tải lại các tập tin đang tải về dở dang\n"
" (--no-resume lài không tiếp tục lại, mặc định là không).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1885,7 +2010,7 @@ msgstr ""
" là 1080 theo mặc định (định dạng là <proxyhost[:port]"
">).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1894,7 +2019,7 @@ msgstr ""
" --proxy-user - chỉ định người dùng và mật khẩu cho proxy\n"
" xác thực (khuôn dạng là <user:password>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1903,7 +2028,7 @@ msgstr ""
" --bug - xuất ra báo cáo lỗi trong thư mục được chỉ định\n"
" bởi đối số (arg) tiếp theo.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, fuzzy, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1912,46 +2037,51 @@ 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"
-#: ../urpmi:140
+#: ../urpmi:137
#, fuzzy, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr " --test - xác minh nếu việc cài đặt đạt kết quả tốt.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - gồm đường dẫn được tách biệt bằng dấu phẩy.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - trừ các tập tin tài liệu.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, fuzzy, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --no-uninstall - không bao giờ đề nghị gỡ cài đặt một gói, huỷ bỏ việc cài "
"đặt.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --url - in ra tag url: url.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - in ra mô tả tag: mô tả.\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, 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:148
+#: ../urpmi:145
+#, 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:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1960,60 +2090,60 @@ 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:150
+#: ../urpmi:148
#, fuzzy, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --noclean - không xóa rpms khỏi cache.\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, 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:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, 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:153
+#: ../urpmi:151
#, 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"
-#: ../urpmi:154
+#: ../urpmi:152
#, 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"
-#: ../urpmi:155
+#: ../urpmi:153
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - chế độ yên lặng.\n"
-#: ../urpmi:157
+#: ../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:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, 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:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2022,7 +2152,7 @@ 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:244
+#: ../urpmi:242
#, 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"
@@ -2032,7 +2162,7 @@ msgstr "Không thể tạo thư mục [%s] cho báo cáo lỗi"
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2041,46 +2171,48 @@ msgstr ""
"Lỗi: %s được mount là read-only.\n"
"Dùng --allow-force để ép hoạt động."
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "(để nâng cấp)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "(để nâng cấp)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "(để cài đặt)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "(để cài đặt)"
-#: ../urpmi:447
+#: ../urpmi:454
#, 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:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Bạn lựa chọn gì? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2091,7 +2223,7 @@ msgstr ""
"gói cũ hơn các gói đã cài đặt:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2102,19 +2234,19 @@ msgstr ""
"gói cũ hơn các gói đã cài đặt:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Vẫn tiếp tục bằng bất cứ giá nào?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (Có/Không) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2123,7 +2255,7 @@ msgstr ""
"Không thể cài đặt một số gói tin được yêu cầu:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2132,7 +2264,7 @@ msgstr ""
"Không thể cài đặt một số gói tin được yêu cầu:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2143,7 +2275,7 @@ msgstr ""
"để nâng cấp các gói khác:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2154,7 +2286,7 @@ msgstr ""
"để nâng cấp các gói khác:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2163,7 +2295,7 @@ msgstr ""
"Các gói sau đây phải được gỡ bỏ để nâng cấp các gói khác:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2172,12 +2304,17 @@ 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:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2186,109 +2323,28 @@ msgstr ""
"Bạn phải là root để cài đặt các phụ thuộc sau đây:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
-#: ../urpmi:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Nhấn Enter khi sẵn sàng ..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Bỏ qua"
-#: ../urpmi:671
-#, 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"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Các gói tin sau đây có các chữ ký tồi"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Bạn muốn tiếp tục cài đặt không ?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Cài đặt không được"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "phân phối %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "cài đặt %s từ %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "đang cài đặt %s"
-
-#: ../urpmi:759
-#, 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)"
-
-#: ../urpmi:776
-#, fuzzy, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Thử cố gắng cài đặt (--force)? (Có/[Không])"
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d phiên giao dịch cài đặt lỗi"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Có khả năng cài đặt"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Mọi thứ đã được cài đặt rồi"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Mọi thứ đã được cài đặt rồi"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "Mọi thứ đã được cài đặt rồi"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "Mọi thứ đã được cài đặt rồi"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "khởi chạy lại urpmi"
@@ -2420,49 +2476,49 @@ msgstr " -v - chế độ verbose.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "không thể cập nhật phương tiện \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Chỉ có người dùng cao cấp được phép thêm phương tiện"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "Sẽ tạo tập tin cấu hình [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "Không thể tạo tập tin cấu hình [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "không cần cho <đường dẫn liên quan của hdlist> với --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "thiếu <đường dẫn liên quan của hdlist> \n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "không thể tạo phương tiện \"%s\"\n"
@@ -2624,17 +2680,17 @@ msgstr " -a - chọn toàn bộ các phương tiện.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - so khớp mơ hồ ở tên phương tiện.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Chỉ có người dùng cao cấp được phép gỡ bỏ phương tiện"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "Không có gì để gỡ bỏ (dùng urpmi.addmedia để thêm phương tiện)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2692,17 +2748,17 @@ msgstr " -a - chọn toàn bộ các phương tiện lắp trong.\n
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - cố tạo các tập tin hdlist.\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Chỉ có người dùng cao cấp được phép cập nhật phương tiện"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "Không có gì để cập nhật (dùng urpmi.addmedia để thêm phương tiện)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2711,22 +2767,22 @@ msgstr ""
"thiếu mục cập nhật\n"
"(một mục của %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "bỏ qua phương tiện %s"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "bật chạy phương tiện %s"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2743,7 +2799,7 @@ msgstr ""
"\n"
"Cách dùng:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2752,49 +2808,49 @@ msgstr ""
" --searchmedia - chỉ dùng phương tiện được cho để tìm kiếm hay nâng cấp "
"các gói.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - tác động tìm kiếm fuzzy (giống như -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - liệt kê các gói tin hiện có.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - liệt kê phương tiện hiệc có.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - liệt kê các phương tiện hiện có và url của chúng.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr " --list-nodes - liệt kê các node hiện có khi dùng --parallel.\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - liệt kê các alias song song hiện có.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
" --dump-config - dump cấu hình theo dạng của đối số urpmi.addmedia.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr " --src - gói tin tiếp theo là gói nguồn (giống như -s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
@@ -2802,12 +2858,12 @@ msgstr ""
" --sources - đưa toàn bộ các gói nguồn trước khi tải xuống (chỉ cho "
"phép root).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, fuzzy, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --url - in ra tag url: url.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2816,22 +2872,22 @@ msgstr ""
" --use-distrib - cấu hình nhanh urpmi từ một distrib tree.\n"
" Việc này cho phép tra vấn một distro.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - in ra changelog.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, fuzzy, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary - in ra tóm tắt tag: tóm tắt.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - đảo ngược tìm kiếm cho cái yêu cầu gói.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2840,54 +2896,54 @@ msgstr ""
" --whatrequires-recursive\n"
" - tìm kiếm đỏa ngược mở rộng (gồm cả các gói ảo).\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -p - tìm gói tin từ các nhà cung cấp.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - hoàn thành output với gói sẽ được gỡ bỏ.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - tra vấn mở rộng tới các phụ thuộc của gói tin.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - in ra các nhóm với tên.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - in ra thông tin có ích mà người dùng đọc được.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - liệt kê các tập tin trong gói tin.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - chế độ yên lặng.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - in ra phiên bản và phát hành với tên.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - gói tin tiếp theo kà gói nguồn (giống như --src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2896,44 +2952,44 @@ msgstr ""
" -u - bỏ gói tin nếu có phiên bản mới hơn đã được cài đặt "
"rồi.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - tác động tìm kiếm fuzzy (giống như --fuzzy.\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -Y - giống -y, nhưng ép buộc phải khớp chứ hoa thường.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " tên hay tập tin rpm có trong dòng lệnh được yêu cầu.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes chỉ được dùng với --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"Lưu ý: vì không có phương tiện được tìm kiếm dùng hdlists, urpmf không thể "
"trả lại kết quả\n"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2941,11 +2997,22 @@ msgstr ""
"Lưu ý: vì không có phương tiện được tìm kiếm dùng hdlists, urpmf không thể "
"trả lại kết quả\n"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Không thấy changelog\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Các gói sau đây có chữ ký sai:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Bạn muốn tiếp tục cài đặt không?"
+
#, fuzzy
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Bạn phải là root để dùng lệnh này !\n"
@@ -3274,9 +3341,6 @@ msgstr "Không thấy changelog\n"
#~ " --keep - giữ gói đang tồn tại nếu có thể, bỏ các gói yêu cầu\n"
#~ " dẫn đến việc gỡ bỏ.\n"
-#~ msgid "unable to write file [%s]"
-#~ msgstr "không thể ghi tập tin [%s]"
-
#~ msgid ""
#~ " --distrib-XXX - automatically create a medium for XXX part of a\n"
#~ " distribution, XXX may be main, contrib, updates or\n"
diff --git a/po/wa.po b/po/wa.po
index c4e74de8..4848afdf 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+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"
@@ -22,7 +22,7 @@ msgstr ""
"X-Generator: KBabel 1.0.2\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "Astalaedje do pacaedje"
@@ -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:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "'l est bon"
@@ -98,7 +98,7 @@ msgstr "_Astaler"
msgid "_Save"
msgstr "_Schaper"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "_Rinoncî"
@@ -118,17 +118,17 @@ msgstr "Tchuze nén cnoxhowe %s"
msgid "No packages specified"
msgstr "Nou pacaedje di scpecifyî"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "Tårdjîz on pô s' i vos plait..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "Vos dvoz esse root"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -139,42 +139,42 @@ msgstr ""
"%s\n"
"Continouwer tot l' minme avou l' astalaedje?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "Adviertixhmint"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "'l est bon"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (a mete a djoû)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (a-z astaler)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "Tchoezixhaedje des pacaedjes"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "I gn a mezåjhe d' onk des pacaedjes ki shuvèt:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "_Rinoncî"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -186,59 +186,61 @@ msgstr ""
"%s\n"
"Continouwer tot l' minme avou l' astalaedje?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, 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:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, 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:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, 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:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "Astalaedje do pacaedje..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "dji n' a savou prinde les pacaedjes sourdants, dji lai toumer"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Dj' aprestêye..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Dj' astale li pacaedje «%s» (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "S' i vs plait metoz li sopoirt lomé «%s» el éndjin [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "Dj' aberwetêye li pacaedje «%s»..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Les pacaedjes ki shuvèt ont ene mwaijhe sinateure:\n"
-"%s\n"
-"\n"
-"Voloz vs continouwer avou l' astalaedje?"
+msgid "_Done"
+msgstr "_Fwait"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -249,41 +251,27 @@ msgstr ""
"%s\n"
"Vos dvrîz motoit mete a djoû li båze di dnêyes urpmi."
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "dji oistêye li pacaedje %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Dj' aprestêye..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Dj' astale li pacaedje «%s» (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Fwait"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, c-format
msgid "Installation failed:"
msgstr "L' astalåcion a fwait berwete:"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "tot a ddja stî astalé"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "L' astalåcion a fini"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "dji oistêye li pacaedje %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -319,7 +307,7 @@ msgstr " -f - håyner l' no etir do rpm (NVRA).\n"
msgid " defaults to %s.\n"
msgstr " li prémetou est %s.\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Seulmint li super-uzeu a l' droet d' astaler des pacaedjes"
@@ -329,99 +317,99 @@ 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:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "dji n' sai drovi l' båze rpmdb"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
"dj' a trové %d tiestires rpm e muchete, dji oistêye %d tiestires obsoletes"
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "no d' fitchî rpm nén valåbe [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "aberwetaedje di fitchî rpm [%s]..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...l' aberwetaedje a stî comifåt"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...l' aberwetaedje a fwait berwete: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "dji n' sai aveur accès å fitchî rpm [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "dji n' sai analijhî l' fitchî spec «%s» [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "dji n' sai redjîstrer l' fitchî rpm"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Årtchitecteure nén copatibe pol rpm [%s]"
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "åk n' a nén stî tot-z eredjistrant les pacaedjes locås"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, 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:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, 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:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr "li ridant po candjî d' raecene (chroot) n' egzistêye nén"
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, 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:421
+#: ../urpm/args.pm:407
+#, c-format
+msgid "chroot directory doesn't exist"
+msgstr "li ridant po candjî d' raecene (chroot) n' egzistêye nén"
+
+#: ../urpm/args.pm:424
#, c-format
msgid "Can't use %s without %s"
msgstr "Dji n' sai eployî %s sins %s"
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
#, c-format
msgid "Can't use %s with %s"
msgstr "Dji n' sai eployî %s avou %s"
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr "Pår trop d' årgumints\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "dji fwai li fitchî d' sinteze hdlist pol sopoirt «%s»"
@@ -611,7 +599,12 @@ msgstr "li pacaedje %s n' a nén stî trové."
msgid "malformed URL: [%s]"
msgstr "crombe hårdêye: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "aberwetaedje des fitchîs rpms do sopoirt «%s»..."
@@ -621,7 +614,7 @@ msgstr "aberwetaedje des fitchîs rpms do sopoirt «%s»..."
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -629,38 +622,43 @@ msgstr ""
"ahivé ene transaccion po l' astalaedje so %s (oister=%d, astaler=%d, mete a "
"djoû=%d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "dji n' sai ahiver ene transaccion"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, 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:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr ""
"dji radjoute li pacaedje %s (id=%d, eid=%d, metaedje a djoû=%d, fitchîs=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "dji n' sai astaler l' pacaedje %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "dji oistêye li pacaedje %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "dji oistêye li pacaedje %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "oistaedje des rpms astalés (%s) a pårti di %s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "Pus di racsegnes sol pacaedje %s"
@@ -690,11 +688,103 @@ msgstr "Nole båze di defineye"
msgid "Cannot connect to ldap uri:"
msgstr "Dji n' mi sai raloyî å LDAP a l' URI:"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "båze di dnêyes %s serêye"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Adviertixhmint"
+
+#: ../urpm/lock.pm:65
#, c-format
msgid "%s database locked"
msgstr "båze di dnêyes %s serêye"
+#: ../urpm/main_loop.pm:99
+#, c-format
+msgid "The following package has bad signature"
+msgstr "Li pacaedje ki shût a-st ene mwaijhe sinateure"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Les pacaedjes ki shuvèt ont ene mwaijhe sinateure"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Voloz vs continouwer avou l' astalaedje?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "L' astalåcion a fwait berwete"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "dji distribouwe %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "dj' astale %s a pårti di %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "dj' astale %s"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Sayî d' astaler sin verifyî les aloyaedjes? (o/N) "
+
+#: ../urpm/main_loop.pm:205
+#, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "Sayî d' astaler co pus foirt (--force)? (o/N) "
+
+#: ../urpm/main_loop.pm:247
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "I gn a-st avou %d transaccions d' astalaedje k' ont fwait berwete"
+msgstr[1] "I gn a-st avou %d transaccions d' astalaedje k' ont fwait berwete"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "L' astalaedje est possibe"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr "Les pacaedjes sont-st a djoû"
+
+#: ../urpm/main_loop.pm:271
+#, c-format
+msgid "Package %s is already installed"
+msgstr "Li pacaedje %s a ddja stî astalé"
+
+#: ../urpm/main_loop.pm:272
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Les pacaedjes %s ont ddja stî astalés"
+
+#: ../urpm/main_loop.pm:275
+#, c-format
+msgid "Package %s can not be installed"
+msgstr "Li pacaedje %s èn pout nén esse astalé"
+
+#: ../urpm/main_loop.pm:276
+#, c-format
+msgid "Packages %s can not be installed"
+msgstr "Les pacaedjes %s èn polèt nén esse astalés"
+
#: ../urpm/md5sum.pm:23
#, c-format
msgid "examining %s file"
@@ -750,7 +840,7 @@ msgstr "«synthesis» èn divreut nén esse defini (sopoirt «%s»)"
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "«synthesis» divreut esse defini (sopoirt «%s»)"
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "dji n' sai aveur li fitchî hdlist di «%s», dji passe houte do sopoirt"
@@ -845,7 +935,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "Cweraedje kimincî: %s fini: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "dji fwait l' deujhinme passe po carculer les aloyances\n"
@@ -912,67 +1002,72 @@ msgstr ""
"dji n' a savou trover l' sopoirt d' astalaedje (nou fitchî media.cfg di "
"trové)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, 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:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "dji tchoezixh des sopoirts multipes: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "dji bodje li sopoirt «%s»"
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "rapontiaedje d' urpmi pol sopoirt «%s»"
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...li rapontiaedje a fwait berwete"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "li rapontiaedje a stî fwait"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "li sopoirt «%s» est a djoû"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "corwaitaedje do fitchî hdlist [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "corwaitaedje do fitchî d' sinteze [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "dji fwai l' fitchî hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -981,82 +1076,82 @@ msgstr ""
"Dji n' a savou fé l' fitchî d' sinteze pol sopoirt «%s». Motoit ki vosse "
"fitchî hdlist est cron."
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr ""
"åk n' a nén stî tot léjhant li fitchî hdlist ou di sinteze do sopoirt «%s»"
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "dji copeye [%s] pol sopoirt «%s»..."
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...li copiaedje a fwait berwete"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "copiaedje do fitchî di discrijhaedjes di «%s»..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...li copiaedje a stî comifåt"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, 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:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "carculaedje do fitchî «hdlist» (ou del sinteze) ki vént d' esse copyî"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "li copeye di [%s] a fwait berwete (li md5sum ni corespond nén)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr ""
"dji carcule li md5sum do fitchî «hdlist» (ou del sinteze) ki vént d' esse "
"aberweté"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...l' aberwetaedje a fwait berwete: li md5sum ni corespond nén"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "nou fitchî rpm di trové foû di [%s]"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "lijhant les fitchîs rpm foû di [%s]"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "dji n' sai lére les fitchîs rpm foû di [%s]: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "nou rpm di léjhou"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1067,74 +1162,74 @@ msgstr ""
"çoula pout ariver metans si vos avoz monté al mwin li ridant divant di "
"radjouter l' sopoirt d' astalaedje."
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "fitchî hdlist %s nén valide pol sopoirt «%s»"
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "aberwetaedje do sourdant «hdlist» (ou del sinteze) po «%s»..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "«hdlist» (ou sinteze) ki vént d' esse sayî trové come «%s»"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "nou fitchî hdlist di trové pol sopoirt «%s»"
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "corwaitaedje do fitchî avou l' clé publike da «%s»..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, 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:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "dji n' sai aberweter li clé publike da «%s»"
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "dji screye li fitchî d' djivêye («list») pol sopoirt «%s»"
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, c-format
msgid "updated medium \"%s\""
msgstr "sopoirt «%s» metou a djoû"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "dji n' sai analijhî li fitchî hdlist di «%s»"
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, 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:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "dji lét les tiestires do sopoirt «%s»"
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "OoAaYyWw"
@@ -1194,47 +1289,52 @@ msgstr "sopoirt «%s» nén cowerant, metou come bodjåve mins nel est nén vorm
msgid "unable to access medium \"%s\""
msgstr "dji n' sai aveur accès å sopoirt «%s»"
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "Nou pacaedje lomé %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Les pacaedjes ki shuvèt ont å dvins %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "cåze di %s ki n' est nén la"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Li pacaedje %s a ddja stî astalé"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "cåze di %s ki n' est nén satisfyî"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "dji saye di promouvwer %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "po wårder %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "po-z astaler %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "cåze di conflits avou %s"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "nén dmandé"
@@ -1254,6 +1354,16 @@ msgstr "ID di clé nén valide (%s)"
msgid "Missing signature (%s)"
msgstr "I manke li sinateure (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Dji n' sai ahiver l' fitchî d' apontiaedje [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Li copiaedje a fwait berwete"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1271,8 +1381,8 @@ msgstr ""
"\n"
"Po s' è siervi:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../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"
@@ -1288,7 +1398,7 @@ msgstr ""
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - verifyî si l' oistaedje si pout fé comifåt.\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
@@ -1296,14 +1406,14 @@ msgstr ""
" --force - foirci, minme si des pacaedjes k' i gn a n' egzistèt "
"nén.\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
" --parallel - distribouwaedje di l' ovraedje d' urpmi so\n"
" so sacwantès éndjoles defineyes come alias.\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Rifé l' pacaedje divant d' disfacer.\n"
@@ -1313,8 +1423,8 @@ msgstr " --repackage - Rifé l' pacaedje divant d' disfacer.\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - eployî ene ôte raecene po l' oistaedje des rpm.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --urpmi-root - eployî ene ôte raecene po l' astalaedje des rpm.\n"
@@ -1334,17 +1444,17 @@ msgstr ""
" distribucion, ahessåve po (diz)astaler on sistinme\n"
" chroot avou l' tchuze «--root».\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - eployî les fitchîs di sinteze.\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - eployî fitchî «hdlist».\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - môde badjawe.\n"
@@ -1355,37 +1465,37 @@ msgid " -a - select all packages matching expression.\n"
msgstr ""
" -a - tchoezi tos les pacaedjes ki corespondèt al ratourneure.\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Seulmint li super-uzeu a l' droet d' oister des pacaedjes"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "pacaedjes nén cnoxhous"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "pacaedje nén cnoxhou"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "oister li pacaedje %s va spiyî vosse sistinme"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "Rén a oister"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "Verifiaedje po oister les pacaedjes ki shuvèt"
-#: ../urpme:134
+#: ../urpme:131
#, fuzzy, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1397,24 +1507,24 @@ msgstr[1] ""
"Po satisfyî les aloyaedjes, les %d pacaedjes ki shuvèt vont esse disastalés "
"(%d Mo)"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "Oister %d pacaedje?"
msgstr[1] "Oister %d pacaedjes?"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (o/N) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "Li oistaedje a fwait berwete"
@@ -1441,14 +1551,14 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - mostere li modêye do programe.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - eployî on evironmint dné (tipike po les rapoirts di "
"bug).\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1461,13 +1571,13 @@ msgid ""
msgstr ""
" --literal, -l - nén ene erîlêye ratourneure, mins ene tchinne literåle.\n"
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../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"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1482,7 +1592,7 @@ msgstr ""
" --synthesis - eployî l' fitchî d' sinteze diné purade kel\n"
" båze di dnêyes d' urpmi.\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1495,7 +1605,7 @@ msgid " --uniq - do not print identical lines twice.\n"
msgstr ""
" --uniq - èn nén håyner deus côps les royes ki sont les minmes.\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - eployî kel sopoirt di metaedje a djoû.\n"
@@ -1630,81 +1740,93 @@ msgid " --group - group\n"
msgstr " --group - li groupe do pacaedje.\n"
#: ../urpmf:72
+#, fuzzy, c-format
+msgid " --license - license\n"
+msgstr " --name - li no do pacaedje.\n"
+
+#: ../urpmf:73
#, c-format
msgid " --name - package name\n"
msgstr " --name - li no do pacaedje.\n"
-#: ../urpmf:73
+#: ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr ""
" --obsoletes - les vîs pacaedjes (avou ds ôtès nos) replaecîs pa ci-"
"chal.\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr " --packager - li ci k' a fwait l' pacaedje.\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - tot çou k' est ahessî på pacaedje.\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - tot çou k' i gn a mezåjhe po l' pacaedje.\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, c-format
msgid " --size - installed size\n"
msgstr " --size - li grandeu sol deure plake on côp astalé.\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - no do fitchî src.rpm sourdant.\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr ""
+" --obsoletes - les vîs pacaedjes (avou ds ôtès nos) replaecîs pa ci-"
+"chal.\n"
+
+#: ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr " --summary - discrijhaedje rascourti.\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, c-format
msgid " --url - url\n"
msgstr " --url - hårdêye avou des informåcions.\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, c-format
msgid " --vendor - vendor\n"
msgstr " --vendor - vindeu do pacaedje.\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -m - li sopoirt wice ki l' pacaedje a stî trové\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
" -f - mostere li modêye et release, eyet l' årtchitecteure avou "
"l' no.\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
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"
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "eployant on evironmint specifike so %s\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1713,13 +1835,13 @@ msgstr ""
"Note: come nou sopoirt des cis cwerous n' eploye des hdlist, urpmf n' a nén "
"savou rtourner des rzultats\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
"Motoit vos vôrîz eployî «--name» po fé on cweraedje sol no des pacaedjes.\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1736,14 +1858,14 @@ msgstr ""
"\n"
"Po s' è siervi:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
" --searchmedia - eployî rén k' les sopoirts dinés po cweri les pacaedjes.\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
@@ -1752,7 +1874,7 @@ msgstr ""
" --auto - môde nén eteractif, supôze li prémetowe valixhance po "
"totes les kesses.\n"
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
@@ -1760,22 +1882,22 @@ msgstr ""
" --auto-select - tchoezi otomaticmint les pacaedjes pol metaedje a djoû\n"
" do sistinme.\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr " --auto-update - mete a djoû l' sopoirt et poy li sistinme.\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - dismete li verifiaedje di fitchîs MD5SUM.\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - foirci l' metaedje a djoû del clé gpg.\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
@@ -1783,13 +1905,13 @@ msgid ""
msgstr ""
" --no-uninstall - måy dimander po dizastaler on pacaedje, purade rinoncî.\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr ""
" --no-install - nén astaler les pacaedjes (seulmint ls aberweter).\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1798,7 +1920,7 @@ msgstr ""
" --keep - wårder les pacaedjes k' i gn a si c' est possibe,\n"
" rifuzer les dmandes ki oistêyrént des pacaedjes.\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1809,39 +1931,45 @@ msgstr ""
" la di pacaedjes ki vont esse astalés ou metous a djoû,\n"
" li prémetowe valixhance est %d.\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - longueu des ptitès transaccions, (prémetou=%d).\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy, -y - foirci des cweraedjes rishonnants.\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src, -s - li pacaedje shuvant est on pacaedje sourdant.\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
" --install-src - astaler seulmint pacaedjes sourdant (nén les binaires).\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr ""
" --clean - oister del muchete les pacaedjes rpm divant d' ataker.\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - wårder el muchete les pacaedjes rpm nén eployîs.\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1850,7 +1978,7 @@ msgstr ""
" --allow-nodeps - permete k' on dimande a l' uzeu s' i vout astaler\n"
" les pacaedjes sins verifyî les aloyances.\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1860,12 +1988,12 @@ msgstr ""
" les pacaedjes sins verifyî les aloyances nerén\n"
" l' etegrité.\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - eployî ene ôte raecene po l' astalaedje des rpm.\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1875,47 +2003,47 @@ msgstr ""
" distribucion, ahessåve po-z astaler on sistinme chroot\n"
" avou l' tchuze «--root».\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - eployî wget po-z aberweter les fitchî då lon.\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - eployî curl po-z aberweter les fitchî då lon.\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --prozilla - eployî prozilla po-z aberweter les fitchî då lon.\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr " --curl-options - tchuzes di rawete a passer a «curl»\n"
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr " --rsync-options - tchuzes di rawete a passer a «rsync»\n"
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr " --wget-options - tchuzes di rawete a passer a «wget»\n"
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr " --prozilla-options - tchuzes di rawete a passer a «prozilla»\n"
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - limiter li roedeu di l' aberwetaedje.\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1925,7 +2053,7 @@ msgstr ""
"ont\n"
" stî djokés (--no-resume po nel nén fé, prémetou=nén fé).\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1935,7 +2063,7 @@ msgstr ""
" est 1080 (li cogne pol tchuze est <lodjoeprocsi[:pôrt]"
">).\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1945,7 +2073,7 @@ msgstr ""
" l' otintifiaedje sol procsi (li cogne est <uzeu:"
"sicret>).\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1954,7 +2082,7 @@ msgstr ""
" --bug - sicrire on rapoirt di bug dins l' ridant dné come\n"
" årgumint djusse après.\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1963,7 +2091,7 @@ msgstr ""
" --verify-rpm - verifyî li sinateure rpm divant d' astaler.\n"
" (--no-verify-rpm po n' nén l' fé, prémetou=verifyî).\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
@@ -1972,40 +2100,45 @@ msgstr ""
" --test - verifyî si l' astalaedje si pout fé comifåt disk' al "
"fén.\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - tchimins separés pa des comas, a n' nén foyter.\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - èn nén astaler les fitchîs d' documintåcion.\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --ignoresize - èn nén loukî s' i gn a del plaece assez dvant d' "
"astaler.\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr ""
" --ignorearch - permete l' astalaedje di rpms d' ôtès årtchitecteures.\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - èn nén enonder les scripres do pacaedje.\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, 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:148
+#: ../urpmi:145
+#, 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:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2014,65 +2147,65 @@ msgstr ""
" --more-choices - cwand sacwants pacaedjes sont trovés, propoze pus di\n"
" tchuzes ki les prémetowes.\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, 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:151
+#: ../urpmi:149
#, 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:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - eployî --all-matches pol roye di comande.\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, 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"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
" -P - èn nén fé des rcweraedjes ezès aloyances po trover\n"
" on pacaedje.\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - môde taijheu.\n"
-#: ../urpmi:157
+#: ../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:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, 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:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2081,7 +2214,7 @@ msgstr ""
"Li ridant [%s] egzistêye dedja, eployîz è èn ôte po les rapoirts di bugs, "
"oudonbén disfacez l'."
-#: ../urpmi:244
+#: ../urpmi:242
#, 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"
@@ -2091,7 +2224,7 @@ msgstr "dji n' sai askepyî l' ridant [%s] po fé des rapoirts di bug"
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2100,34 +2233,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:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr "Metant a djoû les sopoirts...\n"
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (a mete a djoû)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (a mete a djoû)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (a-z astaler)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, c-format
msgid "%s (to install)"
msgstr "%s (a-z astaler)"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2136,12 +2271,12 @@ msgstr ""
"Po satisfyî les aloyaedjes, les %d pacaedjes ki shuvèt vont esse disastalés "
"(%d Mo)"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Ké tchoezixhoz vs? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2152,7 +2287,7 @@ msgstr ""
"d' ôtes pacaedjes ki sont pus vîs kel ci k' est astalé:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2163,7 +2298,7 @@ msgstr ""
"d' ôtes pacaedjes ki sont pus vîs k' les cis k' sont astalés:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, c-format
msgid ""
"\n"
@@ -2172,12 +2307,12 @@ msgstr ""
"\n"
"Voloz vs tot l' minme continouwer l' astalaedje?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (O/n) "
-#: ../urpmi:503
+#: ../urpmi:520
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2186,7 +2321,7 @@ msgstr ""
"On pacaedje dimandé n' pout nén esse astalé:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2195,7 +2330,7 @@ msgstr ""
"Sacwants pacaedjes dimandés n' polèt nén esse astalés:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2206,7 +2341,7 @@ msgstr ""
"a mezåjhe d' esse oisté po des ôtes esse metous a djoû:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2217,7 +2352,7 @@ msgstr ""
"ont mezåjhe d' esse oistés po des ôtes esse metous a djoû:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2226,7 +2361,7 @@ msgstr ""
"Li pacaedje shuvant a mezåjhe d' esse oisté po des ôtes esse metous a djoû:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2236,12 +2371,17 @@ msgstr ""
"djoû:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, 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:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2250,111 +2390,29 @@ msgstr ""
"Vos dvoz esse root po-z astaler les aloyances shuvantes:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, 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:597
+#: ../urpmi:617
#, 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:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "Tapez so «enter» cwand c' est fwait..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "Rinoncî"
-#: ../urpmi:671
-#, c-format
-msgid "The following package has bad signature"
-msgstr "Li pacaedje ki shût a-st ene mwaijhe sinateure"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Les pacaedjes ki shuvèt ont ene mwaijhe sinateure"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Voloz vs continouwer avou l' astalaedje?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "L' astalåcion a fwait berwete"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "dji distribouwe %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "dj' astale %s a pårti di %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "dj' astale %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Sayî d' astaler sin verifyî les aloyaedjes? (o/N) "
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Sayî d' astaler co pus foirt (--force)? (o/N) "
-
-#: ../urpmi:815
-#, fuzzy, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "I gn a-st avou %d transaccions d' astalaedje k' ont fwait berwete"
-msgstr[1] "I gn a-st avou %d transaccions d' astalaedje k' ont fwait berwete"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "L' astalaedje est possibe"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr "Les pacaedjes sont-st a djoû"
-
-#: ../urpmi:838
-#, c-format
-msgid "Package %s is already installed"
-msgstr "Li pacaedje %s a ddja stî astalé"
-
-#: ../urpmi:839
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Les pacaedjes %s ont ddja stî astalés"
-
-#: ../urpmi:842
-#, c-format
-msgid "Package %s can not be installed"
-msgstr "Li pacaedje %s èn pout nén esse astalé"
-
-#: ../urpmi:843
-#, c-format
-msgid "Packages %s can not be installed"
-msgstr "Les pacaedjes %s èn polèt nén esse astalés"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "renondant urpmi"
@@ -2482,51 +2540,51 @@ msgstr " -v - môde badjawe.\n"
msgid "unable to update medium \"%s\"\n"
msgstr "dji n' pout mete a djoû l' sopoirt «%s»\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr ""
"Seulmint li super-uzeu a l' droet d' radjouter des sopoirts d' astalaedje"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, c-format
msgid "creating config file [%s]"
msgstr "ahivaedje do fitchî d' apontiaedje [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "Dji n' sai ahiver l' fitchî d' apontiaedje [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr ""
"nén mezåjhe di dner li <tchmin relatif pol fitchî hdlist> avou --distrib"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "i manke li tchmin relatif pol fitchî hdlist\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "dji n' pout radjouter l' sopoirt «%s»\n"
@@ -2692,17 +2750,17 @@ msgstr " -a - tchoezi tos les sopoirts.\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - cweraedjes rishonnants so les nos des sopoirts.\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "Seulmint li super-uzeu a l' droet d' oister des sopoirts d' astalaedje"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "rén a disastaler (eployîz urpmi.addmedia po-z adjouter on sopoirt\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2761,18 +2819,18 @@ msgstr ""
" -f - foirci l' metaedje a djoû des fitchîs «hdlist/"
"synthesis».\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr ""
"Seulmint li super-uzeu a l' droet d' mete a djoû des sopoirts d' astalaedje"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "rén a mete a djoû (eployîz urpmi.addmedia po-z adjouter on sopoirt)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2781,22 +2839,22 @@ msgstr ""
"i gn a pont d' intrêye a mete a djoû\n"
"(ene di %s)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "«%s»"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "dj' ignore li sopoirt «%s»"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "dji mete en alaedje li sopoirt «%s»"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2813,7 +2871,7 @@ msgstr ""
"\n"
"Po s' è siervi:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -2821,38 +2879,38 @@ msgid ""
msgstr ""
" --searchmedia - eployî rén k' les sopoirts dinés po cweri les pacaedjes.\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - foirci des cweraedjes rishonnants (come -y).\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - djivêye des pacaedjes k' i gn a.\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - djivêye des sopoirts k' i gn a.\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr ""
" --list-url - djivêye des sopoirts k' i gn a et d' leus hårdêyes.\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr " --list-nodes - djivêye des nuks k' i gn a (eployant --parallel).\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - djivêye des alias k' i gn a.\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
@@ -2860,14 +2918,14 @@ msgstr ""
" --dump-config - copiaedje di l' apontiaedje dizo cogne d' èn årgumint po "
"urpmi.addmedia.\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr ""
" --src - li pacaedje shuvant est on pacaedje sourdant\n"
" (parey ki -s).\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
@@ -2875,13 +2933,13 @@ msgstr ""
" --sources - diner tos les pacaedjes sourdant divant d' aberweter\n"
" (èn pout esse fwait ki pa root).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr ""
" --ignorearch - permete li cweraedje di rpms d' ôtès årtchitecteures.\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2890,24 +2948,24 @@ msgstr ""
" --use-distrib - apontyî urpmi al volêye a pårti d' on coxhlaedje di\n"
" distribucion. Permete di fé des cweraedje des pacaedjes.\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - håyner li djournå des candjmints.\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - håyner l' rascourti.\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr ""
" --whatreqires - fé l' ricweraedje å rviè, so çou k' a mezåjhe do "
"pacaedje.\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2917,7 +2975,7 @@ msgstr ""
" - ricweraedje å rvier sitindou (eto les forveyous "
"pacaedjes).\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
@@ -2926,52 +2984,52 @@ msgstr ""
" -p - permete les rcweraedjes ezès aloyances po trover on "
"pacaedje.\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - rexhowe en etir avou l' pacaedjes a oister.\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr ""
" -d - sitinde li cweraedje åzès aloyances des pacaedjes.\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - håyner les groupes ossu avou l' no.\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - håyner des ahessåvès informåcions, dins ene cogne po les "
"djins.\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - djivêye des pacaedjes k' i gn a.\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, c-format
msgid " -m - equivalent to -du\n"
msgstr " -m - ekivalint a -du.\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - mostere li no, limeros di modêye eyet release.\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - li pacaedje shuvant est on pacaedje sourdant\n"
" (parey ki --src).\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2980,49 +3038,49 @@ msgstr ""
" -u - bodjî l' pacaedje foû del djivêye si ene modêye\n"
" pus nouve est ddja astalêye.\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - foirci des cweraedjes rishonnants (come --fuzzy).\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - come «-y» mins sins fé d' diferince inte grandes et "
"ptitès letes.\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " les nos ou fitchîs rpm dinés sol roye di comande sont rcwerous.\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes pout esse eployî seulmint avou --parallel"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
"pont d' fitchî «hdlist» pol sopoirt «%s», i n' a k' on rzultat parciel pol "
"pacaedje %s"
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"pont d' fitchî «hdlist» pol sopoirt «%s», i n' a k' on rzultat parciel po "
"les pacaedjes %s"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
"pont d' fitchî «hdlist» pol sopoirt «%s», i n' a nou rzultat pol pacaedje %s"
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -3030,11 +3088,22 @@ msgstr ""
"pont d' fitchî «hdlist» pol sopoirt «%s», i n' a nou rzultat po les "
"pacaedjes %s"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "Nou djournå des candjmints di trové\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Les pacaedjes ki shuvèt ont ene mwaijhe sinateure:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Voloz vs continouwer avou l' astalaedje?"
+
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Vos dvoz esse root po pleur eployî «--use-distrib»"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9dc31de5..741ff651 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2007-07-01 14:24+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: Mandriva Linux Simplified Chinese <cooker-i18n@mandrivalinux."
@@ -23,7 +23,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "RPM 安装"
@@ -33,7 +33,7 @@ msgstr "RPM 安装"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "错误: 找不到文件 %s,将取消操作"
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "确定(_O)"
@@ -99,7 +99,7 @@ msgstr "安装(_I)"
msgid "_Save"
msgstr "保存(_S)"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "取消(_C)"
@@ -119,17 +119,17 @@ msgstr "未知的选项 %s"
msgid "No packages specified"
msgstr "未指定软件包"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "请稍候..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "必须是 root"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -140,42 +140,42 @@ msgstr ""
"%s\n"
"仍然继续安装吗?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "警告"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "确定"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr "(升级)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr "(安装)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "软件包选择"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "需要下列软件包之一:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "中止(_A)"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -186,59 +186,60 @@ msgstr ""
"%s\n"
"仍然继续安装吗?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "为了满足依赖关系,将安装下列软件包:"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "为了满足依赖关系,将安装下列软件包:"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d 个软件包,%d MB)"
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "软件包安装..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "无法读取源软件包,中止"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "正在准备..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "正在安装软件包“%s”(%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "请将标签为“%s”的介质插入到设备 [%s]"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "正在下载软件包“%s”..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"下列软件包的签名出现问题:\n"
-"\n"
-"%s\n"
-"\n"
-"您想要继续安装吗?"
+msgid "_Done"
+msgstr "完成(_D)"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -249,41 +250,27 @@ msgstr ""
"%s\n"
"您可能需要更新您的 urpmi 数据库"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "正在删除 %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "正在准备..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "正在安装软件包“%s”(%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "完成(_D)"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, c-format
msgid "Installation failed:"
msgstr "安装失败: "
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "软件包已经安装"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "安装完成"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "正在删除 %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -318,7 +305,7 @@ msgstr " -f - 输出 rpm 的完整名称(NVRA)。\n"
msgid " defaults to %s.\n"
msgstr " 默认为 %s。\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "只允许超级用户安装软件包"
@@ -328,98 +315,98 @@ msgstr "只允许超级用户安装软件包"
msgid "Running urpmi in restricted mode..."
msgstr "正在以限制模式运行 urpmi..."
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "无法打开 rpmdb"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr "在缓存中找到了 %d 个 rpm 头,删除了 %d 个过期头"
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "无效的 rpm 文件名[%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "正在获取 rpm 文件[%s]..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...获取完成"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...获取失败: %s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "无法访问 rpm 文件[%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "无法处理 spec 文件 %s [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "无法访问注册 rpm 文件"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "RPM 的架构不兼容[%s]"
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "注册本地软件包出错"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "运行于限制模式运行时,禁止执行此操作"
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "命令行声明的代理服务器无效\n"
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr "chroot 目录不存在"
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
+#, c-format
+msgid "chroot directory doesn't exist"
+msgstr "chroot 目录不存在"
+
+#: ../urpm/args.pm:424
#, c-format
msgid "Can't use %s without %s"
msgstr "没有 %2$s 无法使用 %1$s"
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
#, c-format
msgid "Can't use %s with %s"
msgstr "无法和 %2$s 一起使用 %1$s"
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr "参数太多\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "创建介质“%s”的 hdlist 综合文件"
@@ -608,7 +595,12 @@ msgstr "未找到软件包 %s。"
msgid "malformed URL: [%s]"
msgstr "URL 格式错误: [%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "正在从介质“%s”上获取 rpm 文件..."
@@ -618,43 +610,48 @@ msgstr "正在从介质“%s”上获取 rpm 文件..."
msgid "[repackaging]"
msgstr "[重新打包]"
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr "已创建在 %s 上安装的交易(删除=%d,安装=%d,升级=%d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "无法创建交易"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "无法从 delta-rpm 软件包 %s 中提取 rpm"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "添加软件包 %s (id=%d, eid=%d, 更新=%d, 文件=%s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "无法安装软件包 %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "删除软件包 %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "删除软件包 %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "正在从 %2$s 删除已安装的 rpm(%1$s)"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "关于软件包 %s 的更多信息"
@@ -684,11 +681,102 @@ msgstr "未定义基础"
msgid "Cannot connect to ldap uri:"
msgstr "无法连接到 ldap uri:"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "%s 数据库已锁定"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "警告"
+
+#: ../urpm/lock.pm:65
#, c-format
msgid "%s database locked"
msgstr "%s 数据库已锁定"
+#: ../urpm/main_loop.pm:99
+#, c-format
+msgid "The following package has bad signature"
+msgstr "下列软件包的签名有错误"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "下列软件包的签名有错误"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "您想继续安装吗?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "安装失败"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "正在分发 %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "正在从 %2$s 安装 %1$s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "正在安装 %s"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
+
+#: ../urpm/main_loop.pm:205
+#, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "尝试强制安装吗(使用 --force)(是(y)/否(N))[否]?"
+
+#: ../urpm/main_loop.pm:247
+#, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d 安装交易失败"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "可以安装"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr "软件包已为最新"
+
+#: ../urpm/main_loop.pm:271
+#, c-format
+msgid "Package %s is already installed"
+msgstr "软件包 %s 已经安装"
+
+#: ../urpm/main_loop.pm:272
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "软件包 %s 已经安装"
+
+#: ../urpm/main_loop.pm:275
+#, c-format
+msgid "Package %s can not be installed"
+msgstr "软件包 %s 无法安装"
+
+#: ../urpm/main_loop.pm:276
+#, c-format
+msgid "Packages %s can not be installed"
+msgstr "软件包 %s 无法安装"
+
#: ../urpm/md5sum.pm:23
#, c-format
msgid "examining %s file"
@@ -736,7 +824,7 @@ msgstr "不应设置“synthesis”(介质“%s”)"
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "应该设置“synthesis”(介质“%s”)"
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "无法访问“%s”的 hdlist 文件,介质被忽略"
@@ -825,7 +913,7 @@ msgstr "注意: 介质“%s”没有 hdlist,无法返回任何结果"
msgid "Search start: %s end: %s"
msgstr "搜索开始: %s 结束: %s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "正在执行第二遍依赖关系的计算\n"
@@ -890,144 +978,149 @@ msgstr "无法分析 media.cfg"
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "无法访问发行版介质(未发现 media.cfg 文件)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "试图选择不存在的介质“%s”"
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "选择多个介质: %s"
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "删除介质“%s”"
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "正在从介质“%s”重新配置 urpmi"
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "...重新配置失败"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "重新配置完成"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "生成名称文件出错: 依赖关系 %d 未找到"
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr "生成名称文件失败: 无法写入文件(%s)"
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "介质“%s”已为最新"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "正在检查 hdlist 文件 [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "正在检查综合文件 [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "正在创建 hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr "无法创建介质“%s”的综合文件。您的 hdlist 文件可能已经损坏。"
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "读取介质“%s”的 hdlist 或综合文件出现问题"
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "正在复制介质“%2$s”的 [%1$s]..."
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...复制失败"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "正在复制“%s”的描述文件..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...复制完成"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "复制 [%s] 失败(文件太小了)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "正在计算已复制源 hdlist(或综合文件)的 md5sum..."
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "复制[%s]失败(md5sum 不匹配)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "正在计算所获取的源 hdlist(或综合文件)的 md5sum"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...获取失败: md5sum 不匹配"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "[%s] 中未发现 rpm 文件"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "正在从[%s]读取 rpm 文件"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "无法从[%s]读取 rpm 文件: %s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "没有读到 rpm"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1037,74 +1130,74 @@ msgstr ""
"无法访问介质“%s”,\n"
"这可能是因为您在创建介质时是手动装载的目录。"
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "介质“%2$s”的 hdlist 文件 %1$s 无效"
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "正在获取“%s”的源 hdlist(或综合文件)..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "发现探测的 hdlist(或综合文件) 为 %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "介质“%s”未发现 hdlist 文件"
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "正在检查“%s”的公共密钥文件..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...从公钥文件“%2$s”中导入了密钥 %1$s"
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "无法导入“%s”的公共密钥文件"
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "正在写入介质“%s”的列表文件"
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, c-format
msgid "updated medium \"%s\""
msgstr "已更新介质“%s”"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "无法处理“%s”的 hdlist 文件"
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "读取介质“%s”的综合文件出现问题"
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "正在从介质“%s”读取头"
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "nN否"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "yY是"
@@ -1164,47 +1257,52 @@ msgstr "非连贯介质“%s”标为可移动但实际不是"
msgid "unable to access medium \"%s\""
msgstr "无法访问介质“%s”"
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "没有叫做 %s 的软件包"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "下列软件包里有 %s: %s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "原因是丢失 %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "软件包 %s 已经安装"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "原因是不满足 %s"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "正在试图推广 %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "为了保留 %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "为了安装 %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "原因是与 %s 冲突"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "未请求"
@@ -1224,6 +1322,16 @@ msgstr "无效的密钥 ID(%s)"
msgid "Missing signature (%s)"
msgstr "缺少签名(%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "无法创建配置文件[%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "复制失败"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1240,8 +1348,8 @@ msgstr ""
"\n"
"用法:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - 打印帮助信息。\n"
@@ -1256,18 +1364,18 @@ msgstr " --auto - 自动选中软件包。\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - 验证删除是否可以正确进行。\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr " --force - 强制执行, 即使某些软件包并不存在。\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - 在多个机器上分布的运行 urpmi。\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - 在删除之前重新对文件打包\n"
@@ -1277,8 +1385,8 @@ msgstr " --repackage - 在删除之前重新对文件打包\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - 使用另一个 root 删除 rpm。\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --urpmi-root - 使用另一个 root 来存储 urpmi db 和安装 rpm。\n"
@@ -1297,17 +1405,17 @@ msgstr ""
" --use-distrib - 从发行版树中实时配置 urpme,特别用于在 --root 选项\n"
" 下安装/卸载 chroot。\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - 使用综合文件。\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - 使用 hdlist 文件。\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - 详细提示。\n"
@@ -1317,60 +1425,60 @@ msgstr " --verbose, -v - 详细提示。\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - 在命令行选择匹配表达式的所有包。\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "只允许超级用户删除软件包"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "未知的软件包"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "未知的软件包"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "如果删除软件包 %s 会破坏您的系统"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "不需要删除任何东西。"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "检查删除下列软件包"
-#: ../urpme:134
+#: ../urpme:131
#, 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] "为满足相关性要求,需要删除下列%d个软件包"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr "(%d MB)"
-#: ../urpme:138
+#: ../urpme:135
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "删除 %d 个软件包吗?"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr "(是(y)/否(N))[否]"
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "删除失败"
@@ -1396,12 +1504,12 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - 打印此工具的版本号。\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr " --env - 使用指定的环境(特别是进行故障报告时)。\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr " --excludemedia - 不使用给定介质,介质之间用逗号分隔。\n"
@@ -1412,12 +1520,12 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr " --literal, -l - 不匹配模式,参数为字面字符串。\n"
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - 只使用列出的介质,介质之间用逗号分隔。\n"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1428,7 +1536,7 @@ msgstr " --sortmedia - 根据用逗号分隔的子字符串排序介质。\n
msgid " --use-distrib - use the given path to access media\n"
msgstr " --use-distrib - 使用给定的路径访问介质\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - 使用指定的综合文件而不是 urpmi db。\n"
@@ -1438,7 +1546,7 @@ msgstr " --synthesis - 使用指定的综合文件而不是 urpmi db。\n"
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - 不打印相同行。\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - 只使用升级介质。\n"
@@ -1569,88 +1677,98 @@ msgid " --group - group\n"
msgstr " --group - 分组\n"
#: ../urpmf:72
+#, fuzzy, c-format
+msgid " --license - license\n"
+msgstr " --name - 软件包名称\n"
+
+#: ../urpmf:73
#, c-format
msgid " --name - package name\n"
msgstr " --name - 软件包名称\n"
-#: ../urpmf:73
+#: ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - obsolets 标签\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr " --packager - 打包者\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - provides 标签\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - requires 标签\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, c-format
msgid " --size - installed size\n"
msgstr " --size - 安装大小\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - 源 rpm 名称\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --obsoletes - obsolets 标签\n"
+
+#: ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr " --summary - 摘要\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, c-format
msgid " --url - url\n"
msgstr " --url - url\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, c-format
msgid " --vendor - vendor\n"
msgstr " --vendor - 提供者\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -m - 软件包所在介质\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - 和名称一起打印版本、发行号和平台。\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "格式不对: 您只能使用一个多值标签"
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "在 %s 使用指定环境\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr "注意: 由于没有介质使用 hdlists 搜索,urpmf 无法返回任何结果\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "您可能想要使用 --name 来搜索软件包名称。\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1666,53 +1784,53 @@ msgstr ""
"\n"
"用法:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
msgstr " --searchmedia - 只使用给定介质来搜索所请求的软件包。\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr " --auto - 非交互模式,对全部问题假定默认回答。\n"
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr " --auto-select - 自动选择升级系统的软件包。\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr " --auto-update - 更新介质后再升级系统。\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - 禁用 MD5SUM 文件检查。\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - 强制更新 gpg 密钥。\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
"installation.\n"
msgstr " --no-uninstall - 从不询问卸载软件包,直接中断安装。\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - 不安装软件包(只下载)。\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1720,7 +1838,7 @@ msgid ""
msgstr ""
" --keep - 如果有可能就保留已有软件包,拒绝导致删除的软件包。\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1730,56 +1848,62 @@ msgstr ""
" --split-level - 如果将要安装或升级的软件包多于给定的软件包,就拆分为\n"
" 较小的交易。默认为 %d。\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - 小交易长度,默认为 %d。\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy, -y - 利用模糊查询。\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src, -s - 下一个软件包是源程序包。\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr " --install-src - 只安装源代码包(无二进制文件)。\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - 首先删除缓存中的 rpm。\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - 不从缓存中清除 rpm。\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
" dependencies checking.\n"
msgstr " --allow-nodeps - 允许要求用户不经过依赖性检验就安装软件包。\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
" dependencies checking and integrity.\n"
msgstr " --allow-force - 允许提示用户安装软件包而不检查依赖性和完整性。\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - 使用另一个 root 安装 rpm。\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1788,47 +1912,47 @@ msgstr ""
" --use-distrib - 从发行版树中实时配置 urpmi,特别用于在 --root 选项\n"
" 下安装 chroot。\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - 用 wget 取远程文件。\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - 用 crul 取远程文件。\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --prizlla - 用 prozilla 取远程文件。\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr " --curl-options - 给 curl 传递额外的选项\n"
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr " --rsync-options- 给 rsync 传递额外的选项\n"
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr " --wget-options - 给 wget 传递额外的选项\n"
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr " --prozilla-options - 给 prozilla 传递额外的选项\n"
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - 降低下载速度。\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1837,7 +1961,7 @@ msgstr ""
" --resume - 续传未下载完成的文件\n"
" (--no-resume 禁用它,默认是禁用的)。\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1846,7 +1970,7 @@ msgstr ""
" --proxy - 使用指定的 HTTP 代理,默认的端口号是\n"
" 1080(格式如 <proxyhost[:port]>)。\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1855,7 +1979,7 @@ msgstr ""
" --proxy-user - 指定用于代理认证的用户和\n"
" 密码(格式如 <用户: 密码>)。\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1864,7 +1988,7 @@ msgstr ""
" --bug - 输出故障报告\n"
" 下一个参数指定输出目录。\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1873,44 +1997,49 @@ msgstr ""
" --verify-rpm - 安装之前验证 rpm 签署\n"
" (--no-verify-rpm 禁止它,默认是激活的)。\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr " --test - 验证安装是否可以正确进行。\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - 排除按逗号分隔的路径。\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - 排除文档文件。\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr " --ignoresize - 安装前不检查磁盘空间。\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --ignorearch - 允许安装体系不匹配的 RPM。\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - 不执行软件包脚本。\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - 安装要跳过的软件包。\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - 安装要跳过的软件包。\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1918,66 +2047,66 @@ msgid ""
msgstr ""
" --more-choices - 如果找到了多个软件包,则提供多个选择而不是默认选择。\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - 不锁定 rpm 数据库。\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - 更新只限于相同体系的软件包。\n"
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - 在命令行选择所有匹配。\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - 允许在 provides 字段中查找软件包。\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - 不在 provides 字段中查找软件包。\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - 安静模式。\n"
-#: ../urpmi:157
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " 命令行给出的软件包名或 rpm 文件将会被安装。\n"
-#: ../urpmi:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr "错误: 无法在使用软件包列表时使用 --auto-select。\n"
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr "错误: 要生成错误报告,请在指定命令行参数时多加 --bug。\n"
-#: ../urpmi:220
+#: ../urpmi:218
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "您无法使用 --install-src 安装二进制 RPM 文件"
-#: ../urpmi:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr "目录 [%s] 已存在,请使用另外一个目录进行错误报告或者删除该目录"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "无法创建故障报告的目录 [%s]"
@@ -1987,7 +2116,7 @@ msgstr "无法创建故障报告的目录 [%s]"
msgid "Environment directory %s does not exist"
msgstr "环境目录 %s 不存在"
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -1996,46 +2125,48 @@ msgstr ""
"错误: %s 似乎是以只读方式挂载的。\n"
"请使用 --allow-force 强制操作。"
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr "正在更新介质...\n"
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (即将升级)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (即将升级)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (即将安装)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, c-format
msgid "%s (to install)"
msgstr "%s (即将安装)"
-#: ../urpmi:447
+#: ../urpmi:454
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "为满足“%s”的依赖关系,需要删除下列软件包之一:"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "请输入您的选择:(1-%d)"
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2045,7 +2176,7 @@ msgstr ""
"下列软件包无法安装,因为它们所依赖的软件包版本低于目前所安装的版本: \n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2055,7 +2186,7 @@ msgstr ""
"下列软件包无法安装,因为它们所依赖的软件包版本低于目前所安装的版本: \n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, c-format
msgid ""
"\n"
@@ -2064,12 +2195,12 @@ msgstr ""
"\n"
"仍然继续安装吗?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr "(是(Y)/否(n))[是]"
-#: ../urpmi:503
+#: ../urpmi:520
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2078,7 +2209,7 @@ msgstr ""
"某些要求的软件包无法安装:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2087,7 +2218,7 @@ msgstr ""
"某些要求的软件包无法安装:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2097,7 +2228,7 @@ msgstr ""
"安装无法继续,原因是要升级其它软件包,需要先删除下列软件包:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2107,7 +2238,7 @@ msgstr ""
"安装无法继续,原因是要升级其它软件包,需要先删除下列软件包:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2116,7 +2247,7 @@ msgstr ""
"要升级其它软件包,需要先删除下列软件包:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2125,12 +2256,17 @@ msgstr ""
"要升级其它软件包,需要先删除下列软件包:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(只是测试,删除将不会实际发生)"
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2139,109 +2275,28 @@ msgstr ""
"您必须以 root 身份安装下列满足依赖性需要的软件包:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(只是测试,安装将不会实际发生)"
-#: ../urpmi:597
+#: ../urpmi:617
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "继续安装 %d 个软件包吗?"
-#: ../urpmi:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "准备好后按 Enter 键..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "取消"
-#: ../urpmi:671
-#, c-format
-msgid "The following package has bad signature"
-msgstr "下列软件包的签名有错误"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "下列软件包的签名有错误"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "您想继续安装吗?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "安装失败"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "正在分发 %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "正在从 %2$s 安装 %1$s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "正在安装 %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "尝试强制安装吗(使用 --force)(是(y)/否(N))[否]?"
-
-#: ../urpmi:815
-#, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d 安装交易失败"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "可以安装"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr "软件包已为最新"
-
-#: ../urpmi:838
-#, c-format
-msgid "Package %s is already installed"
-msgstr "软件包 %s 已经安装"
-
-#: ../urpmi:839
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "软件包 %s 已经安装"
-
-#: ../urpmi:842
-#, c-format
-msgid "Package %s can not be installed"
-msgstr "软件包 %s 无法安装"
-
-#: ../urpmi:843
-#, c-format
-msgid "Packages %s can not be installed"
-msgstr "软件包 %s 无法安装"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "重新启动 urpmi"
@@ -2362,32 +2417,32 @@ msgstr " -v - 详细的提示。\n"
msgid "unable to update medium \"%s\"\n"
msgstr "无法更新介质“%s”\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr "无效的 <url> (如果是本地目录,必须是绝对路径)"
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "只允许超级用户添加介质"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, c-format
msgid "creating config file [%s]"
msgstr "创建配置文件[%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "无法创建配置文件[%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "使用 --distrib 不需要提供 <hdlist 的相对路径>"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
@@ -2396,17 +2451,17 @@ msgstr ""
"\n"
"您是否想要添加介质“%s”"
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<hdlist 相对路径>找不到\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr "远程介质无法使用 %s"
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "无法创建介质“%s”\n"
@@ -2565,17 +2620,17 @@ msgstr " -a - 选择所有介质。\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - 介质名称使用模糊匹配。\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "只允许超级用户删除介质"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "没有可删除的(用 urpmi.addmedia 增加介质)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2629,17 +2684,17 @@ msgstr " -a - 选择所有不可移动的介质。\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - 强迫更新综合文件/hdlist 文件。\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "只允许超级用户更新介质"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "没有要升级的软件(用 urpmi.addmedia 添加介质)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2648,22 +2703,22 @@ msgstr ""
"找不到要升级的项\n"
"(%s 中之一)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "“%s”"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "忽略介质 %s"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "启用介质 %s"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2679,88 +2734,88 @@ msgstr ""
"\n"
"用法:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
"packages.\n"
msgstr " --searchmedia - 只使用给定介质来搜索请求(或更新的)的软件包。\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - 利用模糊查询(和 -y 一样)。\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - 列出可用的软件包。\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - 列出可用的介质。\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - 列出可用的介质及其 URL。\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr " --list-nodes - 如果使用了 --parallel,列出所有可用的节点。\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - 列出可用的并行处理别名。\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr " --dump-config - 以 urpmi.addmedia 参数的格式导出配置。\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr " --src - 下一个软件包是源程序包(和 -s 一样)。\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr " --sources - 下载前给出所有的源文件包(root 专用)。\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --ignorearch - 允许查询架构不匹配的 RPM。\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
" This permit to querying a distro.\n"
msgstr " --use-distrib - 从发行版树中实时配置 urpmi。这将允许查询发行版。\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - 打印更新日志。\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - 打印摘要。\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - 逆序搜索需要软件包的软件包。\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2769,7 +2824,7 @@ msgstr ""
" --whatrequires-recursive\n"
" - 扩展逆序搜索(包括虚拟软件包)。\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, c-format
msgid ""
" --whatprovides, -p\n"
@@ -2778,99 +2833,111 @@ msgstr ""
" --whatprovides, -p\n"
" - 允许在 provides 中寻找软件包。\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - 要删除的软件包的完整输出。\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - 扩展软件包依赖性查询。\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - 打印组名。\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - 以人类可读的格式打印有用信息。\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - 列出软件包中的文件。\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, c-format
msgid " -m - equivalent to -du\n"
msgstr " -m - 与 -du 等价。\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - 和名称一起打印版本和发行号。\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - 下一个软件包是源程序包(和 --src 一样)。\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
msgstr " -u - 如果更新的版本已经安装,就删除软件包。\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - 利用模糊查询(和 --fuzzy 一样)。\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -Y - 类似于 -y,但强制不区分大小写匹配。\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " 需要在命令行给出名称或 rpm 文件。\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes 仅能和 --parallel 一起使用"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr "由于介质“%s”没有 hdlist,软件包 %s 只返回部分结果"
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr "由于介质“%s”没有 hdlists,软件包 %s 只返回部分结果"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr "由于介质“%s”没有 hdlists,软件包 %s 无法返回任何结果"
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr "由于介质“%s”没有 hdlists,软件包 %s 无法返回任何结果"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "没有找到更新日志\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "下列软件包的签名出现问题:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "您想要继续安装吗?"
+
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "你必须是 root 才能使用 --use-distrib 命令"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index afa8f285..46896179 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: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
"PO-Revision-Date: 2006-09-01 21:32+0800\n"
"Last-Translator: Shiva Huang <shivahuang@gmail.com>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -32,7 +32,7 @@ msgstr ""
"X-Generator: KBabel 1.0.2\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "RPM 套件安裝"
@@ -42,7 +42,7 @@ msgstr "RPM 套件安裝"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "錯誤:無法找到檔案 %s,作業將取消"
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr "確定 (_O)"
@@ -108,7 +108,7 @@ msgstr "安裝 (_I)"
msgid "_Save"
msgstr "儲存 (_S)"
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr "取消 (_C)"
@@ -128,17 +128,17 @@ msgstr "未知的選項 %s"
msgid "No packages specified"
msgstr "未指定套件"
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr "請稍候..."
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr "必須擁有管理者權限"
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -149,42 +149,42 @@ msgstr ""
"%s\n"
"無論如何都要繼續安裝嗎?"
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr "警告"
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr "確定"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr " (升級用)"
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr " (安裝用)"
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr "套件選擇"
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr "需要下列套件之一:"
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr "放棄 (_A)"
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -195,58 +195,60 @@ msgstr ""
"%s\n"
"無論如何都要繼續安裝嗎?"
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "為了滿足相依性,將一併安裝下列套件"
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "為了滿足相依性,將一併安裝下列套件"
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d 個套件,共 %d MB)"
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr "套件安裝..."
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr "無法取得原始碼套件,放棄"
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "準備中..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "正在安裝套件 `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "請將名為 \"%s\" 的媒體置入裝置 [%s] 內"
-#: ../gurpmi2:264
+#: ../gurpmi2:273
#, c-format
msgid "Downloading package `%s'..."
msgstr "正在下載套件 `%s'..."
-#: ../gurpmi2:279
+#: ../gurpmi2:291
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"下列套件的簽章並不正確:\n"
-"%s\n"
-"\n"
-"您要繼續安裝嗎?"
+msgid "_Done"
+msgstr "完成 (_D)"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -257,41 +259,27 @@ msgstr ""
"%s\n"
"您或許要更新您的 urpmi 資料庫"
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "正在移除 %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "準備中..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "正在安裝套件 `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "完成 (_D)"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, c-format
msgid "Installation failed:"
msgstr "安裝失敗;"
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr "每個套件都已經安裝了"
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr "安裝完畢"
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "正在移除 %s"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -326,7 +314,7 @@ msgstr " -g - 顯示群組名稱。\n"
msgid " defaults to %s.\n"
msgstr " 預設為 %s。\n"
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "只有擁有管理者權限的使用者才能安裝套件"
@@ -336,98 +324,98 @@ msgstr "只有擁有管理者權限的使用者才能安裝套件"
msgid "Running urpmi in restricted mode..."
msgstr "以限制模式執行 urpmi..."
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr "無法開啟 rpmdb"
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "無效的 rpm 檔案名稱 [%s]"
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "正在擷取 rpm 檔案 [%s] ..."
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr "...擷取完成"
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr "...擷取失敗:%s"
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "無法存取 rpm 檔案 [%s]"
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "無法解析 spec 檔案 %s [%s]"
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr "無法註冊 rpm 檔案"
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "與 RPM 檔案 [%s] 不相容的硬體架構"
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr "註冊本地端套件錯誤"
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "使用限制模式執行時禁止該操作程序"
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "命令列傳入的代理伺服器宣告錯誤\n"
-#: ../urpm/args.pm:135
-#, fuzzy, c-format
-msgid "chroot directory doesn't exist"
-msgstr "環境目錄 %s 不存在"
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq:無法讀取 rpm 檔案 \"%s\"\n"
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
+#, fuzzy, c-format
+msgid "chroot directory doesn't exist"
+msgstr "環境目錄 %s 不存在"
+
+#: ../urpm/args.pm:424
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr "參數太多\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "為媒體 \"%s\" 建立 hdlist synthesis 檔"
@@ -616,7 +604,12 @@ msgstr "沒有找到套件 %s。"
msgid "malformed URL: [%s]"
msgstr "畸形的 URL:[%s]"
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "正在由媒體 \"%s\" 擷取 rpm 檔案..."
@@ -626,43 +619,48 @@ msgstr "正在由媒體 \"%s\" 擷取 rpm 檔案..."
msgid "[repackaging]"
msgstr "[正在重新打包]"
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr "已建立在 %s 上的安裝程序 (移除 = %d,安裝 = %d,升級 = %d)"
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr "無法建立安裝程序"
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "無法由 delta-rpm 套件包中取出套件 %s"
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "正在新增套件 %s (id = %d,eid = %d,更新 = %d,檔案 = %s)"
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr "無法安裝套件 %s"
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "正在移除套件 %s"
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr "正在移除套件 %s"
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "正在由 %2$s 安裝 %1$s"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr "更多關於套件 %s 的資訊"
@@ -692,11 +690,102 @@ msgstr "未指定套件"
msgid "Cannot connect to ldap uri:"
msgstr "無法連接至伺服器"
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "urpmi 資料庫被鎖住了"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "警告"
+
+#: ../urpm/lock.pm:65
#, fuzzy, c-format
msgid "%s database locked"
msgstr "urpmi 資料庫被鎖住了"
+#: ../urpm/main_loop.pm:99
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgstr "下列套件有不正確的簽章"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "下列套件有不正確的簽章"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "您要繼續安裝嗎?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "安裝失敗"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "正在發佈 %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "正在由 %2$s 安裝 %1$s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "正在安裝 %s"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "嘗試不檢查相依性直接安裝? (y/N)(是/否)"
+
+#: ../urpm/main_loop.pm:205
+#, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "嘗試採用強制安裝的方式 (--force)? (y/N)(是/否)"
+
+#: ../urpm/main_loop.pm:247
+#, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d 個安裝程序失敗"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "可以安裝"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "每個套件都已經安裝了"
+
+#: ../urpm/main_loop.pm:272
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "每個套件都已經安裝了"
+
+#: ../urpm/main_loop.pm:275
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgstr "每個套件都已經安裝了"
+
+#: ../urpm/main_loop.pm:276
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "每個套件都已經安裝了"
+
#: ../urpm/md5sum.pm:23
#, fuzzy, c-format
msgid "examining %s file"
@@ -744,7 +833,7 @@ msgstr "正在嘗試選擇不存在的媒體 \"%s\""
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "為媒體 \"%s\" 建立 hdlist synthesis 檔"
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "無法存取 \"%s\" 的 hdlist 檔案,忽略這個媒體"
@@ -834,7 +923,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr "搜尋開始於:%s 結束於:%s"
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "正在進行第二個步驟,相依性的計算\n"
@@ -899,144 +988,149 @@ msgstr "無法解析 media.cfg"
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "無法存取第一個安裝媒體 (找不到 hdlists 檔案)"
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "正在嘗試選擇不存在的媒體 \"%s\""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr "正在選擇多個媒體:\"%s\""
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr "移除媒體 \"%s\""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "正在重新設定媒體 \"%s\" 的 urpmi 設定"
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr "重新設定失敗"
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr "重新設定完成"
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "生成名稱檔案時發生錯誤:相依性 %d 沒有找到"
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr "生成名稱檔案時發生錯誤:無法寫入檔案 (%s)"
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "媒體 \"%s\" 沒有被選取"
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr "檢驗 hdlist 檔案 [%s]"
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr "檢驗 synthesis 檔案 [%s]"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr "正在建立 hdlist [%s]"
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr "無法為媒介 \"%s\" 建立 synthesis 檔。您的 hdlist 檔可能並不標準。"
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "讀取 \"%s\" 媒體的 hdlist 或 synthesis 檔案時發生問題"
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "正在寫入媒體 \"%s\" 的列表檔"
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr "...複製失敗"
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "正在複製 \"%s\" 的敘述檔案..."
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr "...複製完成"
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "複製 [%s] 失敗 (檔案小得可疑)"
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "正在計算複製的來源 hdlist (或 synthesis) 的 md5sum"
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "複製 [%s] 失敗 (md5sum 不合)"
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "正在計算來源 hdlist (或 synthesis) 的 md5sum"
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...擷取失敗:md5sum 不合"
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr "在 [%s] 內找不到 rpm 檔案"
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr "由 [%s] 讀取 rpm 檔案"
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "無法由 [%s] 讀取 rpm 套件:%s"
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr "沒有讀取到任何的 rpm"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1046,74 +1140,74 @@ msgstr ""
"無法存取媒體 \"%s\",\n"
"這可能是因為您建立媒體時是手動將這個目錄掛載到系統裡的。"
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "沒有找到媒體 \"%s\" 的 hdlist 檔案"
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "正在擷取 \"%s\" 的來源 hdlist (或 synthesis)..."
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "發現尋找到的 hdlist (或 synthesis) 為 %s"
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "沒有找到媒體 \"%s\" 的 hdlist 檔案"
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "檢驗 \"%s\" 的公鑰..."
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...由 \"%2$s\" 的公鑰檔案匯入鑰匙 %1$s"
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "無法匯入 \"%s\" 的公鑰"
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "正在寫入媒體 \"%s\" 的列表檔"
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "加入的媒體 %s"
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "無法解析 \"%s\" 的 hdlist 檔案"
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "讀取 \"%s\" 媒體的 synthesis 檔案時發生問題"
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "正在讀取媒體 \"%s\" 的標頭"
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr "Nn否"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "Yy是"
@@ -1173,47 +1267,52 @@ msgstr "自相矛盾的媒體 \"%s\" 標示為可移除但是事實上卻不是
msgid "unable to access medium \"%s\""
msgstr "無法存取媒體 \"%s\" "
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr "沒有套件命名為 %s"
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "以下套件包含 %s:%s"
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr "由於遺失了 %s"
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "每個套件都已經安裝了"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr "由於未滿足 %s"
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr "正在試著促進 %s"
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr "為了要保留 %s"
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr "為了要安裝 %s"
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr "由於與 %s 發生衝突"
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr "未被要求"
@@ -1233,6 +1332,16 @@ msgstr "無效的公鑰 ID (%s)"
msgid "Missing signature (%s)"
msgstr "遺失簽名 (%s)"
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "無法建立設定檔 [%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "複製失敗"
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1249,8 +1358,8 @@ msgstr ""
"\n"
"用法:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - 顯示此說明訊息。\n"
@@ -1265,18 +1374,18 @@ msgstr " --auto - 自動選擇套件。\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - 確認刪除是否能夠正確進行。\n"
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr " --force - 即使某些套件不存在仍然強制執行。\n"
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - 在同步管理的機器上分散式的執行 urpmi。\n"
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - 在移除前重新打包檔案\n"
@@ -1286,8 +1395,8 @@ msgstr " --repackage - 在移除前重新打包檔案\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - 使用另一個根目錄移除 rpm 套件。\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - 使用另一個根目錄進行 RPM 套件的安裝。\n"
@@ -1306,17 +1415,17 @@ msgstr ""
" --use-distrib - 立即由一個散佈套件樹設定 urpme,在搭配 --root 選項來安\n"
" 裝/移除一個 chroot 時很方便。\n"
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, fuzzy, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - 嘗試尋找並使用 synthesis 檔案。\n"
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, fuzzy, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - 嘗試尋找並使用 hdlist 檔案。\n"
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - 完整訊息模式。\n"
@@ -1326,60 +1435,60 @@ msgstr " --verbose - 完整訊息模式。\n"
msgid " -a - select all packages matching expression.\n"
msgstr " -a - 選擇所有符合描述的套件。\n"
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "只有擁有管理者權限的使用者才能移除套件"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr "未知的套件"
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr "未知的套件"
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr "移除套件 %s 將破壞您的系統"
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr "沒有東西可移除"
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr "正在檢查以移除下列套件"
-#: ../urpme:134
+#: ../urpme:131
#, 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] "為了滿足相依性,下列 %d 個套件將被移除"
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr " (%d MB)"
-#: ../urpme:138
+#: ../urpme:135
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "要移除這 %d 個套件嗎?"
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (y/N) (是/否) "
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr "移除失敗"
@@ -1405,12 +1514,12 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - 印出這個工具的版本編號。\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr " --env - 使用特定環境 (一般用於臭蟲回報)。\n"
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr " --excludemedia - 不使用給定的媒體,不同媒體間請以逗號分隔。\n"
@@ -1421,12 +1530,12 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr " --literal, -l - 不比對樣版,把參數當作一般字串。\n"
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - 只使用給定的媒體,不同媒體間請以逗號分隔。\n"
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1437,7 +1546,7 @@ msgstr " --sortmedia - 依據子字串排序媒體,以逗號分開。\n"
msgid " --use-distrib - use the given path to access media\n"
msgstr " --synthesis - 使用指定的 synthesis 檔而非 urpmi 資料庫。\n"
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - 使用指定的 synthesis 檔而非 urpmi 資料庫。\n"
@@ -1447,7 +1556,7 @@ msgstr " --synthesis - 使用指定的 synthesis 檔而非 urpmi 資料庫
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - 不顯示相同的訊息。\n"
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - 只使用更新媒體。\n"
@@ -1578,78 +1687,90 @@ msgid " --group - group\n"
msgstr " --group - 群組\n"
#: ../urpmf:72
+#, fuzzy, c-format
+msgid " --license - license\n"
+msgstr " --name - 套件名稱\n"
+
+#: ../urpmf:73
#, c-format
msgid " --name - package name\n"
msgstr " --name - 套件名稱\n"
-#: ../urpmf:73
+#: ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr ""
" --obsoletes - 淘汰標籤\n"
"\n"
-#: ../urpmf:74
+#: ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr " --packager - 打包者\n"
-#: ../urpmf:75
+#: ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - 提供標籤\n"
-#: ../urpmf:76
+#: ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - 需要標籤\n"
-#: ../urpmf:77
+#: ../urpmf:78
#, c-format
msgid " --size - installed size\n"
msgstr " --size - 安裝大小\n"
-#: ../urpmf:78
+#: ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - 原始碼套件名稱\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid " --suggests - suggests tags\n"
+msgstr ""
+" --obsoletes - 淘汰標籤\n"
+"\n"
+
+#: ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr " --summary - 摘要\n"
-#: ../urpmf:80
+#: ../urpmf:82
#, c-format
msgid " --url - url\n"
msgstr " --url - URL\n"
-#: ../urpmf:81
+#: ../urpmf:83
#, c-format
msgid " --vendor - vendor\n"
msgstr " --vendor - 提供者\n"
-#: ../urpmf:82
+#: ../urpmf:84
#, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -m - 這個套件被找到的媒介\n"
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - 顯示版本、發行編號與平台。\n"
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "格式錯誤:您只能使用一個多值標籤"
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "正在 %s 上使用特定的環境\n"
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1657,12 +1778,12 @@ msgid ""
msgstr ""
"注意:因為所有搜尋過的媒體都沒有使用 hdlists,所以 urpmf 無法回傳任何結果\n"
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "您或許想要使用 --name 參數來搜尋套件名稱。\n"
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1678,53 +1799,53 @@ msgstr ""
"\n"
"用法:\n"
-#: ../urpmi:88
+#: ../urpmi:84
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
msgstr " --searchmedia - 只使用指定的媒體來搜尋需要的套件。\n"
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr " --auto - 非互動式模式,對問題使用預設的回答。\n"
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr " --auto-select - 自動選擇要用來升級系統的套件。\n"
-#: ../urpmi:93
+#: ../urpmi:89
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr " --auto-select - 自動選擇要用來升級系統的套件。\n"
-#: ../urpmi:94
+#: ../urpmi:90
#, fuzzy, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - 不使用 MD5SUM 檔案檢查功能。\n"
-#: ../urpmi:95
+#: ../urpmi:91
#, fuzzy, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - 強制更新 gpg 鑰匙。\n"
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
"installation.\n"
msgstr " --no-uninstall - 絕不要求移除套件,直接中斷安裝。\n"
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - 不安裝套件 (只下載)。\n"
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1733,7 +1854,7 @@ msgstr ""
" --keep - 盡可能的保留現存的套件,拒絕安裝會導致移除其他套件的\n"
" 套件。\n"
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1744,44 +1865,50 @@ msgstr ""
" 分割為幾個小的安裝程序。\n"
" 預設值為 %d。\n"
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - 小型安裝程序大小,預設值為 %d。\n"
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy, -y - 加上模糊搜尋。\n"
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src, -s - 下個套件是原始碼套件。\n"
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr " --install-src - 只安裝原始碼套件 (不安裝二進位檔)。\n"
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - 在執行任何事前先由快取中移除 RPM 檔案。\n"
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - 不清除快取中的 RPM 檔案。\n"
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
" dependencies checking.\n"
msgstr " --allow-nodeps - 允許要求使用者不檢查相依性就安裝套件。\n"
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1790,12 +1917,12 @@ msgstr ""
" --allow-force - 允許要求使用者安裝套件而不檢查相依性與完整\n"
" 性。\n"
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - 使用另一個根目錄進行 RPM 套件的安裝。\n"
-#: ../urpmi:117
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1804,47 +1931,47 @@ msgstr ""
" --use-distrib - 立即由一個散佈套件樹設定 urpmi,在搭配 --root 選項來安\n"
" 裝/移除一個 chroot 時很方便。\n"
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - 使用 wget 擷取遠端檔案。\n"
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - 使用 curl 擷取遠端檔案。\n"
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, fuzzy, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --curl - 使用 curl 擷取遠端檔案。\n"
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr " --curl-options - 要額外傳給 curl 的參數\n"
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr " --rsync-options- 要額外傳給 rsync 的參數\n"
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr " --wget-options - 要額外傳給 wget 的參數\n"
-#: ../urpmi:127
+#: ../urpmi:124
#, fuzzy, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr " --curl-options - 要額外傳給 curl 的參數\n"
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - 限制下載的速度。\n"
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1853,7 +1980,7 @@ msgstr ""
" --resume - 接著傳送下載到一半的檔案\n"
" (--no-resume 選項停用它,預設值為停用)。\n"
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1862,7 +1989,7 @@ msgstr ""
" --proxy - 使用指定的 HTTP 代理伺服器,通訊埠假設為預設值 1080 \n"
" (格式為 <proxyhost[:port]>)。\n"
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1871,14 +1998,14 @@ msgstr ""
" --proxy-user - 指定代理伺服器認證的使用者帳號與密碼\n"
" (格式為 <user:password>)。\n"
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
" next arg.\n"
msgstr " --bug - 輸出臭蟲回報到下一個參數所指定的目錄。\n"
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1887,44 +2014,49 @@ msgstr ""
" --verify-rpm - 安裝前檢驗 RPM 檔案的簽章。\n"
" (--no-verify-rpm 會停用它,預設值為啟用)。\n"
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr " --test - 僅確認安裝是否能夠正確完成。\n"
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - 排除以逗號分隔的路徑。\n"
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - 排除說明文件檔案。\n"
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr " --ignoresize - 安裝前不檢查剩餘的磁碟空間。\n"
-#: ../urpmi:144
+#: ../urpmi:141
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --ignorearch - 允許安裝硬體架構不相符的 RPM 檔。\n"
-#: ../urpmi:145
+#: ../urpmi:142
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - 不執行套件中的命令稿。\n"
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - 安裝時應該略過的套件。\n"
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr " --skip - 安裝時應該略過的套件。\n"
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1932,66 +2064,66 @@ msgid ""
msgstr ""
" --more-choices - 當找到不只一個套件時,提供除了預設值之外的多個選擇。\n"
-#: ../urpmi:150
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - 不鎖定 RPM 資料庫。\n"
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - 只升級相同平台的套件。\n"
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - 選擇命令列中所有符合的項目。\n"
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - 允許於 provides 中搜尋套件。\n"
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - 不在 provides 中搜尋套件。\n"
-#: ../urpmi:155
+#: ../urpmi:153
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - 安靜模式。\n"
-#: ../urpmi:157
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " 將會安裝於命令列指定的名稱或 RPM 檔案。\n"
-#: ../urpmi:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr "錯誤:要生成一個臭蟲回報,請指定平常的命令列參數另外再加上 --bug。\n"
-#: ../urpmi:220
+#: ../urpmi:218
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "當使用 --install-src 時您無法安裝二進制 RPM 檔案"
-#: ../urpmi:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr "目錄 [%s] 已經存在,請指定另一個目錄給臭蟲回報或刪除它"
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "無法建立 [%s] 目錄給臭蟲回報使用"
@@ -2001,7 +2133,7 @@ msgstr "無法建立 [%s] 目錄給臭蟲回報使用"
msgid "Environment directory %s does not exist"
msgstr "環境目錄 %s 不存在"
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2010,46 +2142,48 @@ msgstr ""
"錯誤:%s 似乎被掛載為唯讀模式。\n"
"使用 --allow-force 標籤來強制執行。"
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr "正在更新媒體...\n"
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (升級用)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (升級用)"
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (安裝用)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (安裝用)"
-#: ../urpmi:447
+#: ../urpmi:454
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "為了滿足相依性,下列 %d 個套件將被移除"
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "您要選擇何者? (1-%d) "
-#: ../urpmi:481
+#: ../urpmi:498
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2059,7 +2193,7 @@ msgstr ""
"下列套件無法安裝,因為它們需要比您系統上的套件為舊的版本:\n"
"%s"
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2069,7 +2203,7 @@ msgstr ""
"下列套件無法安裝,因為它們需要比您系統上的套件為舊的版本:\n"
"%s"
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, c-format
msgid ""
"\n"
@@ -2078,12 +2212,12 @@ msgstr ""
"\n"
"無論如何都要繼續安裝嗎?"
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (Y/n) (是/否) "
-#: ../urpmi:503
+#: ../urpmi:520
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2092,7 +2226,7 @@ msgstr ""
"某些要求的套件無法安裝:\n"
"%s"
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2101,7 +2235,7 @@ msgstr ""
"某些要求的套件無法安裝:\n"
"%s"
-#: ../urpmi:535
+#: ../urpmi:552
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2111,7 +2245,7 @@ msgstr ""
"安裝無法繼續,因為下列套件必須移除給其他套件來升級:\n"
"%s\n"
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2121,7 +2255,7 @@ msgstr ""
"安裝無法繼續,因為下列套件必須移除給其他套件來升級:\n"
"%s\n"
-#: ../urpmi:544
+#: ../urpmi:561
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2130,7 +2264,7 @@ msgstr ""
"下列套件必須移除給其他套件來升級:\n"
"%s"
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2139,12 +2273,17 @@ msgstr ""
"下列套件必須移除給其他套件來升級:\n"
"%s"
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(僅測試,移除動作並不會真的執行)"
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2153,109 +2292,28 @@ msgstr ""
"您必須具有管理者權限以安裝下列的相依性項目:\n"
"%s\n"
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(僅測試,安裝動作並不會真的執行)"
-#: ../urpmi:597
+#: ../urpmi:617
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "繼續安裝這 %d 個套件?"
-#: ../urpmi:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr "準備好時請按 Enter..."
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr "取消"
-#: ../urpmi:671
-#, fuzzy, c-format
-msgid "The following package has bad signature"
-msgstr "下列套件有不正確的簽章"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "下列套件有不正確的簽章"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "您要繼續安裝嗎?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "安裝失敗"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "正在發佈 %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "正在由 %2$s 安裝 %1$s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "正在安裝 %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "嘗試不檢查相依性直接安裝? (y/N)(是/否)"
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "嘗試採用強制安裝的方式 (--force)? (y/N)(是/否)"
-
-#: ../urpmi:815
-#, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d 個安裝程序失敗"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "可以安裝"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "每個套件都已經安裝了"
-
-#: ../urpmi:839
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "每個套件都已經安裝了"
-
-#: ../urpmi:842
-#, fuzzy, c-format
-msgid "Package %s can not be installed"
-msgstr "每個套件都已經安裝了"
-
-#: ../urpmi:843
-#, fuzzy, c-format
-msgid "Packages %s can not be installed"
-msgstr "每個套件都已經安裝了"
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr "正在重新啟動 urpmi"
@@ -2381,32 +2439,32 @@ msgstr " -v - 完整訊息模式。\n"
msgid "unable to update medium \"%s\"\n"
msgstr "無法更新媒體 \"%s\"\n"
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "只有管理者才能新增媒體"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, fuzzy, c-format
msgid "creating config file [%s]"
msgstr "將建立設定檔 [%s]"
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr "無法建立設定檔 [%s]"
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "使用 --distrib 參數時不需給予 <hdlist 檔案的相對路徑>"
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
@@ -2415,17 +2473,17 @@ msgstr ""
"\n"
"您要加入媒體 '%s'"
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<hdlist 檔案的相對路徑> 遺失\n"
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "無法建立媒體 \"%s\"\n"
@@ -2584,17 +2642,17 @@ msgstr " -a - 選擇全部的媒體。\n"
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - 對媒體名稱進行模糊比對。\n"
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr "只有管理者才可以移除媒體"
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "沒有東西可以移除 (使用 urpmi.addmedia 來新增一個媒體)\n"
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2648,17 +2706,17 @@ msgstr " -a - 選擇所有不可移除式媒體。\n"
msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - 強制產生 hdlist 檔案。\n"
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "只有管理者才能跟新媒體"
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "沒有東西可供更新 (使用 urpmi.addmedia 以新增一個媒體)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2667,22 +2725,22 @@ msgstr ""
"要更新的項目遺失\n"
"(%s 的其中之一)\n"
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr "略過媒體 %s"
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr "啟用媒體 %s"
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2698,66 +2756,66 @@ msgstr ""
"\n"
"用法:\n"
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
"packages.\n"
msgstr " --searchmedia - 只使用指定的媒體來搜尋或升級套件。\n"
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - 加上模糊搜尋 (與 -y 相同)。\n"
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - 列出可用的的套件。\n"
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - 列出可用的媒體。\n"
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - 列出可用的媒體與其 URL。\n"
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr " --list-nodes - 當使用 --parallel 選項時列出可用的節點。\n"
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - 列出可用的同步管理別名。\n"
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr " --dump-config - 以 urpmi.addmedia 的參數形式的匯出設定值。\n"
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr " --src - 下個套件是原始碼套件 (與 -s 相同)。\n"
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr " --sources - 下載前先給予所有的原始碼套件 (僅供管理者使用).\n"
-#: ../urpmq:68
+#: ../urpmq:65
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr " --ignorearch - 允許查詢硬體架構不相符的 RPM 檔。\n"
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
@@ -2766,22 +2824,22 @@ msgstr ""
" --use-distrib - 立即由一個散佈套件樹設定 urpmi。可用來查詢散佈\n"
" 套件。\n"
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - 顯示更新紀錄。\n"
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - 顯示摘要。\n"
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr " --whatrequires - 逆向搜尋何者需要此套件。\n"
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
@@ -2790,108 +2848,119 @@ msgstr ""
" --whatrequires-recursive\n"
" - 進階逆向搜尋 (包含虛擬套件)。\n"
-#: ../urpmq:90
+#: ../urpmq:87
#, fuzzy, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr " -p - 於 provides 中搜尋套件。\n"
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - 完整輸出要移除的套件。\n"
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - 延伸套件相依性的查詢。\n"
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - 顯示群組名稱。\n"
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - 以人類可讀的形式顯示有用資訊。\n"
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - 列出套件內包含的檔案。\n"
-#: ../urpmq:99
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - 安靜模式。\n"
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - 顯示名稱時一併顯示版本號與發行編號。\n"
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - 下個套件是原始碼套件 (與 --src 相同)。\n"
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
msgstr " -u - 若已經安裝較新的版本則移除套件。\n"
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - 加上模糊搜尋 (與 --fuzzy 相同)。\n"
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -Y - 類似 -y 參數,但強制比對大小寫。\n"
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " 查詢命令列給予的套件名稱或 RPM 檔案。\n"
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes 參數只能夠配合 --parallel 參數一起使用"
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"注意:因為所有搜尋過的媒體都沒有使用 hdlists,所以 urpmf 無法回傳任何結果\n"
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
"注意:因為所有搜尋過的媒體都沒有使用 hdlists,所以 urpmf 無法回傳任何結果\n"
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr "沒有找到更新紀錄\n"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "下列套件的簽章並不正確:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "您要繼續安裝嗎?"
+
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "您必須是 root 才能使用 --use-distrib"